]> git.wh0rd.org - patches.git/blame - xiptech-xmame-0.105.patch
git.wh0rd.org / patches.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
initial import
[patches.git] / xiptech-xmame-0.105.patch
CommitLineData
5e993f12 1diff -Nur xmame-0.104.orig/Makefile xmame-0.104/Makefile
2--- xmame-0.104.orig/Makefile 2006-02-10 11:21:08.000000000 -0500
3+++ xmame-0.104/Makefile 2006-05-08 08:03:45.000000000 -0400
4@@ -33,12 +33,12 @@
5 ###########################################################################
6
7 # Uncomment one of these.
8-TARGET = mame
9+# TARGET = mame
10 # TARGET = mess
11 # TARGET = mage
12 # TARGET = mmsnd
13 # example for a tiny compile
14-# TARGET = tiny
15+ TARGET = tiny
16
17
18 ###########################################################################
19@@ -96,8 +96,16 @@
20 # means fewer frames to be skipped and better graphics, but `gcc' works
21 # just as well. However, stay away from the `cc' Ultrix compiler if
22 # possible.
23+RANLIB = bfin-uclinux-ranlib
24+AR = bfin-uclinux-ar
25+CC = bfin-uclinux-gcc
26+MY_CPU = bf537
27+
28+#RANLIB = ranlib
29+#AR = ar
30+#CC = gcc
31+#MY_CPU = i386
32
33-CC = gcc
34 # CC = cc
35 # CC = icc
36 # CC = c89
37@@ -108,8 +116,8 @@
38
39 # Compiler for host compilations in cross-compiling environments (used
40 # in src/unix/unix.mak for m68k).
41-HOST_CC = $(CC)
42-# HOST_CC = gcc
43+#HOST_CC = $(CC)
44+ HOST_CC = gcc
45
46
47 ###########################################################################
48@@ -127,7 +135,8 @@
49 ###########################################################################
50
51 # GCC on x86
52-CFLAGS = -O2
53+#CFLAGS = -O2
54+CFLAGS = -Wall -O2
55
56 # GCC on x86 with some optimizations
57 # CFLAGS = -O2 -mtune=i686 -fomit-frame-pointer -fstrength-reduce -ffast-math
58@@ -183,13 +192,13 @@
59 #########################################################################
60
61 # Check for C89 + GNU extensions compliance.
62- CFLAGS += -std=gnu89
63+ #CFLAGS += -std=gnu89
64
65 # Show all warnings.
66- CFLAGS += -Wall
67+ #CFLAGS += -Wall
68
69 # Don't warn about unused variables.
70- CFLAGS += -Wno-unused
71+ #CFLAGS += -Wno-unused
72
73 # Warn about declarations after statements.
74 # CFLAGS += -Wdeclaration-after-statement
75@@ -396,6 +405,8 @@
76 endif
77 endif
78
79+#lee edit here
80+CFLAGS += -w
81 ###########################################################################
82 # Inlining
83 ###########################################################################
84@@ -417,7 +428,11 @@
85 ###########################################################################
86
87 # Normal linking.
88+ifeq ($(MY_CPU), bf537)
89+LD = $(CC) -Wl,-elf2flt="-s 262144"
90+else
91 LD = $(CC) -Wl,-s
92+endif
93
94 # For a Linux/PowerPC system.
95 # LD = $(CC) -Wl,-s,--relax
96@@ -458,7 +473,6 @@
97
98 # Does your platform have ranlib? Leave this untouched unless you are
99 # using IRIX, Unixware 7, or the Intel C++ Compiler.
100-RANLIB = ranlib
101 # RANLIB = true
102
103
104@@ -502,10 +516,10 @@
105 ###########################################################################
106
107 # Uncomment next line to build expat as part of the build.
108-# BUILD_EXPAT = 1
109+ BUILD_EXPAT = 1
110
111 # Uncomment next line to build zlib as part of the build.
112-# BUILD_ZLIB = 1
113+ BUILD_ZLIB = 1
114
115 # Does your system support the gettimeofday() function? If so, we
116 # encourage you to enable this feature. Otherwise, comment it out.
117@@ -540,8 +554,11 @@
118 BINDIR = $(PREFIX)/bin
119 MANDIR = $(PREFIX)/man/man6
120
121+#lee edit
122+MYROOT=/home/lee/mame/xmame-0.104/root
123 # This is the default path for ROMs and other data files.
124-XMAMEROOT = $(PREFIX)/share/x$(TARGET)
125+#XMAMEROOT = $(PREFIX)/share/x$(TARGET)
126+XMAMEROOT = $(MYROOT)/x$(TARGET)
127 # This is the default path for system-wide configuration files.
128 SYSCONFDIR = $(XMAMEROOT)
129
130@@ -549,9 +566,9 @@
131 ###########################################################################
132 # Architecture; choose your CPU (only one!!)
133 ###########################################################################
134-
135+#MY_CPU = bf537
136 # i386, GNU asm
137-MY_CPU = i386
138+#MY_CPU = i386
139
140 # i386, no asm -- needed for the Intel C++ compiler, which does not fully
141 # understand GCC's inline assembly syntax, though you may still enable
142@@ -658,7 +675,7 @@
143 # JOY_PS2 = 1
144
145 # SDL joystick support.
146-# JOY_SDL = 1
147+JOY_SDL = 1
148
149 # This will enable the use of the Happ Controls UGCI(tm) USB devices'
150 # Coin/Start inputs using the libugci library available from
151@@ -689,7 +706,7 @@
152 # SOUND_ALSA = 1
153 # SOUND_ARTS_TEIRA = 1
154 # SOUND_ARTS_SMOTEK = 1
155-# SOUND_SDL = 1
156+ SOUND_SDL = 1
157 # SOUND_WAVEOUT = 1
158
159
160@@ -701,10 +718,10 @@
161 # use SDL.
162
163 # X11 (including Glide & OpenGL if enabled below)
164-DISPLAY_METHOD = x11
165+# DISPLAY_METHOD = x11
166
167 # SDL library
168-# DISPLAY_METHOD = SDL
169+ DISPLAY_METHOD = SDL
170
171 # SVGALib, only supported under Linux
172 # DISPLAY_METHOD = svgalib
173@@ -729,10 +746,10 @@
174 # Uncomment any extensions you wish to use.
175
176 # MIT-Shared Memory X Extensions
177-X11_MITSHM = 1
178+#X11_MITSHM = 1
179
180 # Use Xv extension for hardware scaling.
181-X11_XV = 1
182+#X11_XV = 1
183
184 # Enable XFree86 DGA. This also causes "make install" to set the suid bit
185 # on the executable.
186@@ -756,8 +773,8 @@
187 # X11LIB = -L/usr/lib/X11
188
189 # Standard location for XFree86
190-X11INC = -I/usr/X11R6/include
191-X11LIB = -L/usr/X11R6/lib
192+#X11INC = -I/usr/X11R6/include
193+#X11LIB = -L/usr/X11R6/lib
194
195 # Standard location for Sun systems
196 # X11INC = -I/usr/openwin/include
197@@ -784,8 +801,8 @@
198 ##############################################################################
199
200 # The name of your sdl-config executable
201-SDL_CONFIG = sdl-config
202-
203+#SDL_CONFIG = sdl-config
204+SDL_CONFIG = './sdl_fake_config.sh'
205
206 ##############################################################################
207 # 3Dfx options (only needed when xfx or svgafx is the display method)
208@@ -815,7 +832,7 @@
209 #
210 # If you wish you can add -DNOGLCHECKS for a small speedup, but this is not
211 # advised, or you can add -DGLDEBUG to get more verbose debugging messages.
212-GLCFLAGS += -D_X11_
213+#GLCFLAGS += -D_X11_
214
215 # Uncomment to add more libraries that Mesa may require.
216 # GLLIBS += -lXmu -lXi
217diff -Nur xmame-0.104.orig/makefile.unix xmame-0.104/makefile.unix
218--- xmame-0.104.orig/makefile.unix 2006-02-10 11:21:08.000000000 -0500
219+++ xmame-0.104/makefile.unix 2006-05-08 08:03:45.000000000 -0400
220@@ -33,12 +33,12 @@
221 ###########################################################################
222
223 # Uncomment one of these.
224-TARGET = mame
225+# TARGET = mame
226 # TARGET = mess
227 # TARGET = mage
228 # TARGET = mmsnd
229 # example for a tiny compile
230-# TARGET = tiny
231+ TARGET = tiny
232
233
234 ###########################################################################
235@@ -96,8 +96,16 @@
236 # means fewer frames to be skipped and better graphics, but `gcc' works
237 # just as well. However, stay away from the `cc' Ultrix compiler if
238 # possible.
239+RANLIB = bfin-uclinux-ranlib
240+AR = bfin-uclinux-ar
241+CC = bfin-uclinux-gcc
242+MY_CPU = bf537
243+
244+#RANLIB = ranlib
245+#AR = ar
246+#CC = gcc
247+#MY_CPU = i386
248
249-CC = gcc
250 # CC = cc
251 # CC = icc
252 # CC = c89
253@@ -108,8 +116,8 @@
254
255 # Compiler for host compilations in cross-compiling environments (used
256 # in src/unix/unix.mak for m68k).
257-HOST_CC = $(CC)
258-# HOST_CC = gcc
259+#HOST_CC = $(CC)
260+ HOST_CC = gcc
261
262
263 ###########################################################################
264@@ -127,7 +135,8 @@
265 ###########################################################################
266
267 # GCC on x86
268-CFLAGS = -O2
269+#CFLAGS = -O2
270+CFLAGS = -Wall -O2
271
272 # GCC on x86 with some optimizations
273 # CFLAGS = -O2 -mtune=i686 -fomit-frame-pointer -fstrength-reduce -ffast-math
274@@ -183,13 +192,13 @@
275 #########################################################################
276
277 # Check for C89 + GNU extensions compliance.
278- CFLAGS += -std=gnu89
279+ #CFLAGS += -std=gnu89
280
281 # Show all warnings.
282- CFLAGS += -Wall
283+ #CFLAGS += -Wall
284
285 # Don't warn about unused variables.
286- CFLAGS += -Wno-unused
287+ #CFLAGS += -Wno-unused
288
289 # Warn about declarations after statements.
290 # CFLAGS += -Wdeclaration-after-statement
291@@ -396,6 +405,8 @@
292 endif
293 endif
294
295+#lee edit here
296+CFLAGS += -w
297 ###########################################################################
298 # Inlining
299 ###########################################################################
300@@ -417,7 +428,11 @@
301 ###########################################################################
302
303 # Normal linking.
304+ifeq ($(MY_CPU), bf537)
305+LD = $(CC) -Wl,-elf2flt="-s 262144"
306+else
307 LD = $(CC) -Wl,-s
308+endif
309
310 # For a Linux/PowerPC system.
311 # LD = $(CC) -Wl,-s,--relax
312@@ -458,7 +473,6 @@
313
314 # Does your platform have ranlib? Leave this untouched unless you are
315 # using IRIX, Unixware 7, or the Intel C++ Compiler.
316-RANLIB = ranlib
317 # RANLIB = true
318
319
320@@ -502,10 +516,10 @@
321 ###########################################################################
322
323 # Uncomment next line to build expat as part of the build.
324-# BUILD_EXPAT = 1
325+ BUILD_EXPAT = 1
326
327 # Uncomment next line to build zlib as part of the build.
328-# BUILD_ZLIB = 1
329+ BUILD_ZLIB = 1
330
331 # Does your system support the gettimeofday() function? If so, we
332 # encourage you to enable this feature. Otherwise, comment it out.
333@@ -540,8 +554,11 @@
334 BINDIR = $(PREFIX)/bin
335 MANDIR = $(PREFIX)/man/man6
336
337+#lee edit
338+MYROOT=/home/lee/mame/xmame-0.104/root
339 # This is the default path for ROMs and other data files.
340-XMAMEROOT = $(PREFIX)/share/x$(TARGET)
341+#XMAMEROOT = $(PREFIX)/share/x$(TARGET)
342+XMAMEROOT = $(MYROOT)/x$(TARGET)
343 # This is the default path for system-wide configuration files.
344 SYSCONFDIR = $(XMAMEROOT)
345
346@@ -549,9 +566,9 @@
347 ###########################################################################
348 # Architecture; choose your CPU (only one!!)
349 ###########################################################################
350-
351+#MY_CPU = bf537
352 # i386, GNU asm
353-MY_CPU = i386
354+#MY_CPU = i386
355
356 # i386, no asm -- needed for the Intel C++ compiler, which does not fully
357 # understand GCC's inline assembly syntax, though you may still enable
358@@ -658,7 +675,7 @@
359 # JOY_PS2 = 1
360
361 # SDL joystick support.
362-# JOY_SDL = 1
363+JOY_SDL = 1
364
365 # This will enable the use of the Happ Controls UGCI(tm) USB devices'
366 # Coin/Start inputs using the libugci library available from
367@@ -689,7 +706,7 @@
368 # SOUND_ALSA = 1
369 # SOUND_ARTS_TEIRA = 1
370 # SOUND_ARTS_SMOTEK = 1
371-# SOUND_SDL = 1
372+ SOUND_SDL = 1
373 # SOUND_WAVEOUT = 1
374
375
376@@ -701,10 +718,10 @@
377 # use SDL.
378
379 # X11 (including Glide & OpenGL if enabled below)
380-DISPLAY_METHOD = x11
381+# DISPLAY_METHOD = x11
382
383 # SDL library
384-# DISPLAY_METHOD = SDL
385+ DISPLAY_METHOD = SDL
386
387 # SVGALib, only supported under Linux
388 # DISPLAY_METHOD = svgalib
389@@ -729,10 +746,10 @@
390 # Uncomment any extensions you wish to use.
391
392 # MIT-Shared Memory X Extensions
393-X11_MITSHM = 1
394+#X11_MITSHM = 1
395
396 # Use Xv extension for hardware scaling.
397-X11_XV = 1
398+#X11_XV = 1
399
400 # Enable XFree86 DGA. This also causes "make install" to set the suid bit
401 # on the executable.
402@@ -756,8 +773,8 @@
403 # X11LIB = -L/usr/lib/X11
404
405 # Standard location for XFree86
406-X11INC = -I/usr/X11R6/include
407-X11LIB = -L/usr/X11R6/lib
408+#X11INC = -I/usr/X11R6/include
409+#X11LIB = -L/usr/X11R6/lib
410
411 # Standard location for Sun systems
412 # X11INC = -I/usr/openwin/include
413@@ -784,8 +801,8 @@
414 ##############################################################################
415
416 # The name of your sdl-config executable
417-SDL_CONFIG = sdl-config
418-
419+#SDL_CONFIG = sdl-config
420+SDL_CONFIG = './sdl_fake_config.sh'
421
422 ##############################################################################
423 # 3Dfx options (only needed when xfx or svgafx is the display method)
424@@ -815,7 +832,7 @@
425 #
426 # If you wish you can add -DNOGLCHECKS for a small speedup, but this is not
427 # advised, or you can add -DGLDEBUG to get more verbose debugging messages.
428-GLCFLAGS += -D_X11_
429+#GLCFLAGS += -D_X11_
430
431 # Uncomment to add more libraries that Mesa may require.
432 # GLLIBS += -lXmu -lXi
433diff -Nur xmame-0.104.orig/readme.537 xmame-0.104/readme.537
434--- xmame-0.104.orig/readme.537 1969-12-31 19:00:00.000000000 -0500
435+++ xmame-0.104/readme.537 2006-05-08 06:54:54.000000000 -0400
436@@ -0,0 +1,4 @@
437+1.edit sdl_fake_config.sh\r
438+set your SDL_PATH\r
439+2.make\r
440+./make
441\ No newline at end of file
442diff -Nur xmame-0.104.orig/src/drivers/pacman.c xmame-0.104/src/drivers/pacman.c
443--- xmame-0.104.orig/src/drivers/pacman.c 2006-02-10 11:20:48.000000000 -0500
444+++ xmame-0.104/src/drivers/pacman.c 2006-05-08 08:05:51.000000000 -0400
445@@ -4951,7 +4951,7 @@
446 GAME( 1983, sprglobp, suprglob, theglobp, theglobp, 0, ROT90, "Epos Corporation", "Super Glob (Pac-Man hardware)", GAME_SUPPORTS_SAVE )
447 GAME( 1984, beastf, suprglob, theglobp, theglobp, 0, ROT90, "Epos Corporation", "Beastie Feastie", GAME_SUPPORTS_SAVE )
448 GAME( 1984, drivfrcp, 0, drivfrcp, drivfrcp, 0, ROT90, "Shinkai Inc. (Magic Eletronics Inc. licence)", "Driving Force (Pac-Man conversion)", GAME_SUPPORTS_SAVE )
449-GAME( 1985, 8bpm, 8ballact, 8bpm, 8bpm, 8bpm, ROT90, "Seatongrove Ltd (Magic Eletronics USA licence)", "Eight Ball Action (Pac-Man conversion)", GAME_SUPPORTS_SAVE )
450+//GAME( 1985, 8bpm, 8ballact, 8bpm, 8bpm, 8bpm, ROT90, "Seatongrove Ltd (Magic Eletronics USA licence)", "Eight Ball Action (Pac-Man conversion)", GAME_SUPPORTS_SAVE )
451 GAME( 1985, porky, 0, porky, porky, porky, ROT90, "Shinkai Inc. (Magic Eletronics Inc. licence)", "Porky", GAME_NO_SOUND )
452 GAME( 1986, rocktrv2, 0, rocktrv2, rocktrv2, rocktrv2, ROT90, "Triumph Software Inc.", "MTV Rock-N-Roll Trivia (Part 2)", GAME_SUPPORTS_SAVE )
453 GAME( 1986, bigbucks, 0, bigbucks, bigbucks, 0, ROT90, "Dynasoft Inc.", "Big Bucks", GAME_SUPPORTS_SAVE )
454diff -Nur xmame-0.104.orig/src/mame.mak xmame-0.104/src/mame.mak
455--- xmame-0.104.orig/src/mame.mak 2006-02-10 11:20:48.000000000 -0500
456+++ xmame-0.104/src/mame.mak 2006-05-08 08:04:44.000000000 -0400
457@@ -41,25 +41,25 @@
458 CPUS += DECO16
459 #CPUS += M4510
460 CPUS += H6280
461-CPUS += I86
462-CPUS += I88
463-CPUS += I186
464+#CPUS += I86
465+#CPUS += I88
466+#CPUS += I186
467 #CPUS += I188
468 #CPUS += I286
469-CPUS += V20
470-CPUS += V30
471-CPUS += V33
472-CPUS += V60
473-CPUS += V70
474-CPUS += I8035
475-CPUS += I8039
476-CPUS += I8048
477-CPUS += N7751
478-CPUS += I8X41
479-CPUS += I8051
480-CPUS += I8052
481-CPUS += I8751
482-CPUS += I8752
483+#CPUS += V20
484+#CPUS += V30
485+#CPUS += V33
486+#CPUS += V60
487+#CPUS += V70
488+#CPUS += I8035
489+#CPUS += I8039
490+#CPUS += I8048
491+#CPUS += N7751
492+#CPUS += I8X41
493+#CPUS += I8051
494+#CPUS += I8052
495+#CPUS += I8751
496+#CPUS += I8752
497 CPUS += M6800
498 CPUS += M6801
499 CPUS += M6802
500@@ -103,57 +103,57 @@
501 CPUS += ADSP2105
502 CPUS += ADSP2115
503 CPUS += ADSP2181
504-CPUS += PSXCPU
505+#CPUS += PSXCPU
506 CPUS += ASAP
507 CPUS += UPD7810
508 CPUS += UPD7807
509-CPUS += ARM
510-CPUS += ARM7
511+#CPUS += ARM
512+#CPUS += ARM7
513 CPUS += JAGUAR
514-CPUS += R3000
515-CPUS += R4600
516-CPUS += R4700
517-CPUS += R5000
518-CPUS += QED5271
519-CPUS += RM7000
520+#CPUS += R3000
521+#CPUS += R4600
522+#CPUS += R4700
523+#CPUS += R5000
524+#CPUS += QED5271
525+#CPUS += RM7000
526 CPUS += SH2
527 CPUS += DSP32C
528 #CPUS += PIC16C54
529-CPUS += PIC16C55
530+#CPUS += PIC16C55
531 #CPUS += PIC16C56
532-CPUS += PIC16C57
533+#CPUS += PIC16C57
534 #CPUS += PIC16C58
535-CPUS += G65816
536-CPUS += SPC700
537-CPUS += E116T
538+#CPUS += G65816
539+##CPUS += SPC700
540+#CPUS += E116T
541 #CPUS += E116XT
542 #CPUS += E116XS
543 #CPUS += E116XSR
544-CPUS += E132N
545+#CPUS += E132N
546 #CPUS += E132T
547 #CPUS += E132XN
548-CPUS += E132XT
549+#CPUS += E132XT
550 #CPUS += E132XS
551 #CPUS += E132XSR
552-CPUS += GMS30C2116
553+#CPUS += GMS30C2116
554 #CPUS += GMS30C2132
555 #CPUS += GMS30C2216
556 #CPUS += GMS30C2232
557-CPUS += I386
558+#CPUS += I386
559 #CPUS += I486
560-CPUS += PENTIUM
561-CPUS += MEDIAGX
562-CPUS += I960
563-CPUS += H83002
564-CPUS += V810
565-CPUS += M37710
566-CPUS += PPC403
567-CPUS += PPC602
568-CPUS += PPC603
569-CPUS += SE3208
570-CPUS += MC68HC11
571-CPUS += ADSP21062
572-CPUS += DSP56156
573+#CPUS += PENTIUM
574+#CPUS += MEDIAGX
575+#CPUS += I960
576+#CPUS += H83002
577+#CPUS += V810
578+#CPUS += M37710
579+#CPUS += PPC403
580+#CPUS += PPC602
581+#CPUS += PPC603
582+#CPUS += SE3208
583+#CPUS += MC68HC11
584+#CPUS += ADSP21062
585+#CPUS += DSP56156
586
587
588
589diff -Nur xmame-0.104.orig/src/tiny.mak xmame-0.104/src/tiny.mak
590--- xmame-0.104.orig/src/tiny.mak 2006-02-10 11:20:48.000000000 -0500
591+++ xmame-0.104/src/tiny.mak 2006-05-08 08:04:44.000000000 -0400
592@@ -1,16 +1,23 @@
593 # a tiny compile is without Neogeo games
594-COREDEFS += -DTINY_NAME="driver_robby,driver_gridlee,driver_polyplay"
595-COREDEFS += -DTINY_POINTER="&driver_robby,&driver_gridlee,&driver_polyplay"
596+COREDEFS += -DTINY_NAME="driver_robby,driver_gridlee,driver_polyplay,driver_puckman,driver_mspacman,driver_pacman"
597+COREDEFS += -DTINY_POINTER="&driver_robby,&driver_gridlee,&driver_polyplay,&driver_puckman,&driver_mspacman,&driver_pacman"
598
599 # uses these CPUs
600 CPUS+=Z80
601 CPUS+=M6809
602+CPUS += I8035
603+CPUS += N2A03
604
605 # uses these SOUNDs
606 SOUNDS+=CUSTOM
607 SOUNDS+=SN76496
608 SOUNDS+=SAMPLES
609 SOUNDS+=ASTROCADE
610+#SOUNDS += SAMPLES
611+SOUNDS+=NAMCO
612+#SOUNDS += SN76496
613+SOUNDS += AY8910
614+SOUNDS += DAC
615
616 DRVLIBS = \
617 $(OBJ)/machine/astrocde.o $(OBJ)/vidhrdw/astrocde.o \
618@@ -18,6 +25,16 @@
619 $(OBJ)/vidhrdw/gridlee.o $(OBJ)/sndhrdw/gridlee.o $(OBJ)/drivers/gridlee.o \
620 $(OBJ)/vidhrdw/polyplay.o $(OBJ)/sndhrdw/polyplay.o $(OBJ)/drivers/polyplay.o \
621 $(OBJ)/machine/random.o \
622+ $(OBJ)/drivers/pacman.o $(OBJ)/vidhrdw/pacman.o \
623+ $(OBJ)/machine/mspacman.o \
624+ $(OBJ)/machine/pacplus.o \
625+ $(OBJ)/machine/theglobp.o \
626+ $(OBJ)/machine/acitya.o \
627+ $(OBJ)/machine/jumpshot.o \
628+ $(OBJ)/drivers/epos.o $(OBJ)/vidhrdw/epos.o \
629+ $(OBJ)/machine/8255ppi.o \
630
631+
632+
633 # MAME specific core objs
634-COREOBJS += $(OBJ)/tiny.o $(OBJ)/cheat.o
635+COREOBJS += $(OBJ)/tiny.o
636diff -Nur xmame-0.104.orig/src/unix/config.c xmame-0.104/src/unix/config.c
637--- xmame-0.104.orig/src/unix/config.c 2006-02-16 23:32:44.000000000 -0500
638+++ xmame-0.104/src/unix/config.c 2006-05-08 08:05:13.000000000 -0400
639@@ -230,6 +230,9 @@
640 /*
641 * get configuration from configfile and env.
642 */
643+
644+static char my_dir[]="/var";//lee 2006-4-22
645+
646 int xmame_config_init(int argc, char *argv[])
647 {
648 char buffer[BUF_SIZE];
649@@ -280,7 +283,10 @@
650 /* get the homedir */
651 if(!(home_dir = get_home_dir()))
652 return OSD_NOT_OK;
653-
654+
655+ home_dir = my_dir;//lee 2006-4-22
656+
657+ fprintf(stderr,"PATH_LEADER:%s,home_dir:%s,NAME:%s\n",PATH_LEADER,home_dir,NAME);
658 /* check that the required dirs exist, and create them if necessary */
659 snprintf(buffer, BUF_SIZE, "%s/"PATH_LEADER"%s", home_dir, NAME);
660 if (check_and_create_dir(buffer))
661diff -Nur xmame-0.104.orig/src/unix/devices.c xmame-0.104/src/unix/devices.c
662--- xmame-0.104.orig/src/unix/devices.c 2006-02-10 11:20:58.000000000 -0500
663+++ xmame-0.104/src/unix/devices.c 2006-05-08 08:05:14.000000000 -0400
664@@ -591,7 +591,8 @@
665 joy_ps2_init();
666 break;
667 #endif
668-#if defined SDL || defined SDL_JOYSTICK
669+//#if defined SDL || defined SDL_JOYSTICK/*lee 06-4-30*/
670+#if defined SDL_JOYSTICK
671 case JOY_SDL:
672 joy_SDL_init();
673 break;
674diff -Nur xmame-0.104.orig/src/unix/unix.mak xmame-0.104/src/unix/unix.mak
675--- xmame-0.104.orig/src/unix/unix.mak 2006-02-15 01:45:51.000000000 -0500
676+++ xmame-0.104/src/unix/unix.mak 2006-05-08 08:05:30.000000000 -0400
677@@ -4,7 +4,7 @@
678
679 # *** Comment out this line to get verbose make output, for debugging build
680 # problems
681-QUIET = 1
682+#QUIET = 1
683
684
685 ##############################################################################
686@@ -21,7 +21,7 @@
687 CFLAGS.risc = -DALIGN_INTS -DALIGN_SHORTS
688 CFLAGS.risc_lsb = -DALIGN_INTS -DALIGN_SHORTS -DLSB_FIRST
689 CFLAGS.mips = -DALIGN_INTS -DALIGN_SHORTS -DSGI_FIX_MWA_NOP
690-
691+CFLAGS.bf537 = -DLSB_FIRST -DALIGN_INTS -DALIGN_SHORTS
692 ##############################################################################
693 # Architecture-dependent settings
694 ##############################################################################
695@@ -230,6 +230,10 @@
696 ifeq ($(TARGET), mess)
697 include mess/$(TARGET).mak
698 endif
699+#lee add
700+ifeq ($(TARGET), tiny)
701+include src/$(TARGET).mak
702+endif
703
704 include src/cpu/cpu.mak
705 include src/sound/sound.mak
706@@ -255,9 +259,9 @@
707 -DHAVE_UNISTD_H=1 \
708 $(COREDEFS) $(SOUNDDEFS) $(CPUDEFS) $(ASMDEFS) \
709 $(INCLUDES) $(INCLUDE_PATH)
710-
711-MY_LIBS = $(LIBS) $(LIBS.$(ARCH)) $(LIBS.$(DISPLAY_METHOD)) -lz
712-
713+#lee
714+#MY_LIBS = $(LIBS) $(LIBS.$(ARCH)) $(LIBS.$(DISPLAY_METHOD)) -lz
715+MY_LIBS = $(LIBS) $(LIBS.$(ARCH)) $(LIBS.$(DISPLAY_METHOD))
716 ifdef SEPARATE_LIBM
717 MY_LIBS += -lm
718 endif
719@@ -288,8 +292,8 @@
720
721 # The SDL target automatically includes the SDL joystick and audio drivers.
722 ifeq ($(DISPLAY_METHOD),SDL)
723-JOY_SDL = 1
724-SOUND_SDL = 1
725+JOY_SDL = 0
726+SOUND_SDL = 0
727 endif
728
729 ##############################################################################
730@@ -433,7 +437,11 @@
731 ##############################################################################
732
733 # per arch
734+ifeq ($(MY_CPU), bf537)
735+CFLAGS.linux = -DSYSDEP_DSP_OSS -DSYSDEP_MIXER_OSS -DHAVE_SNPRINTF -DHAVE_VSNPRINTF -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=32
736+else
737 CFLAGS.linux = -DSYSDEP_DSP_OSS -DSYSDEP_MIXER_OSS -DHAVE_SNPRINTF -DHAVE_VSNPRINTF -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
738+endif
739 CFLAGS.freebsd = -DSYSDEP_DSP_OSS -DSYSDEP_MIXER_OSS -DHAVE_SNPRINTF -DHAVE_VSNPRINTF -DHAVE_STRLCAT
740 CFLAGS.netbsd = -DSYSDEP_DSP_NETBSD -DHAVE_SNPRINTF -DHAVE_VSNPRINTF -DHAVE_STRLCAT
741 CFLAGS.openbsd = -DSYSDEP_DSP_NETBSD -DHAVE_SNPRINTF -DHAVE_VSNPRINTF -DHAVE_STRLCAT
742@@ -558,9 +566,9 @@
743 ##############################################################################
744
745 $(NAME).$(DISPLAY_METHOD): $(EXPAT) $(ZLIB) $(OBJS) $(UNIX_OBJS) $(OSDEPEND)
746- $(CC_COMMENT) @echo 'Linking $@ ...'
747- $(CC_COMPILE) $(LD) $(LDFLAGS) -o $@ $(OBJS) $(EXPAT) $(ZLIB) $(UNIX_OBJS) $(OSDEPEND) $(MY_LIBS)
748-
749+ $(CC_COMMENT) @echo 'Linkinging $@ ...'
750+ $(CC_COMPILE) $(LD) $(LDFLAGS) -o $@ $(OBJS) $(EXPAT) $(ZLIB) $(UNIX_OBJS) $(OSDEPEND) $(MY_LIBS)
751+
752 maketree: $(sort $(OBJDIRS))
753
754 $(sort $(OBJDIRS)):
755@@ -592,8 +600,9 @@
756
757 imgtool: $(IMGTOOL_OBJS) $(ZLIB) $(PLATFORM_IMGTOOL_OBJS)
758 $(CC_COMMENT) @echo 'Compiling $@...'
759- $(CC_COMPILE) $(LD) $(LDFLAGS) $^ -lz -o $@
760-
761+#lee
762+# $(CC_COMPILE) $(LD) $(LDFLAGS) $^ -lz -o $@
763+ $(CC_COMPILE) $(LD) $(LDFLAGS) $^ -o $@
764 messtest: $(OBJS) $(MESSTEST_OBJS) \
765 $(OBJDIR)/dirio.o \
766 $(OBJDIR)/fileio.o \
767@@ -638,12 +647,12 @@
768
769 $(OBJ)/%.a:
770 $(CC_COMMENT) @echo 'Archiving $@ ...'
771- $(CC_COMPILE) ar $(AR_OPTS) $@ $^
772+ $(CC_COMPILE) $(AR) $(AR_OPTS) $@ $^
773 $(CC_COMPILE) $(RANLIB) $@
774
775 $(OSDEPEND): $(UNIX_OBJS)
776 $(CC_COMMENT) @echo '[OSDEPEND] Archiving $@ ...'
777- $(CC_COMPILE) ar $(AR_OPTS) $@ $(UNIX_OBJS)
778+ $(CC_COMPILE) $(AR) $(AR_OPTS) $@ $(UNIX_OBJS)
779 $(CC_COMPILE) $(RANLIB) $@
780
781 $(UNIX_OBJDIR)/%.o: src/unix/%.c src/unix/xmame.h
782diff -Nur xmame-0.104.orig/src/unix/video-drivers/SDL.c xmame-0.104/src/unix/video-drivers/SDL.c
783--- xmame-0.104.orig/src/unix/video-drivers/SDL.c 2006-02-10 11:21:07.000000000 -0500
784+++ xmame-0.104/src/unix/video-drivers/SDL.c 2006-05-08 08:06:30.000000000 -0400
785@@ -547,17 +553,22 @@
786 case SDL_KEYDOWN:
787 kevent.press = 1;
788 case SDL_KEYUP:
789 kevent.scancode = klookup[event.key.keysym.sym];
790 kevent.unicode = event.key.keysym.unicode;
791 sysdep_display_params.keyboard_handler(&kevent);
792 if(!kevent.scancode)
793 fprintf (stderr, "Unknown symbol 0x%x\n",
794 event.key.keysym.sym);
795 #ifdef SDL_DEBUG
796 fprintf (stderr, "Key %s %ssed\n",
797 SDL_GetKeyName(event.key.keysym.sym),
798 kevent.press? "pres":"relea");
799 #endif
800+
801+
802+if (event.key.keysym.sym == SDLK_q)/*lee 5-4:tmp exit*/
803+ exit(0);
804+
805 break;
806 case SDL_QUIT:
807 retval |= SYSDEP_DISPLAY_QUIT_REQUESTED;
random patches; mostly (all?) dead