Build Your Own Arcade Controls Forum
Software Support => GroovyMAME => Topic started by: Jonny G on September 22, 2012, 07:53:03 am
-
Hi all,
I'm getting the following error when I try to apply the GM 0.147 diff to the latest MAME sources using MAME Compiler 64 v.1.23. I'm using the latest MinGW tools. Can anyone shed some light on what's happening here, please?
Applying Diff Patch...
can't find file to patch at input line 4
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru mame/src/emu/clifront.c gmame147Completo/src/emu/clifront.c
|--- mame/src/emu/clifront.c 2012-08-22 17:44:06.000000000 +0200
|+++ gmame147Completo/src/emu/clifront.c 2012-09-20 00:57:43.738431951 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 16
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru mame/src/emu/emu.h gmame147Completo/src/emu/emu.h
|--- mame/src/emu/emu.h 2012-05-03 11:00:10.000000000 +0200
|+++ gmame147Completo/src/emu/emu.h 2012-09-20 00:58:53.348054843 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 29
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru mame/src/emu/emu.mak gmame147Completo/src/emu/emu.mak
|--- mame/src/emu/emu.mak 2012-09-21 00:49:52.813718708 +0200
|+++ gmame147Completo/src/emu/emu.mak 2012-09-20 01:02:15.193628019 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
3 out of 3 hunks ignored
can't find file to patch at input line 67
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru mame/src/emu/emuopts.c gmame147Completo/src/emu/emuopts.c
|--- mame/src/emu/emuopts.c 2012-09-21 00:49:52.813718708 +0200
|+++ gmame147Completo/src/emu/emuopts.c 2012-09-20 01:59:08.871801204 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
3 out of 3 hunks ignored
can't find file to patch at input line 142
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru mame/src/emu/emuopts.h gmame147Completo/src/emu/emuopts.h
|--- mame/src/emu/emuopts.h 2012-09-21 00:49:52.813718708 +0200
|+++ gmame147Completo/src/emu/emuopts.h 2012-09-20 01:09:55.417801438 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
5 out of 5 hunks ignored
can't find file to patch at input line 231
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru mame/src/emu/hiscore.c gmame147Completo/src/emu/hiscore.c
|--- mame/src/emu/hiscore.c 2012-09-21 00:49:52.817052023 +0200
|+++ gmame147Completo/src/emu/hiscore.c 2012-09-20 01:10:43.864205648 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 243
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru mame/src/emu/machine.c gmame147Completo/src/emu/machine.c
|--- mame/src/emu/machine.c 2012-09-21 00:49:52.817052023 +0200
|+++ gmame147Completo/src/emu/machine.c 2012-09-20 01:12:13.273721274 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 265
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru mame/src/emu/machine.h gmame147Completo/src/emu/machine.h
|--- mame/src/emu/machine.h 2012-09-21 00:49:52.817052023 +0200
|+++ gmame147Completo/src/emu/machine.h 2012-09-20 01:13:37.433265344 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 278
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru mame/src/emu/render.c gmame147Completo/src/emu/render.c
|--- mame/src/emu/render.c 2012-08-16 08:13:36.000000000 +0200
|+++ gmame147Completo/src/emu/render.c 2012-09-20 01:17:10.838775894 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
3 out of 3 hunks ignored
patching file mame/src/emu/switchres/modeline.c
patching file mame/src/emu/switchres/monitor.c
patching file mame/src/emu/switchres/switchres.c
patching file mame/src/emu/switchres/switchres.h
patching file mame/src/emu/switchres/util.c
can't find file to patch at input line 1856
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru mame/src/emu/video.c gmame147Completo/src/emu/video.c
|--- mame/src/emu/video.c 2012-09-21 00:49:52.827051968 +0200
|+++ gmame147Completo/src/emu/video.c 2012-09-20 02:01:20.474421585 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
4 out of 4 hunks ignored
can't find file to patch at input line 1905
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru mame/src/emu/video.h gmame147Completo/src/emu/video.h
|--- mame/src/emu/video.h 2012-09-21 00:49:52.827051968 +0200
|+++ gmame147Completo/src/emu/video.h 2012-09-20 01:25:05.512871029 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
2 out of 2 hunks ignored
can't find file to patch at input line 1924
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru mame/src/mame/drivers/galaxian.c gmame147Completo/src/mame/drivers/galaxian.c
|--- mame/src/mame/drivers/galaxian.c 2012-09-14 11:20:08.000000000 +0200
|+++ gmame147Completo/src/mame/drivers/galaxian.c 2012-09-20 01:27:32.808739726 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
3 out of 3 hunks ignored
can't find file to patch at input line 1954
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru mame/src/mame/includes/galaxian.h gmame147Completo/src/mame/includes/galaxian.h
|--- mame/src/mame/includes/galaxian.h 2012-09-13 13:15:34.000000000 +0200
|+++ gmame147Completo/src/mame/includes/galaxian.h 2012-09-20 01:28:14.455180774 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 1966
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru mame/src/osd/sdl/osdsdl.h gmame147Completo/src/osd/sdl/osdsdl.h
|--- mame/src/osd/sdl/osdsdl.h 2012-08-11 14:06:46.000000000 +0200
|+++ gmame147Completo/src/osd/sdl/osdsdl.h 2012-09-20 01:29:58.091285997 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
3 out of 3 hunks ignored
can't find file to patch at input line 1993
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru mame/src/osd/sdl/sdlmain.c gmame147Completo/src/osd/sdl/sdlmain.c
|--- mame/src/osd/sdl/sdlmain.c 2012-08-29 20:37:10.000000000 +0200
|+++ gmame147Completo/src/osd/sdl/sdlmain.c 2012-09-20 01:36:54.232364899 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
6 out of 6 hunks ignored
can't find file to patch at input line 2085
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru mame/src/osd/sdl/sdl.mak gmame147Completo/src/osd/sdl/sdl.mak
|--- mame/src/osd/sdl/sdl.mak 2012-09-15 17:45:00.000000000 +0200
|+++ gmame147Completo/src/osd/sdl/sdl.mak 2012-09-20 01:30:42.057714476 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
patching file mame/src/osd/sdl/switchres.c
can't find file to patch at input line 2389
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru mame/src/osd/sdl/video.c gmame147Completo/src/osd/sdl/video.c
|--- mame/src/osd/sdl/video.c 2012-05-31 15:26:40.000000000 +0200
|+++ gmame147Completo/src/osd/sdl/video.c 2012-09-20 01:39:13.624943079 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
3 out of 3 hunks ignored
can't find file to patch at input line 2449
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru mame/src/osd/sdl/video.h gmame147Completo/src/osd/sdl/video.h
|--- mame/src/osd/sdl/video.h 2012-09-15 23:47:32.000000000 +0200
|+++ gmame147Completo/src/osd/sdl/video.h 2012-09-20 01:40:16.427936179 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 2461
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru mame/src/osd/sdl/window.c gmame147Completo/src/osd/sdl/window.c
|--- mame/src/osd/sdl/window.c 2012-09-15 23:47:32.000000000 +0200
|+++ gmame147Completo/src/osd/sdl/window.c 2012-09-20 01:44:36.599860040 +0200
Finished!
0 Hours 0 Minutes and 0 Seconds Elapsed.
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
7 out of 7 hunks ignored
can't find file to patch at input line 2543
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru mame/src/osd/sdl/window.h gmame147Completo/src/osd/sdl/window.h
|--- mame/src/osd/sdl/window.h 2012-09-15 23:47:32.000000000 +0200
|+++ gmame147Completo/src/osd/sdl/window.h 2012-09-20 01:45:31.482896046 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 2554
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru mame/src/osd/windows/drawd3d.c gmame147Completo/src/osd/windows/drawd3d.c
|--- mame/src/osd/windows/drawd3d.c 2012-01-12 22:19:50.000000000 +0100
|+++ gmame147Completo/src/osd/windows/drawd3d.c 2012-09-21 00:41:23.583144113 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
8 out of 8 hunks ignored
can't find file to patch at input line 2671
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru mame/src/osd/windows/drawdd.c gmame147Completo/src/osd/windows/drawdd.c
|--- mame/src/osd/windows/drawdd.c 2012-09-15 23:47:32.000000000 +0200
|+++ gmame147Completo/src/osd/windows/drawdd.c 2012-09-21 00:47:32.637811438 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
10 out of 10 hunks ignored
patching file mame/src/osd/windows/pstrip.c
patching file mame/src/osd/windows/pstrip.h
patching file mame/src/osd/windows/switchres.c
can't find file to patch at input line 4304
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru mame/src/osd/windows/video.c gmame147Completo/src/osd/windows/video.c
|--- mame/src/osd/windows/video.c 2012-09-21 00:49:52.827051968 +0200
|+++ gmame147Completo/src/osd/windows/video.c 2012-09-20 01:52:38.153917904 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
3 out of 3 hunks ignored
can't find file to patch at input line 4334
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru mame/src/osd/windows/video.h gmame147Completo/src/osd/windows/video.h
|--- mame/src/osd/windows/video.h 2012-09-15 23:47:32.000000000 +0200
|+++ gmame147Completo/src/osd/windows/video.h 2012-09-20 02:19:30.475183211 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 4346
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru mame/src/osd/windows/window.c gmame147Completo/src/osd/windows/window.c
|--- mame/src/osd/windows/window.c 2012-09-21 00:49:52.827051968 +0200
|+++ gmame147Completo/src/osd/windows/window.c 2012-09-20 02:31:15.288031578 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
18 out of 18 hunks ignored
can't find file to patch at input line 4641
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru mame/src/osd/windows/windows.mak gmame147Completo/src/osd/windows/windows.mak
|--- mame/src/osd/windows/windows.mak 2012-07-26 21:36:32.000000000 +0200
|+++ gmame147Completo/src/osd/windows/windows.mak 2012-09-20 01:53:27.370317943 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
1 out of 1 hunk ignored
can't find file to patch at input line 4655
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru mame/src/osd/windows/winmain.c gmame147Completo/src/osd/windows/winmain.c
|--- mame/src/osd/windows/winmain.c 2012-08-15 16:39:50.000000000 +0200
|+++ gmame147Completo/src/osd/windows/winmain.c 2012-09-20 01:50:28.891284847 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
4 out of 4 hunks ignored
can't find file to patch at input line 4727
Perhaps you used the wrong -p or --strip option?
The text leading up to this was:
--------------------------
|diff -Nru mame/src/osd/windows/winmain.h gmame147Completo/src/osd/windows/winmain.h
|--- mame/src/osd/windows/winmain.h 2012-09-21 00:49:52.827051968 +0200
|+++ gmame147Completo/src/osd/windows/winmain.h 2012-09-20 01:47:10.649025485 +0200
--------------------------
File to patch:
Skip this patch? [y]
Skipping patch.
2 out of 2 hunks ignored
-
It's more than likely going to be something to do with my compiling environment and the set up of the new tools. I've simply replaced the two MinGW 32bit and MinGW 64bit folders that the MAME Compiler 64 creates with the new ones from mamedev.org.
The Hiscore.diff patch applies with no errors, but as explained above the groovymame diff produces lots of errors.
Any help appreciated.
Thanks.
-
The diff posted by Ves contains his full path names so it won't work unless you remove them, use some editing tool to auto find/replace the texts:
diff -Nru mame/src/emu/clifront.c gmame147Completo/src/emu/clifront.c
should be:
diff -Nru src/emu/clifront.c src/emu/clifront.c
and so on.
I usually do this manually after creating the diff, I don't know a way to do this automatically from the diff tool.
-
Well that was pretty straightforward. Edited out the full paths and now the patch will apply successfully. However it gives me the same error as another guy you helped out with a compile issue on here recently.
http://forum.arcadecontrols.com/index.php/topic,122177.0.html (http://forum.arcadecontrols.com/index.php/topic,122177.0.html)
I've got it compiling now with the default MinGW environment from M64 Compiler v 1.23, but have you any idea why it's not working with the new tools?
Thanks for the quick reply as always!
-
The attempt at compiling with default M64 environment ended up with this...
Any idea what's going wrong here?
src/osd/windows/window.c: In function 'LRESULT winwindow_video_window_proc(HWND__*, UINT, WPARAM, LPARAM)':
src/osd/windows/window.c:1557: error: expected '}' before 'else'
src/osd/windows/window.c:1564: error: case label '28' not within a switch statement
src/osd/windows/window.c:1566: error: break statement not within loop or switch
src/osd/windows/window.c:1569: error: case label '16' not within a switch statement
src/osd/windows/window.c:1574: error: break statement not within loop or switch
src/osd/windows/window.c:1577: error: case label '2' not within a switch statement
Finished!
1 Hours 18 Minutes and 14 Seconds Elapsed.
src/osd/windows/window.c:1585: error: case label '1026' not within a switch statement
src/osd/windows/window.c:1595: error: break statement not within loop or switch
src/osd/windows/window.c:1599: error: case label '1025' not within a switch statement
src/osd/windows/window.c:1601: error: break statement not within loop or switch
src/osd/windows/window.c:1604: error: case label '1027' not within a switch statement
src/osd/windows/window.c:1609: error: break statement not within loop or switch
src/osd/windows/window.c:1612: error: case label '1032' not within a switch statement
src/osd/windows/window.c:1617: error: break statement not within loop or switch
src/osd/windows/window.c:1620: error: case label '1029' not within a switch statement
src/osd/windows/window.c:1622: error: break statement not within loop or switch
src/osd/windows/window.c:1625: error: case label '1028' not within a switch statement
src/osd/windows/window.c:1627: error: break statement not within loop or switch
src/osd/windows/window.c:1628: error: case label '134' not within a switch statement
src/osd/windows/window.c:1641: error: case label not within a switch statement
src/osd/windows/window.c: At global scope:
src/osd/windows/window.c:1645: error: expected unqualified-id before 'return'
src/osd/windows/window.c:1646: error: expected declaration before '}' token
cc1plus.exe: warnings being treated as errors
src/osd/windows/window.c:119: error: 'win_physical_width' defined but not used
src/osd/windows/window.c:120: error: 'win_physical_height' defined but not used
src/osd/windows/window.c:163: error: 'void draw_video_contents(win_window_info*, HDC__*, int)' declared 'static' but never defined
src/osd/windows/window.c:170: error: 'void constrain_to_aspect_ratio(win_window_info*, RECT*, int)' declared 'static' but never defined
src/osd/windows/window.c:171: error: 'void get_min_bounds(win_window_info*, RECT*, int)' declared 'static' but never defined
src/osd/windows/window.c:172: error: 'void get_max_bounds(win_window_info*, RECT*, int)' declared 'static' but never defined
src/osd/windows/window.c:173: error: 'void update_minmax_state(win_window_info*)' declared 'static' but never defined
src/osd/windows/window.c:174: error: 'void minimize_window(win_window_info*)' declared 'static' but never defined
src/osd/windows/window.c:175: error: 'void maximize_window(win_window_info*)' declared 'static' but never defined
src/osd/windows/window.c:177: error: 'void adjust_window_position_after_major_change(win_window_info*)' declared 'static' but never defined
src/osd/windows/window.c:178: error: 'void set_fullscreen(win_window_info*, int)' declared 'static' but never defined
make: *** [obj/windows/osd/windows/window.o] Error 1
-
Hi Jonny G,
I've not tried to compile with the new tool chain yet so I'm not sure what can be wrong. This change happened to come in the worst possible moment for me, cause I'm in the process of rewritting most of the patch and so I'm stuck with the old tool chain and version 146u4. Once I have it up and running I'll update my compiling environment to the new one and update the patch for the newer versions.
-
Wicked!
Thanks man.
-
Hi,
I see you've uploaded the new 147 diff. Have you managed to get it to compile correctly? I'm still having issues with it. Does it need the new environment to build it, or should the old one work too?
Also, I'm pretty sure I'm right but just trying to think of what else I can try, it is hiscore patch first then groovymame patch isn't it?
-
Hi Jonny G,
I haven't compiled the v0.147 version yet. In order to compile the new core you need the new environment, which I can't install right now. This means that the Windows side of the patch has not been tested against the new compiler and probably needs some tweaking yet, so any attempt to compile it either with the old environment or the new one will be problematic. Sorry for the inconvenience, I'm progressing with the new patch but it still needs *a lot* of work.
-
It's cool, no fuss. I wouldn't know where to start!
I just obviously need something more in my life than waiting for the latest version of Groovy.
Good luck!
-
I got it to build making minor changes, but not sure if the changes are correct. I'm too lazy to make a patch but you can copy these files over the patched files and give it a shot :-)
-hexray
-
Hi hexray,
Thanks for sharing this, it will help me when I port the patch to the new environment (hopefully soon).
-
I'm not sure if anyone else tried it but today I actually tried to launch the executable and it locks up after showing the first screen. I had to start the task manager to forcefully kill it.. so it seems like I must have screwed up something :-(
-hexray
-
Hey peeps,
I spotted a new .diff went up yesterday so I tried to compile GM along with HiScore and it made it without any errors. However games are now running really slowly in MAME. I've had to compile it using the default environment that is installed with MAME Compiler 64 v1.23 because it simply refuses to start compiling if i replace it with the files from http://mamedev.org/tools/. (http://mamedev.org/tools/.)
Any advice on how to set this up properly? I get the feeling I'm missing some important step/part.
Thanks.
-
Hi Jonny G,
I haven't compiled anything myself since version 0.146u4, which was the last one I created. All the other patches since then have been updated by the community. I still need a week or two to finish the new patch.
-
No worries Pal , I guess I just get excited when a new diff goes up.