head 1.41; access; symbols pkgsrc-2013Q2:1.41.0.8 pkgsrc-2013Q2-base:1.41 pkgsrc-2012Q4:1.41.0.6 pkgsrc-2012Q4-base:1.41 pkgsrc-2011Q4:1.41.0.4 pkgsrc-2011Q4-base:1.41 pkgsrc-2011Q2:1.41.0.2 pkgsrc-2011Q2-base:1.41 pkgsrc-2010Q4:1.40.0.42 pkgsrc-2010Q4-base:1.40 pkgsrc-2010Q3:1.40.0.40 pkgsrc-2010Q3-base:1.40 pkgsrc-2010Q2:1.40.0.38 pkgsrc-2010Q2-base:1.40 pkgsrc-2010Q1:1.40.0.36 pkgsrc-2010Q1-base:1.40 pkgsrc-2009Q4:1.40.0.34 pkgsrc-2009Q4-base:1.40 pkgsrc-2009Q3:1.40.0.32 pkgsrc-2009Q3-base:1.40 pkgsrc-2009Q2:1.40.0.30 pkgsrc-2009Q2-base:1.40 pkgsrc-2009Q1:1.40.0.28 pkgsrc-2009Q1-base:1.40 pkgsrc-2008Q4:1.40.0.26 pkgsrc-2008Q4-base:1.40 pkgsrc-2008Q3:1.40.0.24 pkgsrc-2008Q3-base:1.40 cube-native-xorg:1.40.0.22 cube-native-xorg-base:1.40 pkgsrc-2008Q2:1.40.0.20 pkgsrc-2008Q2-base:1.40 cwrapper:1.40.0.18 pkgsrc-2008Q1:1.40.0.16 pkgsrc-2008Q1-base:1.40 pkgsrc-2007Q4:1.40.0.14 pkgsrc-2007Q4-base:1.40 pkgsrc-2007Q3:1.40.0.12 pkgsrc-2007Q3-base:1.40 pkgsrc-2007Q2:1.40.0.10 pkgsrc-2007Q2-base:1.40 pkgsrc-2007Q1:1.40.0.8 pkgsrc-2007Q1-base:1.40 pkgsrc-2006Q4:1.40.0.6 pkgsrc-2006Q4-base:1.40 pkgsrc-2006Q3:1.40.0.4 pkgsrc-2006Q3-base:1.40 pkgsrc-2006Q2:1.40.0.2 pkgsrc-2006Q2-base:1.40 pkgsrc-2006Q1:1.39.0.2 pkgsrc-2006Q1-base:1.39 pkgsrc-2005Q4:1.37.0.2 pkgsrc-2005Q4-base:1.37 pkgsrc-2005Q3:1.36.0.4 pkgsrc-2005Q3-base:1.36 pkgsrc-2005Q2:1.36.0.2 pkgsrc-2005Q2-base:1.36 pkgsrc-2005Q1:1.35.0.4 pkgsrc-2005Q1-base:1.35 pkgsrc-2004Q4:1.35.0.2 pkgsrc-2004Q4-base:1.35 pkgsrc-2004Q3:1.34.0.6 pkgsrc-2004Q3-base:1.34 pkgsrc-2004Q2:1.34.0.4 pkgsrc-2004Q2-base:1.34 pkgsrc-2004Q1:1.34.0.2 pkgsrc-2004Q1-base:1.34 pkgsrc-2003Q4:1.33.0.2 pkgsrc-2003Q4-base:1.33 netbsd-1-6-1:1.30.0.6 netbsd-1-6-1-base:1.30 netbsd-1-6:1.30.0.8 netbsd-1-6-RELEASE-base:1.30 pkgviews:1.30.0.4 pkgviews-base:1.30 buildlink2:1.30.0.2 buildlink2-base:1.30 netbsd-1-5-PATCH003:1.30 netbsd-1-5-PATCH001:1.26 netbsd-1-5-RELEASE:1.24 netbsd-1-4-PATCH003:1.24 netbsd-1-4-PATCH002:1.21 comdex-fall-1999:1.19 netbsd-1-4-PATCH001:1.18 netbsd-1-4-RELEASE:1.18 netbsd-1-3-PATCH003:1.14 netbsd-1-3-PATCH002:1.3; locks; strict; comment @# @; 1.41 date 2011.02.06.05.00.57; author wiz; state dead; branches; next 1.40; 1.40 date 2006.06.15.11.40.00; author dillo; state Exp; branches; next 1.39; 1.39 date 2006.03.09.20.51.43; author kristerw; state Exp; branches; next 1.38; 1.38 date 2006.01.22.18.37.13; author kristerw; state Exp; branches; next 1.37; 1.37 date 2005.12.03.10.57.49; author kristerw; state Exp; branches; next 1.36; 1.36 date 2005.05.12.22.35.18; author kristerw; state Exp; branches; next 1.35; 1.35 date 2004.11.06.21.41.52; author kristerw; state Exp; branches; next 1.34; 1.34 date 2004.02.21.00.08.00; author kristerw; state Exp; branches; next 1.33; 1.33 date 2003.05.27.12.42.39; author kristerw; state Exp; branches; next 1.32; 1.32 date 2003.04.13.17.37.16; author kristerw; state Exp; branches; next 1.31; 1.31 date 2003.02.13.20.53.48; author kristerw; state dead; branches; next 1.30; 1.30 date 2002.01.03.00.08.35; author kristerw; state Exp; branches; next 1.29; 1.29 date 2001.12.04.05.52.23; author jlam; state Exp; branches; next 1.28; 1.28 date 2001.11.23.23.51.24; author kristerw; state Exp; branches; next 1.27; 1.27 date 2001.05.21.07.12.50; author mrg; state Exp; branches; next 1.26; 1.26 date 2001.03.24.19.52.34; author kristerw; state Exp; branches; next 1.25; 1.25 date 2000.11.05.00.43.31; author mycroft; state Exp; branches; next 1.24; 1.24 date 2000.07.13.20.54.04; author martin; state Exp; branches; next 1.23; 1.23 date 2000.03.16.12.41.22; author wiz; state Exp; branches; next 1.22; 1.22 date 2000.03.14.11.42.54; author soren; state Exp; branches; next 1.21; 1.21 date 2000.01.20.18.54.50; author soren; state Exp; branches; next 1.20; 1.20 date 99.11.10.08.01.29; author soren; state Exp; branches; next 1.19; 1.19 date 99.07.27.03.20.38; author mycroft; state Exp; branches; next 1.18; 1.18 date 99.04.03.21.45.16; author mycroft; state Exp; branches; next 1.17; 1.17 date 98.12.15.10.34.34; author mycroft; state Exp; branches; next 1.16; 1.16 date 98.11.12.23.20.10; author frueauf; state Exp; branches; next 1.15; 1.15 date 98.10.25.22.06.23; author mycroft; state Exp; branches; next 1.14; 1.14 date 98.09.05.12.27.40; author mycroft; state Exp; branches; next 1.13; 1.13 date 98.09.01.06.58.13; author mycroft; state Exp; branches; next 1.12; 1.12 date 98.08.31.08.12.19; author mycroft; state Exp; branches; next 1.11; 1.11 date 98.08.29.21.32.04; author mycroft; state Exp; branches; next 1.10; 1.10 date 98.08.29.19.41.59; author frueauf; state Exp; branches; next 1.9; 1.9 date 98.08.29.04.08.13; author mycroft; state Exp; branches; next 1.8; 1.8 date 98.08.23.19.25.40; author tron; state Exp; branches; next 1.7; 1.7 date 98.08.07.10.40.37; author agc; state Exp; branches; next 1.6; 1.6 date 98.07.23.09.38.09; author mycroft; state Exp; branches; next 1.5; 1.5 date 98.07.22.10.02.31; author frueauf; state Exp; branches; next 1.4; 1.4 date 98.07.04.12.05.07; author mycroft; state Exp; branches; next 1.3; 1.3 date 98.05.13.10.13.25; author agc; state Exp; branches; next 1.2; 1.2 date 98.03.16.06.03.36; author mycroft; state Exp; branches; next 1.1; 1.1 date 98.02.14.22.06.11; author tron; state Exp; branches; next ; desc @@ 1.41 log @Remove xmame und xmess -- use mame/mess instead. Ok kristerw @ text @$NetBSD: patch-aa,v 1.40 2006/06/15 11:40:00 dillo Exp $ --- makefile.unix.orig 2006-05-15 18:53:34.000000000 +0200 +++ makefile.unix @@@@ -33,7 +33,7 @@@@ ########################################################################### # Uncomment one of these. -TARGET = mame +# TARGET = mame # TARGET = mess # TARGET = mage # TARGET = mmsnd @@@@ -97,7 +97,7 @@@@ # just as well. However, stay away from the `cc' Ultrix compiler if # possible. -CC = @@gcc +# CC = @@gcc # CC = @@cc # CC = @@icc # CC = @@c89 @@@@ -118,7 +118,7 @@@@ # If you want to use whatever CFLAGS are currently set in your # environment, then comment this out. -CFLAGS = +# CFLAGS = ########################################################################### @@@@ -127,7 +127,7 @@@@ ########################################################################### # GCC on x86 -CFLAGS = -O2 +# CFLAGS = -O2 # GCC on x86 with some optimizations # CFLAGS = -O2 -mtune=i686 -fomit-frame-pointer -fstrength-reduce -ffast-math @@@@ -181,13 +181,13 @@@@ ######################################################################### # Check for C89 + GNU extensions compliance. - CFLAGS += -std=gnu89 + # CFLAGS += -std=gnu89 # Show all warnings. - CFLAGS += -Wall + # CFLAGS += -Wall # Don't warn about unused variables. - CFLAGS += -Wno-unused + # CFLAGS += -Wno-unused # Warn about declarations after statements. # CFLAGS += -Wdeclaration-after-statement @@@@ -328,16 +328,16 @@@@ ifeq ($(CC),icc) # Optimizations for the Intel compiler. - CFLAGS = -O3 -rcd -Xa -ipo -ipo_obj + # CFLAGS = -O3 -rcd -Xa -ipo -ipo_obj else ifeq ($(CC),sun-forte) # # sun-forte given above is just an artifice to get us into this section - CC = cc + # CC = cc # uncomment to set compiler defaults oriented for maximum performance - XOPT += -fast + # XOPT += -fast # Choose one optimization level; #XOPT += -xO0 @@@@ -346,7 +346,7 @@@@ #XOPT += -xO3 # -xO4 and above automatically inline #XOPT += -xO4 - XOPT += -xO5 + # XOPT += -xO5 # uncomment for code generation targeted to the local machine; this # supplies -xarch, -xcpu, -xtarget. It also seems to cause an annoying @@@@ -354,11 +354,11 @@@@ # older hardware, which apparently can't be disabled. As an alternative, # the particular -xtarget for your system could be specified; # -xtarget=ultra2/2300 - XTARGET += -native + # XTARGET += -native #XTARGET += -xtarget=ultra2/2300 # uncomment to inline library math functions - EXTRA_OPTS += -xlibmil + # EXTRA_OPTS += -xlibmil ###################################################### # Additional options for parallelization optimizations @@@@ -374,7 +374,7 @@@@ # Sparc only, uncomment to do loop restructuring optimizations # and speculative prefetch for v8plusa and above - EXTRA_OPTS += -xdepend -xsafe=mem + # EXTRA_OPTS += -xdepend -xsafe=mem ################################################# # Additional options for glx builds @@@@ -384,14 +384,14 @@@@ # (libGLU dlopen() complains of missing name mangled symbols) # GLCFLAGS += -DSUN_FORTE_DLOPEN_LIBCRUN='\"libCrun.so.1\"' - CFLAGS= $(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS) - LDFLAGS=$(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS) + # CFLAGS= $(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS) + # LDFLAGS=$(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS) # uncomment for silence... - CFLAGS += -erroff + # CFLAGS += -erroff # Tell xmame that we really are in fact elf. If not supplied, # SHARED_PREFIX is set causing dlopen()'s to fail. - CFLAGS += -D__ELF__ + # CFLAGS += -D__ELF__ endif endif endif @@@@ -614,7 +614,7 @@@@ ########################################################################### # Linux -ARCH = linux +# ARCH = linux # FreeBSD # ARCH = freebsd @@@@ -727,7 +727,7 @@@@ # use SDL. # X11 (including Glide & OpenGL if enabled below) -DISPLAY_METHOD = x11 +# DISPLAY_METHOD = x11 # SDL library # DISPLAY_METHOD = SDL @@@@ -758,7 +758,7 @@@@ X11_MITSHM = 1 # Use Xv extension for hardware scaling. -X11_XV = 1 +# X11_XV = 1 # Enable XFree86 DGA. This also causes "make install" to set the suid bit # on the executable. @@@@ -782,8 +782,8 @@@@ # X11LIB = -L/usr/lib/X11 # Standard location for XFree86 -X11INC = -I/usr/X11R6/include -X11LIB = -L/usr/X11R6/lib +# X11INC = -I/usr/X11R6/include +# X11LIB = -L/usr/X11R6/lib # Standard location for Sun systems # X11INC = -I/usr/openwin/include @ 1.40 log @Update xmame and xmess to 0.106: 0.106: - Everything from MAME 0.106 and MESS 0.106 - Fixed a link error for messtest. (Arnaud G. Gibert) - Fixed an alignment bug in the OpenGL driver which caused Defender, and possibly other 16bpp games, to be skewed. - The mouse is no longer automatically grabbed in fullscreen mode. Bugzilla bug 877. - Replaced fuzzy game name comparison with the method used by MAME for Windows, which lists approximate matches when an exact match isn't found. - A BadMatch error should no longer occur for the OpenGL target in some cases, such as when 16bpp mode is used with recent releases of the binary NVIDIA driver. 0.105: - Everything from MAME 0.105 and MESS 0.105. - Fixed "-frames_to_run/-ftr" so that it works the same as on Windows. - Fixed a memory leak in the plugin manager shutdown found by Valgrind. Bugzilla bug 850. - The output of "-listroms (-lr)" now shows the correct driver name when it's run for all ROMs. - Fixed a potential buffer overflow in the standard joystick driver. Bugzill bug 821. (Pierre Riteau) @ text @d1 1 a1 1 $NetBSD$ @ 1.39 log @Update xmame to 0.104. Changes from 0.103: - Everything from MAME 0.104 (http://x.mame.net/changes-mame.html) and MESS 0.104 (http://x.mame.net/changes-mess.html). @ text @d3 2 a4 2 --- makefile.unix.orig 2006-03-09 19:41:47.000000000 +0100 +++ makefile.unix 2006-03-09 19:46:38.000000000 +0100 d18 5 a22 5 -CC = gcc +# CC = gcc # CC = cc # CC = icc # CC = c89 d41 1 a41 1 @@@@ -183,13 +183,13 @@@@ d106 1 a106 1 + #EXTRA_OPTS += -xdepend -xsafe=mem d116 2 a117 2 + #CFLAGS= $(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS) + #LDFLAGS=$(XOPT) $(XTARGET) $(XPARALLEL) $(EXTRA_OPTS) d121 3 a123 3 + #CFLAGS += -erroff # Tell xmame that we really are in fact elf. If not supplied, SHARED_PREFIX # is set causing dlopen()'s to fail. d125 1 a125 1 + #CFLAGS += -D__ELF__ d129 1 a129 1 @@@@ -589,7 +589,7 @@@@ d138 1 a138 1 @@@@ -701,7 +701,7 @@@@ d147 1 a147 1 @@@@ -732,7 +732,7 @@@@ d156 1 a156 1 @@@@ -756,8 +756,8 @@@@ @ 1.38 log @Update xmame to version 0.103. Release 0.103, 16 January 2006: - Everything from MAME 0.103 (http://x.mame.net/changes-mame.html) and MESS 0.103 (http://x.mame.net/changes-mess.html). - Modified osd_alloc_executable() to use mmap() by default. This prevents segfaults in the DRC core on systems that support the NX bit, such as AMD64 and Intel Prescott. Thanks to Julian Sikorski, Adam Moss, and Carl Fongheiser. - Fixed a segfault that occurred when LIRC was enabled but lirc_init returned an error value. (Joe Quanaim) - Added "-[no]lirc" to enable or disable LIRC support. (Joe Quanaim) - Fixed several buffer overruns that happened when overly-long data was passed for "-ctrlr", "-lang", "-rec", and "-pb". Fixed other potential buffer overruns. Bugzilla bug 821. - Files larger than 2GB can now be accessed on platforms with large file support. - The "-createhd" and "-merge" operations in chdman are now a lot faster on Linux. @ text @d3 2 a4 2 --- makefile.unix.orig 2006-01-22 11:08:05.000000000 +0100 +++ makefile.unix 2006-01-22 11:11:39.000000000 +0100 d41 1 a41 1 @@@@ -183,16 +183,16 @@@@ d57 2 a58 6 - CFLAGS += -Wdeclaration-after-statement + # CFLAGS += -Wdeclaration-after-statement # Don't warn about code that might break strict aliasing rules. # CFLAGS += -Wno-strict-aliasing @@@@ -328,7 +328,7 @@@@ d67 62 a128 9 @@@@ -551,7 +551,7 @@@@ ########################################################################### # i386, GNU asm -MY_CPU = i386 +# MY_CPU = i386 # i386, no asm -- needed for the Intel C++ compiler, which does not fully # understand GCC's inline assembly syntax, though you may still enable d138 9 @ 1.37 log @Updated xmame to 1.102. Changes from 1.101: - Everything from MAME 0.102 (http://x.mame.net/changes-mame.html) and MESS 0.102 (http://x.mame.net/changes-mess.html). - Fixed a bug that could afflict MESS console emulations by preventing the keyboard from working. - The default ALSA buffer size is now 50000ms instead of 250000ms, which reduces lag. - Advancing frame-by-frame using shift-P works again. Bugzilla bug 787. - When the setup menu is closed, the keyboard state is cleared. This prevents the key press that closes the menu from affecting the emulation. This replaces the fix from 0.97, which wasn't working anymore and caused the frame-by-frame advancing to break besides. @ text @d3 2 a4 2 --- makefile.unix.orig 2005-12-01 01:03:10.000000000 +0100 +++ makefile.unix 2005-12-01 01:05:33.000000000 +0100 d36 2 a37 2 -CFLAGS = -O2 -Wall -Wno-unused +# CFLAGS = -O2 -Wall -Wno-unused d40 32 a71 2 # CFLAGS = -O2 -Wall -Wno-unused -mtune=i686 -fomit-frame-pointer \ @@@@ -552,7 +552,7 @@@@ d80 1 a80 1 @@@@ -590,7 +590,7 @@@@ d89 1 a89 1 @@@@ -733,7 +733,7 @@@@ d98 1 a98 1 @@@@ -757,8 +757,8 @@@@ @ 1.36 log @Update xmame/xmess to 0.96. Release 0.96, 10 May 2005: - Everything from MAME 0.96 (http://x.mame.net/changes-mame.html) and MESS 0.96 (http://x.mame.net/changes-mess.html). - Fixed the RGB to YUV conversion used by the Xv driver so that it conforms to the CCIR digital component video specifications. Fixes Bugzilla bug 691. (Alex W. Jackson) - The rows of the OpenGL bitmap used for 16bpp games are no longer misaligned in some cases; nagano98 now displays without doubled lines. - The behavior of "-listgamelist" should once again match the Windows side with regard to case-insensitive sorting and the treatment of leading "The" and "Le". - When a specific joystick device is designated with "-joydevname (-jdev)", it is now always treated as the player 1 joystick. - The built-in profiler works again. (Colin Howell) - The X11 build now properly sets the standard window properties. (Christian Birchinger's friend) @ text @d3 2 a4 2 --- makefile.unix.orig 2005-05-12 23:02:10.000000000 +0200 +++ makefile.unix 2005-05-12 23:07:19.000000000 +0200 d14 1 a14 1 @@@@ -88,7 +88,7 @@@@ d23 1 a23 1 @@@@ -109,7 +109,7 @@@@ d32 1 a32 1 @@@@ -118,7 +118,7 @@@@ d40 2 a41 2 # CFLAGS = -O2 -Wall -Wno-unused -mcpu=i686 -fomit-frame-pointer \ @@@@ -523,7 +523,7 @@@@ d50 1 a50 1 @@@@ -558,7 +558,7 @@@@ d59 1 a59 1 @@@@ -701,7 +701,7 @@@@ d68 1 a68 1 @@@@ -725,8 +725,8 @@@@ @ 1.35 log @Update xmame to 0.87. Changes since 0.86: - Everything from MAME 0.87 (http://x.mame.net/changes-mame.html) and MESS 0.87 (http://x.mame.net/changes-mess.html). - Reworked the video mode functions (Hans de Goede): * Unified and moved the aspect ratio calculations from xgl, fx, and x11_window to mode.c since all display targets that support arbitrary scaling through hardware make use of this. * Modified the code to use the aspect ratio supplied by the game driver instead of doing all kinds of magic. This corrects, for example, the aspect ratio of 1942. * Added a new option, "-perfectaspect (-pa)", which automatically sets yarbsize to honor the aspect ratio provided by the game driver. This is disabled by default because it can cause scaling artifacts. * When video modes are matched, the aspect ratio is now taken into account. - Made changes to the X11 targets (Hans de Goede): * Restored widthscale == 2 yuy2 code for perfect yuy2 blitting. * Fixed a bug introduced by the aspect ratio patches which caused the Xv fallback code to not detect an error case and crash later on instead of falling back to MITSHM. * The Xv window is now resized with the correct aspect ratio after a user resize; this prevents black borders from appearing. * Renamed "-perfect-yv12" to "-perfect-yuv". * Enabled perfect blitting by default for yuy2, since it fixes the ugly color bleeding in, for example, pacman. * Fixed colors being way off in Xv for 15bpp direct games, e.g., vector games with artwork disabled. * Current mouse values are now initialized in xinput_open, which should fix the problem of the visor going to the lower right corner in starwars when the video mode is switched from windowed X11 to DGA fullscreen while the mouse is grabbed. * Fixed the display of a 32bpp source on a 24bpp packed pixel window. * Fixed a bug in the DGA2 target which caused it to throw an XError when it failed to find a suitable mode, causing xmame to abort. * XInput now maps controls to mice 2 - 5 and leaves mouse 1 free for the default mouse. (Hans de Goede) * Fixed a bug which caused the window to disappear with Xv windowed mode under KDE. - Added a missing "Rapid Fire" string to the configuration menu. This fixes problems with the configuration of player controls. (Sylvain Trosset) - Cleaned up the sound code (Hans de Goede): * Cleaned up the ALSA driver. * The ALSA driver now reports the actual sample rate to the caller rather than the requested one. * Removed the "-alsa-pcm" command line option; the ALSA driver now supports "-auviodevice (-ad)". (Hans de Goede) * Removed "-fakesound (-fsnd)". Now sound is always faked since certain games won't run without it. * Changed the default sample rate to 44100, moving us into the Third Millennium. * Removed the "-[no]sound" option; if you really want to disable sound, specify a bogus device with "-audiodevice". - Removed the "-[no]mouse" option. (Hans de Goede) - Split aspect and mode settings so that all targets can use the aspect settings. (Hans de Goede) - Fixed the mapping of analog sticks' min..max ranges to the core's range. This fixes games that use analog controls, such as Out Run, as well as the jittery movement of the mouse cursor in games such as Missile Command. - Audio should work much better on Mac OS X. (anonymous) - The MMX assembly language version of the 6-tap filter now works for 16 and 32bpp source and destination bitmaps; previously, only the 32bpp screen depth was accelerated. (Richard Goedeken) - Corrected some of the out-of-date information in the documentation. Fixes Bugzilla bug 604. - Light guns should work again. Also added support for the triggers on an ACT LABS USB PC Monitor model that didn't work previously. In addition, make the package install xml2info using a patch from Miguel Mendez in PR pkg/27101. @ text @d3 2 a4 2 --- makefile.unix.orig Sat Nov 6 21:34:15 2004 +++ makefile.unix Sat Nov 6 21:37:27 2004 d14 1 a14 1 @@@@ -89,7 +89,7 @@@@ d23 1 a23 1 @@@@ -110,7 +110,7 @@@@ d32 1 a32 1 @@@@ -119,7 +119,7 @@@@ d36 2 a37 2 -CFLAGS = -O -Wall -Wno-unused +# CFLAGS = -O -Wall -Wno-unused d41 1 a41 1 @@@@ -508,7 +508,7 @@@@ d50 1 a50 1 @@@@ -543,7 +543,7 @@@@ d59 1 a59 1 @@@@ -694,7 +694,7 @@@@ d68 1 a68 1 @@@@ -716,8 +716,8 @@@@ @ 1.34 log @Update xmame to 0.79.1 Changes since 0.78.1 includes: - Everything from MAME 0.79 (http://x.mame.net/changes-mame.html) and MESS 0.79 (http://x.mame.net/changes-mess.html). - Updated the ALSA DSP module to use the ALSA 1.0 API. (Shyouzou Sugitani) - Paths now allow a literal "$" if it's preceded by "\". (Andre Majorel) - Fixed a segfault that occurred when "-debug" was used with a rotated game. - The debugger window should no longer be blank for 32bpp games. - Fixed a bug in fix-comments.c that was causing it to mangle src/drivers/vendetta.c. - When XINPUT is defined in the makefile but no XInput devices are configured, the mouse is treated as a trackball. (Gerd Sussner) - The Xv YUV code should now work on big-endian platforms. (Maciej J. Woloszyk) - The trigger for the ACT LABS TV light gun now works; reloading now requires only one offscreen shot instead of two. (Joe) @ text @d3 2 a4 2 --- makefile.unix.orig Sat Feb 21 00:03:46 2004 +++ makefile.unix Sat Feb 21 00:08:29 2004 d12 1 d14 1 a14 2 # example for a tiny compile @@@@ -88,7 +88,7 @@@@ d23 1 a23 1 @@@@ -103,7 +103,7 @@@@ d32 1 a32 1 @@@@ -112,7 +112,7 @@@@ d41 1 a41 1 @@@@ -471,7 +471,7 @@@@ d50 1 a50 1 @@@@ -506,7 +506,7 @@@@ d59 1 a59 1 @@@@ -652,7 +652,7 @@@@ d68 1 a68 1 @@@@ -674,8 +674,8 @@@@ @ 1.33 log @Update xmame to 0.69.1. Changes since 0.68.1 includes: - Almost everything from MAME 0.69. - Re-added Ben Collins' core change that adds support for extra mice. - Reverted to using the original fronthlp.c (from 0.67.2) modified to work with the 0.69 core. - Fixed a logic bug in the XInput devices button-handling. (Ben Collins) - Made a tiny fix in fileio.c that allows specifying direct paths to roms to work again; e.g., ./xmame.x11 ./moo.zip @ text @d2 3 a4 2 --- makefile.unix.orig Mon May 26 22:09:26 2003 +++ makefile.unix Tue May 27 14:07:48 2003 d12 3 a14 3 # TARGET = neomame # TARGET = cpmame @@@@ -85,7 +85,7 @@@@ d23 1 a23 1 @@@@ -97,7 +97,7 @@@@ d32 1 a32 1 @@@@ -106,7 +106,7 @@@@ d35 1 a35 1 # gcc on x86 d39 1 a39 1 # gcc on x86 with some optimizations d41 1 a41 1 @@@@ -397,7 +397,7 @@@@ d49 2 a50 2 # understand gcc's inline assembly syntax, though you may still enable @@@@ -429,7 +429,7 @@@@ d59 1 a59 1 @@@@ -560,7 +560,7 @@@@ d68 1 a68 1 @@@@ -580,8 +580,8 @@@@ @ 1.32 log @Update xmame to 0.67.2. Changes since 0.66.2 include: - Almost everything from MAME 0.67. - Added support for konamigx to info.c. (David Haywood) - Building the neomame target now works. (Steve Behling) - Using XFree86 3.3.6 fbdev in 32bpp now works. (Steve Behling) - USB patches to take recent FreeBSD changes into account. (Matthew N. Dodd) @ text @d2 2 a3 2 --- makefile.unix.orig Sun Apr 13 18:22:02 2003 +++ makefile.unix Sun Apr 13 18:31:53 2003 d31 9 d58 1 a58 1 @@@@ -555,7 +555,7 @@@@ d67 1 a67 1 @@@@ -575,8 +575,8 @@@@ @ 1.31 log @Update xmame to 0.65.1. Changes since 0.64.1.0 consist of "Almost everything from MAME 0.65". @ text @d1 5 a5 4 $NetBSD: patch-aa,v 1.30 2002/01/03 00:08:35 kristerw Exp $ --- makefile.unix.orig Wed Jan 2 01:32:01 2002 +++ makefile.unix Wed Jan 2 18:44:08 2002 @@@@ -32,7 +32,6 @@@@ d7 1 a7 2 #set TARGET to "mame" (without the ") to compile xmame and to "mess" to #compile xmess. d9 7 d17 6 d24 4 a27 7 ############################################################################## @@@@ -211,7 +210,7 @@@@ # *** xmameroot, this is the default rompath, place where the highscores are # stored, global rc location etc. Since most of these are configurable through # the rc-file anyway, there are no longer seperate defines for each. -XMAMEROOT = $(PREFIX)/lib/x$(TARGET) +XMAMEROOT = $(PREFIX)/share/x$(TARGET) d30 39 a68 1 ############################################################################## @ 1.30 log @Update xmame to version 0.56.2. Changes since xmame-0.56.1 include: * Added the ability for xmame to interpret file names as game names, e.g., 'xmame.x11 /path/to/mspacman.zip' should now work. (Peter Trauner) * Renamed several xmame-specific keyboard functions to prevent a clash with svgalib and to avoid future clashes. (Bugzilla #123) * Added rapid-fire support for joysticks, enabled with -rapidfire or -rapidf. (Shyouzou Sugitani) @ text @d1 1 a1 1 $NetBSD$ @ 1.29 log @* Strongly buildlink'ify. * Reduce the number of patches needed by passing flags down to the make(1) process instead of patching the Makefiles and sources in unnecessary ways. * Remove unnecessary endian.sh script as the computation is down directly in the package Makefile. * Preliminary support for platforms other than NetBSD. * Generalize the package Makefile enough to make it usable if/when xmess compiles again on UNIX platforms * Use the general INSTALL scripts to manage the spool directory during installation/deinstallation. Approved by kristerw@@netbsd.org. @ text @d2 11 a12 4 --- makefile.unix.orig Tue Nov 13 23:13:38 2001 +++ makefile.unix @@@@ -201,7 +203,7 @@@@ @ 1.28 log @Update xmame to 0.56.1: As usual, this is a sych. with MAME 0.56 (i.e. a slew of new games and emulation improvments.) Unix specific changes include: - Numeric keypad support is now much better. (Andre Majorel) - Added arbitrary height scaling, available via the -arbheight option and started sanitizing the blit core. This currently only works with the X11 (windows, DGA1, DGA2) and svgalib drivers. (Adam Moss) - Added -usbpspad/-pspad switch for support of the direction buttons on the Playstation gamepad. (Bill Adams) - The -hotrod/-hr and -hotrodse/-hrse should actually work now. - Fixed a bunch of warnings that occurred when linking with GNU binutils using -warn-common. - Added DGA2 documentation: src/unix/doc/dga2.txt. (Shyouzou Sugitani) - Added special-cased fast 2x1 and 3x1 scaling to the blit core. (Adam Moss) - Added several AdvanceMAME effects, available via -effect/-ef. Note that these effects are not available for some video drivers, nor do they work on actual 24-bit (packed) displays yet. (Ben Saylor) @ text @d2 4 a5 3 --- makefile.unix.orig Wed Nov 14 05:13:38 2001 +++ makefile.unix Fri Nov 23 23:19:45 2001 @@@@ -201,7 +201,7 @@@@ d10 1 a10 1 +XMAMEROOT = $(PREFIX)/share/xmame a13 61 @@@@ -209,7 +209,7 @@@@ ############################################################################## ### i386 + gnu-asm -MY_CPU = i386 +MY_CPU = ${MAME_CPU} ### i386 no asm -- needed for the Intel C++ Compiler which does not fully # understand gcc's inline assembly syntax (you may still enable X86_ASM_68000 # etc. which are assembled by NASM). You may also need to use this for BeOS. @@@@ -232,11 +232,11 @@@@ ############################################################################## ### Linux -ARCH = linux +# ARCH = linux ### FreeBSD # ARCH = freebsd ### NetBSD -# ARCH = netbsd +ARCH = netbsd ### OpenBSD # ARCH = openbsd ### Solaris / SunOS @@@@ -271,11 +271,13 @@@@ # X Input Extensions based joystick, this is known to not work right now ;| # JOY_X11 = 1 # On iX86 based OS's, if supported, you can use standard joystick driver. -# JOY_I386 = 1 +ifeq (${NETBSD_JOYSTICK},yes) +JOY_I386 = 1 +endif # Linux FM-TOWNS game PAD joystick emulation support, thanks to Osamu Kurati. # JOY_PAD = 1 # NetBSD/FreeBSD USB joystick support. -# JOY_USB = 1 +JOY_USB = 1 ############################################################################## @@@@ -324,7 +326,9 @@@@ # MIT-Shared Memory X Extensions, comment the X11_MITSHM = 1 # XFree86 DGA -# X11_DGA = 1 +ifeq (${NETBSD_DGA},yes) +X11_DGA = 1 +endif # The XIL library (Solaris 2.5.1 and higher), uncomment # X11_XIL = 1 @@@@ -333,8 +337,8 @@@@ # X11INC = -I/usr/include/X11 # X11LIB = -L/usr/lib/X11 # standard location for XFree86 -X11INC = -I/usr/X11R6/include -X11LIB = -L/usr/X11R6/lib +X11INC = -I${PREFIX}/include -I${X11BASE}/include +X11LIB = -L${PREFIX}/lib -Wl,-R${PREFIX}/lib -L${X11BASE}/lib -Wl,-R${X11BASE}/lib # for Sun systems # X11INC = -I/usr/openwin/include # X11LIB = -L/usr/openwin/lib @ 1.27 log @support xpkgwedge. @ text @d1 4 a4 4 $NetBSD: patch-aa,v 1.26 2001/03/24 19:52:34 kristerw Exp $ --- makefile.unix.orig Sat Mar 17 03:11:28 2001 +++ makefile.unix Fri Mar 23 19:25:28 2001 @@@@ -168,7 +168,7 @@@@ d13 1 a13 1 @@@@ -176,7 +176,7 @@@@ d19 4 a22 4 ### i386 no asm # MY_CPU = i386_noasm ### ia64 @@@@ -197,11 +197,11 @@@@ d36 1 a36 1 @@@@ -234,11 +234,13 @@@@ d52 1 a52 1 @@@@ -284,7 +286,9 @@@@ d63 1 a63 1 @@@@ -293,8 +297,8 @@@@ @ 1.26 log @Update to xmame-0.37b12.1 @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.25 2000/11/05 00:43:31 mycroft Exp $ d69 2 a70 2 +X11INC = -I${PREFIX}/include +X11LIB = -L${PREFIX}/lib -Wl,-R${PREFIX}/lib @ 1.25 log @Update for 0.37b6.1. @ text @d1 4 a4 12 $NetBSD: patch-aa,v 1.24 2000/07/13 20:54:04 martin Exp $ --- makefile.unix.orig Sun Sep 10 21:57:37 2000 +++ makefile.unix Sat Nov 4 23:35:32 2000 @@@@ -138,13 +138,13 @@@@ # *** Select destination directory for your compiled program , manual page # and binary distribution ( if you want to... ) # ( only needed to install, not to compile... ) -DESTDIR = /usr/games -MANDIR = /usr/local/man/man6 +DESTDIR = ${PREFIX}/bin +MANDIR = ${PREFIX}/man/man6 d8 2 a9 2 -XMAMEROOT = /usr/games/lib/x$(TARGET) +XMAMEROOT = ${PREFIX}/share/xmame d13 1 a13 1 @@@@ -152,7 +152,7 @@@@ d22 1 a22 1 @@@@ -173,11 +173,11 @@@@ d33 2 d36 1 a36 3 # ARCH = solaris ### OpenStep @@@@ -204,11 +204,13 @@@@ d39 1 a39 1 # on iX86 based OS's, if supported, you can use standard joystick driver d44 1 a44 1 # Linux FM-TOWNS game PAD joystick emulation support, thanks to Osamu Kurati d46 1 a46 1 # NetBSD USB joystick support. d52 1 a52 1 @@@@ -252,7 +254,10 @@@@ d57 1 a57 1 +ifeq (${NETBSD_DGA},yes) a59 1 + d63 1 a63 1 @@@@ -261,8 +266,8 @@@@ d69 2 a70 2 +X11INC = -I${PREFIX}/include +X11LIB = -L${PREFIX}/lib -Wl,-R${PREFIX}/lib @ 1.24 log @Update pkg to version 0.37b4.1 @ text @d1 3 a3 3 $NetBSD$ --- makefile.unix.orig Fri Jun 23 12:05:25 2000 +++ makefile.unix Wed Jul 12 23:55:46 2000 d29 2 a30 2 ### alpha @@@@ -171,11 +171,11 @@@@ d44 5 a48 4 @@@@ -207,6 +207,9 @@@@ # JOY_I386 = 1 # Linux FM-TOWNS game PAD joystick emulation support, thanks to Osamu Kurati # JOY_PAD = 1 d52 5 d60 1 a60 1 @@@@ -249,7 +252,10 @@@@ d72 1 a72 1 @@@@ -258,8 +264,8 @@@@ @ 1.23 log @add RCS tags @ text @d2 3 a4 3 --- makefile.unix.orig Fri Mar 3 10:16:40 2000 +++ makefile.unix Tue Mar 14 12:02:51 2000 @@@@ -142,14 +142,14 @@@@ a11 1 DISTDIR = /home/ftp/pub/emulators/$(NAME) d16 2 a17 2 -XMAMEROOT = /usr/games/lib/$(NAME) +XMAMEROOT = ${PREFIX}/share/$(NAME) d21 11 a31 2 @@@@ -214,7 +214,7 @@@@ # JSLIB = -lXi d33 17 a49 15 # *** On iX86 based OS's, if supported, you can use standard joystick driver -# JSI386 = -DI386_JOYSTICK +JSI386 = -DI386_JOYSTICK # *** Linux FM-TOWNS game PAD joystick emulation support # Thanks to Osamu Kurati for provided patch @@@@ -265,8 +265,10 @@@@ MSHM = -DUSE_MITSHM # *** If you are running xfree86 and wnat to use DGA, uncomment the following: -# DGA = -DUSE_DGA -# DGALIBS = -lXxf86dga -lXxf86vm +ifeq (${NETBSD_DGA},yes) +DGA = -DUSE_DGA +DGALIBS = -lXxf86dga -lXxf86vm d52 15 a66 3 # *** If you have the XIL library (Solaris 2.5.1 and higher), uncomment # the following lines: @@@@ -278,8 +280,8 @@@@ a76 14 @@@@ -321,11 +323,11 @@@@ ############################################################################## ### Linux -ARCH = linux +# ARCH = linux ### FreeBSD # ARCH = freebsd ### NetBSD -# ARCH = netbsd +ARCH = netbsd ### Solaris # ARCH = solaris ### OpenStep @ 1.22 log @Update to 0.36b16.1. Includes new NetBSD audio code from kristerw. @ text @d1 1 @ 1.21 log @Update to version 0.36b14.1. @ text @d1 3 a3 5 $NetBSD: patch-aa,v 1.20 1999/11/10 08:01:29 soren Exp $ --- makefile.unix.orig Wed Jan 12 00:13:10 2000 +++ makefile.unix Thu Jan 20 19:24:51 2000 @@@@ -131,14 +131,14 @@@@ d21 1 a21 1 @@@@ -161,7 +161,9 @@@@ d24 1 a24 1 # On iX86 based OS's, if supported, you can use standard joystick driver a25 1 +ifeq (${NETBSD_JOYSTICK},yes) a26 1 +endif d28 1 a28 1 # Linux FM-TOWNS game PAD joystick emulation support d30 1 a30 12 @@@@ -181,8 +183,8 @@@@ # *** If your system supports query audio buffer size (like IRIX or Linux ) # you might decide to use these feature. Otherwise, you should use a # timer based audio code. -S_TIM = -DDONTUSE_TIMER -# S_TIM = -DUSE_TIMER +# S_TIM = -DDONTUSE_TIMER +S_TIM = -DUSE_TIMER # *** When using timer, you should provide the frequency to generate audio sample # frames in your system. See readme.unix notes about these item @@@@ -267,8 +269,10 @@@@ d33 1 a33 1 #if you are running xfree86 and wnat to use DGA, uncomment the following: d43 1 a43 1 @@@@ -279,8 +283,8 @@@@ d54 1 a54 42 @@@@ -305,13 +309,12 @@@@ ######## Alpha/Linux # ARCH = linux_alpha ######## ix86/Linux -ARCH = linux_i386 +# ARCH = linux_i386 ######## ix86/FreeBSD and ix86/BSDi # ARCH = FREEBSD -######## ix86/NetBSD -# ARCH = netbsd_i386 -######## Alpha/NetBSD -# ARCH = netbsd_alpha +######## NetBSD +ARCH = netbsd +MACHINE = $(shell uname -m) ######## Sparc/SunOS ( no sound ) # ARCH = sunos ######## ix86/Solaris @@@@ -362,8 +365,15 @@@@ DEFS.linux_alpha = -DLSB_FIRST -DAXP_ASM -DALIGN_INTS -DALIGN_SHORTS -D__LP64__ -DHAVE_SNPRINTF -DHAVE_VSNPRINTF DEFS.linux_i386 = -DLSB_FIRST -DX86_ASM -DHAVE_SNPRINTF -DHAVE_VSNPRINTF DEFS.FREEBSD = -DLSB_FIRST -DX86_ASM -DHAVE_SNPRINTF -DHAVE_VSNPRINTF -DEFS.netbsd_i386 = -DLSB_FIRST -DX86_ASM -DHAVE_SNPRINTF -DHAVE_VSNPRINTF -DEFS.netbsd_alpha = -DLSB_FIRST -DAXP_ASM -DALIGN_INTS -DALIGN_SHORTS -D__LP64__ -DHAVE_SNPRINTF -DHAVE_VSNPRINTF +ifeq (${MACHINE},i386) +DEFS.netbsd = -DLSB_FIRST -DX86_ASM -DNETBSD -DHAVE_SNPRINTF -DHAVE_VSNPRINTF +else +ifeq (${MACHINE},alpha) +DEFS.netbsd = -DLSB_FIRST -DAXP_ASM -DALIGN_INTS -DALIGN_SHORTS -D__LP64__ -DNETBSD -DHAVE_SNPRINTF -DHAVE_VSNPRINTF +else +DEFS.netbsd = -DLSB_FIRST -DDALIGN_INTS -DALIGN_SHORTS -DNETBSD -DHAVE_SNPRINTF -DHAVE_VSNPRINTF +endif +endif DEFS.sunos = -DCLOCKS_PER_SEC=1000000 -DALIGN_INTS -DALIGN_SHORTS DEFS.solaris = -DALIGN_INTS -DALIGN_SHORTS DEFS.solaris_i386 = -DLSB_FIRST -Dsolaris @@@@ -390,6 +400,7 @@@@ LIBS.irix_al = -laudio LIBS.aix = -lUMSobj LIBS.unixware7 = -lsocket +LIBS.netbsd = -lm a55 7 # **** Architecture dependent cflags. Only change if you know what're you doing... @@@@ -401,6 +412,8 @@@@ CFLAGS.next_sparc = -traditional-cpp CFLAGS.macosx_i386 = -traditional-cpp CFLAGS.macosx_ppc = -traditional-cpp +CFLAGS.netbsd = -fstrength-reduce -funroll-loops -fomit-frame-pointer \ + -fno-strict-aliasing d57 11 a67 2 ############################################################################# # **** Display dependent libs. Only change if you know what're you doing... @ 1.20 log @Changed patches. @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- makefile.unix.orig Fri Nov 5 18:26:11 1999 +++ makefile.unix Wed Nov 10 08:42:32 1999 d88 5 a92 5 DEFS.linux_alpha = -DLSB_FIRST -DAXP_ASM -DALIGN_INTS -DALIGN_SHORTS -D__LP64__ DEFS.linux_i386 = -DLSB_FIRST -DX86_ASM DEFS.FREEBSD = -DLSB_FIRST -DX86_ASM -DEFS.netbsd_i386 = -DLSB_FIRST -DX86_ASM -DEFS.netbsd_alpha = -DLSB_FIRST -DAXP_ASM -DALIGN_INTS -DALIGN_SHORTS -D__LP64__ d94 1 a94 1 +DEFS.netbsd = -DLSB_FIRST -DX86_ASM -DNETBSD d97 1 a97 1 +DEFS.netbsd = -DLSB_FIRST -DAXP_ASM -DALIGN_INTS -DALIGN_SHORTS -D__LP64__ d99 1 a99 1 +DEFS.netbsd = -DLSB_FIRST -DDALIGN_INTS -DALIGN_SHORTS -DNETBSD @ 1.19 log @ELF rpath issues. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.18 1999/04/03 21:45:16 mycroft Exp $ d3 3 a5 12 --- makefile.unix.orig Sat Mar 27 14:28:37 1999 +++ makefile.unix Sat Apr 3 14:19:27 1999 @@@@ -39,7 +39,7 @@@@ # GNU MAKE is MANDATORY !!! # so please give me the path... # if GNU make is "native" use this -MAKE = make +MAKE = gmake # else ... # MAKE=/usr/people/jantonio/bin/gmake @@@@ -109,14 +109,14 @@@@ d23 1 a23 1 @@@@ -139,7 +139,9 @@@@ d34 1 a34 1 @@@@ -159,8 +161,8 @@@@ d45 1 a45 11 @@@@ -239,16 +241,18 @@@@ # uncomment following section to support them ( you should have libxpm # available :-) ) # COMMENT IT if your are not compiling for normal x11 -# XPM = -DHAS_XPM -# XPMLIB = -lXpm +XPM = -DHAS_XPM +XPMLIB = -lXpm # *** If you don't have the MIT-Shared Memory X Extensions, comment the # following: ( Test if available by mean of xdpyinfo command ) d58 1 a58 1 @@@@ -259,8 +263,8 @@@@ d64 2 a65 2 +X11INC = -I${PREFIX}/include +X11LIB = -L${PREFIX}/lib -Wl,-R${PREFIX}/lib d69 1 a69 15 @@@@ -277,11 +281,11 @@@@ # OpenGL include path -GLINCPATH= /usr/src/Mesa-3.0/include +GLINCPATH= ${PREFIX}/include # OpenGL library path -GLLIBPATH= /usr/src/Mesa-3.0/lib +GLLIBPATH= ${PREFIX}/lib # OpenGL libs @@@@ -314,11 +318,12 @@@@ d77 1 a77 1 ######## ix86/NetBSD d79 5 a83 2 +ARCH = netbsd +MACHINE = $(shell uname -m) d87 1 a87 1 @@@@ -360,7 +365,11 @@@@ d92 1 d94 4 a97 1 +DEFS.netbsd = -DLSB_FIRST -DX86_ASM -DNETBSD d99 2 a100 1 +DEFS.netbsd = -DLSB_FIRST -DDALIGN_INTS -DALIGN_SHORTS -DNETBSD d105 1 a105 1 @@@@ -385,12 +394,14 @@@@ d113 6 a118 4 ############################################################################## CFLAGS.linux_powerpc = -fsigned-char CFLAGS.aix = -I/usr/include/UMS -I/usr/lpp/som/include +CFLAGS.netbsd = -fstrength-reduce -funroll-loops -fomit-frame-pointer @ 1.18 log @0.35b8.1 @ text @d1 1 a1 1 $NetBSD$ d84 1 a84 1 +X11LIB = -L${PREFIX}/lib @ 1.17 log @0.34b8.1 @ text @d3 2 a4 2 --- makefile.unix.orig Sun Dec 6 04:26:46 1998 +++ makefile.unix Tue Dec 15 04:06:03 1998 d14 1 a14 1 @@@@ -105,18 +105,18 @@@@ d24 9 a32 15 # *** Where the ROM source tree ? -ROMPATH = \"/usr/games/lib/$(NAME)\" +ROMPATH = \"${PREFIX}/share/$(NAME)\" # *** Where to store high scores ? -SDIR = \"/usr/games/lib/$(NAME)\" +SDIR = \"${PREFIX}/share/$(NAME)\" # *** Where resides global configuration file ? -MRC = \"/usr/games/lib/$(NAME)/$(NAME)rc\" +MRC = \"${PREFIX}/share/$(NAME)/$(NAME)rc\" # *** Where is cheat.dat ? CHEATFILE = \"/usr/games/lib/$(NAME)/cheat.dat\" @@@@ -145,7 +145,9 @@@@ d43 1 a43 1 @@@@ -165,8 +167,8 @@@@ d54 1 a54 1 @@@@ -245,16 +247,18 @@@@ d77 1 a77 1 @@@@ -265,8 +269,8 @@@@ d88 1 a88 1 @@@@ -283,11 +287,11 @@@@ d102 1 a102 1 @@@@ -320,11 +324,12 @@@@ d117 5 a121 5 @@@@ -364,7 +369,11 @@@@ DEFS.linux_alpha = -Dlinux -DLSB_FIRST -DAXP_ASM -DACORN DEFS.linux_i386 = -Dlinux -DLSB_FIRST -DX86_ASM DEFS.FREEBSD = -DLSB_FIRST -DX86_ASM -Dlinux -DFREEBSD_SOUND_WORKAROUND -DEFS.netbsd_i386 = -DLSB_FIRST -DX86_ASM -DNETBSD -DUSE_AUDIO d123 1 a123 1 +DEFS.netbsd = -DLSB_FIRST -DX86_ASM -DNETBSD -DUSE_AUDIO d125 1 a125 1 +DEFS.netbsd = -DLSB_FIRST -DACORN -DNETBSD -DUSE_AUDIO d127 4 a130 4 DEFS.sunos = -Dsun -DCLOCKS_PER_SEC=1000000 -DACORN DEFS.solaris = -Dsun -DACORN DEFS.solaris_i386 = -DLSB_FIRST -Dsun -Dsolaris @@@@ -389,12 +398,14 @@@@ @ 1.16 log @Some more pkglint stuff. @ text @d3 2 a4 2 --- makefile.unix.orig Wed Oct 21 08:20:43 1998 +++ makefile.unix Sun Oct 25 04:03:24 1998 d14 1 a14 1 @@@@ -106,18 +106,18 @@@@ d38 1 a38 12 @@@@ -132,7 +132,9 @@@@ ############################################################################## # *** To enable joystick support uncomment next line -# JOY = -DUSE_JOYSTICK +ifeq (${NETBSD_JOYSTICK},yes) +JOY = -DUSE_JOYSTICK +endif # if you have selected joystick support , select your preferences: # @@@@ -148,7 +150,9 @@@@ d42 1 a42 1 -# JS = -DI386_JOYSTICK d44 1 a44 1 +JS = -DI386_JOYSTICK d49 2 a50 1 @@@@ -169,8 +173,8 @@@@ d52 1 a52 2 # timer based audio code and ajust in src/unix/sound.h AUDIO_TIMER_FREQ item # d60 1 a60 10 @@@@ -223,7 +227,7 @@@@ # note: x11 is the only one supported on all platforms ### normal X11 -DISPLAY_METHOD = x11 +#DISPLAY_METHOD = x11 ### XFree86's DGA extension, only tested under linux #DISPLAY_METHOD = xf86_dga ### svgalib, only supported under linux @@@@ -244,19 +248,23 @@@@ d65 1 a65 2 -# XPMLIB = -lXpm -L/usr/X11R6/lib +ifeq (${DISPLAY_METHOD},x11) d67 1 a67 2 +XPMLIB = -lXpm -L/usr/X11R6/lib +endif a70 1 +ifeq (${DISPLAY_METHOD},x11) d72 7 d81 3 a83 1 # standard location for X11 d91 1 a91 1 # for Sun systems d94 1 a94 1 @@@@ -273,11 +281,11 @@@@ d108 1 a108 1 @@@@ -310,11 +318,12 @@@@ d123 1 a123 1 @@@@ -351,7 +360,11 @@@@ d136 1 a136 2 @@@@ -371,12 +384,14 @@@@ LIBS.irix = -laudio d139 1 d146 1 a146 1 CFLAGS.aix = -I/usr/include/UMS -I/usr/lpp/som/include @ 1.15 log @0.5b2.2 @ text @d1 2 @ 1.14 log @Update to 0.34b2.1. @ text @d1 2 a2 4 $NetBSD$ --- makefile.unix.orig Fri Sep 4 03:02:07 1998 +++ makefile.unix Sat Sep 5 08:07:04 1998 d12 1 a12 1 @@@@ -99,18 +99,18 @@@@ d34 3 a36 3 ############################################################################## @@@@ -118,7 +118,9 @@@@ d39 1 a39 1 # *** To disable joystick support comment next line d45 3 a47 3 # *** To disable mouse support comment next line MOUSE = -DUSE_MOUSE @@@@ -137,7 +139,9 @@@@ d58 1 a58 1 @@@@ -158,8 +162,8 @@@@ d69 1 a69 1 @@@@ -202,7 +206,7 @@@@ d78 10 a87 1 @@@@ -224,14 +228,16 @@@@ d106 15 a120 1 @@@@ -252,11 +258,12 @@@@ d135 1 a135 1 @@@@ -291,7 +298,11 @@@@ d148 4 a151 4 @@@@ -309,12 +320,14 @@@@ LIBS.solaris_i386 = -lm -lnsl -lsocket LIBS.irix = -lm -laudio LIBS.aix = -lm -lUMSobj @ 1.13 log @Use -DACORN to fix up unaligned accesses on non-i386en. @ text @d1 5 a5 3 --- makefile.unix.orig Sun Aug 23 17:44:39 1998 +++ makefile.unix Mon Aug 31 04:03:21 1998 @@@@ -38,7 +38,7 @@@@ d14 1 a14 1 @@@@ -98,18 +98,18 @@@@ d22 1 a22 1 DISTDIR = /home/ftp/pub/emulators/mame d25 2 a26 2 -MDIR = \"/usr/games/lib/mame\" +MDIR = \"${PREFIX}/share/xmame\" d29 2 a30 2 -SDIR = \"/usr/games/lib/mame\" +SDIR = \"${PREFIX}/share/xmame\" d33 2 a34 2 -MRC = \"/usr/games/lib/mame/xmamerc\" +MRC = \"${PREFIX}/share/xmame/xmamerc\" d38 1 a38 1 @@@@ -117,7 +117,9 @@@@ d49 1 a49 1 @@@@ -136,7 +138,9 @@@@ d60 1 a60 1 @@@@ -157,8 +161,8 @@@@ d71 2 a72 2 @@@@ -186,7 +190,7 @@@@ # note: xwindows is the only one supported on all platforms d74 4 a77 4 ### normal X-windows -DISPLAY_METHOD = xwindows +#DISPLAY_METHOD = xwindows ### xfree86's DGA extension, only tested under linux d80 6 a85 7 @@@@ -208,14 +212,16 @@@@ # *** If you haven't the MIT-Shared Memory X Extensions, comment the following: # ( Test if available by mean of xdpyinfo command ) # Comment it if not compiling for normal xwindows -# MSHM = -DUSE_MITSHM +ifeq (${DISPLAY_METHOD},xwindows) +MSHM = -DUSE_MITSHM d99 1 a99 1 @@@@ -236,11 +242,12 @@@@ d114 1 a114 1 @@@@ -275,7 +282,11 @@@@ d127 1 a127 1 @@@@ -293,12 +304,14 @@@@ @ 1.12 log @Allow the display type to be overridden from the pkg Makefile. @ text @d121 1 a121 1 +DEFS.netbsd = -DLSB_FIRST -DNETBSD -DUSE_AUDIO @ 1.11 log @Use a gmake construct rather than a pmake construct. @ text @a0 2 $NetBSD: patch-aa,v 1.10 1998/08/29 19:41:59 frueauf Exp $ d2 1 a2 1 +++ makefile.unix Fri Aug 28 23:42:40 1998 d69 10 a78 1 @@@@ -208,14 +212,14 @@@@ d83 1 d85 1 d98 1 a98 1 @@@@ -236,11 +240,12 @@@@ d113 1 a113 1 @@@@ -275,7 +280,11 @@@@ d126 1 a126 1 @@@@ -293,12 +302,14 @@@@ @ 1.10 log @Readd rcs ids again. @ text @d1 1 a1 1 $NetBSD$ d100 1 a100 1 +MACHINE != uname -m @ 1.9 log @Update to 0.34b1.1. @ text @d1 2 @ 1.8 log @Activate joystick supports on all ports which have it not only on i386. @ text @d1 3 a3 5 $NetBSD: patch-aa,v 1.7 1998/08/07 10:40:37 agc Exp $ --- makefile.unix.orig Wed Jun 17 06:07:13 1998 +++ makefile.unix Thu Jul 23 05:34:54 1998 @@@@ -36,7 +36,7 @@@@ d12 25 a36 1 @@@@ -95,7 +95,9 @@@@ d47 1 a47 1 @@@@ -114,7 +116,9 @@@@ d58 12 a69 1 @@@@ -129,7 +133,7 @@@@ d72 1 a72 1 # Comment it if compiling to svgalib xmame d76 1 a76 3 # *** Does your system support gettimeofday() function? If do, we encourage you # to enable this feature . Else .... comment it :-( @@@@ -148,8 +152,8 @@@@ d87 2 a88 37 @@@@ -164,18 +168,18 @@@@ # *** Select destination directory for your compiled program , manual page # and binary distribution ( if you want to... ) # ( only needed to install, not to compile... ) -DESTDIR = /usr/games -MANDIR = /usr/local/man/man6 +DESTDIR = ${PREFIX}/bin +MANDIR = ${PREFIX}/man/man6 DISTDIR = /home/ftp/pub/emulators/mame # *** Where the ROM source tree ? -MDIR = \"/usr/games/lib/mame\" +MDIR = \"${PREFIX}/share/mame\" # *** Where to store high scores ? -SDIR = \"/usr/games/lib/mame\" +SDIR = \"${PREFIX}/share/mame\" # *** Where resides global configuration file ? -MRC = \"/usr/games/lib/mame/xmamerc\" +MRC = \"${PREFIX}/share/mame/xmamerc\" # *** Use this definition as default X Display DP = \":0.0\" @@@@ -197,8 +201,8 @@@@ # you might decide to use these feature. Otherwise, you should use a # timer based audio code and ajust in src/unix/sound.h AUDIO_TIMER_FREQ item # -S_TIM = -DDONTUSE_TIMER -# S_TIM = -DUSE_TIMER +# S_TIM = -DDONTUSE_TIMER +S_TIM = -DUSE_TIMER # *** When using timer, you should provide the frequency to generate audio sample # frames in your system. See readme.unix notes about these item @@@@ -220,7 +224,7 @@@@ ######## Alpha/Linux/X11 d90 4 a93 8 ######## ix86/Linux/X11 -ARCH = linux +# ARCH = linux ######## ix86/Linux/SVGALIB # ARCH = svgalib ######## ix86/Linux/GGI *New* *New* *New* Please test - no mouse or joy yet @@@@ -228,7 +232,8 @@@@ ######## ix86/FreeBSD/X11 and ix86/BSDi/X11 d95 1 a95 1 ######## ix86/NetBSD/X11 d99 1 a99 1 ######## Sparc/SunOS/X11 ( no sound ) d101 6 a106 13 ######## ix86/Solaris/X11 @@@@ -304,17 +309,22 @@@@ -fomit-frame-pointer -Wall INST.FREEBSD = doinstall -# netbsd_i386 +# netbsd ##################### -#If you want sound add to DEFS.netbsd_i386 "-DUSE_AUDIO" and +#If you want sound add to DEFS.netbsd "-DUSE_AUDIO" and #set STIM=-DUSE_TIMER above # -DEFS.netbsd_i386 = -DX86_ASM -DLSB_FIRST -DUNIX -Dnetbsd_i386 -DNETBSD \ d108 1 a108 4 +DEFS.netbsd = -DX86_ASM -DLSB_FIRST -DUNIX -DNETBSD \ -DHAVE_GETTIMEOFDAY -DUSE_AUDIO -DSIGNED_SAMPLES -LIBS.netbsd_i386 = $(X11LIB) -lX11 -lXext -lm -CFLAGS.netbsd_i386 = $(X11INC) -m486 -fstrength-reduce -funroll-loops \ d110 1 a110 2 +DEFS.netbsd = -DLSB_FIRST -DUNIX -DNETBSD \ + -DHAVE_GETTIMEOFDAY -DUSE_AUDIO -DSIGNED_SAMPLES d112 15 a126 5 +LIBS.netbsd = $(X11LIB) -lX11 -lXext -lm +CFLAGS.netbsd = $(X11INC) -O3 -fstrength-reduce -funroll-loops \ -fomit-frame-pointer -Wall -INST.netbsd_i386 = doinstall +INST.netbsd = doinstall d128 2 a129 2 # SunOS ##################### @ 1.7 log @Add NetBSD RCS Ids. @ text @d1 1 a1 1 $NetBSD$ d19 1 a19 1 +ifeq (${MACHINE},i386) d30 1 a30 1 +ifeq (${MACHINE},i386) @ 1.6 log @Enable MIT-SHM, as pointed out by Mario Kemper. @ text @d1 2 @ 1.5 log @Give xmame the chance to compile on non-i386 machines too. @ text @d1 2 a2 2 --- makefile.unix.orig Wed Jun 17 12:07:13 1998 +++ makefile.unix Tue Jul 21 13:51:44 1998 d34 9 @ 1.4 log @Update to 0.33b6.1. @ text @d1 2 a2 2 --- makefile.unix.orig Wed Jun 17 06:07:13 1998 +++ makefile.unix Sat Jul 4 07:31:19 1998 d99 1 a99 1 @@@@ -304,17 +309,17 @@@@ d111 1 d116 4 @ 1.3 log @Only set -malign-functions=2 -malign-jumps=2 -malign-loops=2 on i386 architecture, as pointed out by pk. @ text @d1 3 a3 3 --- makefile.unix.orig Thu Jan 29 12:21:09 1998 +++ makefile.unix Tue May 12 21:57:05 1998 @@@@ -36,18 +36,18 @@@@ d12 1 a12 34 # *** Choose your compiler # Where posible, please enforce ansi usage -CC = gcc -ansi -pedantic -D_XOPEN_SOURCE -DM_PI=3.141592 -DPEDANTIC +#CC = gcc -ansi -pedantic -D_XOPEN_SOURCE -DM_PI=3.141592 -DPEDANTIC # # Some OS either libs are not ANSI-Compliant. If previous line fails, please # use next and report me item, to add to README.UNIX file # -# CC = gcc +CC = gcc # for IRIX systems seems that DCC gets better code than GNU. so use it: # CC = DCC # @@@@ -73,10 +73,18 @@@@ ### normal optimization flags # OPTFLAGS = -O2 # OPTFLAGS = -O2 -m486 -Wall +ifeq ($(ARCH),i386) +ARCHOPS= -m486 +endif ### to get full optimization under gcc/x Intel based OS's.. ( !!else comment!! ) -OPTFLAGS = -O3 -m486 -Wall -Wno-parentheses -funroll-loops \ +ifeq ($(ARCH),i386) +OPTFLAGS = -O2 $(ARCHOPS) -Wall -Wno-parentheses -funroll-loops \ -fstrength-reduce -fomit-frame-pointer -ffast-math -malign-functions=2 \ -malign-jumps=2 -malign-loops=2 +else +OPTFLAGS = -O2 $(ARCHOPS) -Wall -Wno-parentheses -funroll-loops \ + -fstrength-reduce -fomit-frame-pointer -ffast-math +endif ### for Linux/X11/PowerPC use following opts # OPTFLAGS = -O3 -Wall -Wno-parentheses -funroll-loops \ # -fstrength-reduce -fomit-frame-pointer -ffast-math -fsigned-char @@@@ -92,7 +100,9 @@@@ d16 3 a18 2 +ifeq ($(ARCH),i386) JOY = -DUSE_JOYSTICK d23 1 a23 1 @@@@ -114,7 +124,9 @@@@ d27 3 a29 2 +ifeq ($(ARCH),i386) JS = -DI386_JOYSTICK d34 3 a36 8 @@@@ -156,8 +168,8 @@@@ # *** where does your X11 source tree resides ?? use aproppiate switch # standard location for X11 -X11INC = -I/usr/include/X11 -X11LIB = -L/usr/lib/X11 +#X11INC = -I/usr/include/X11 +#X11LIB = -L/usr/lib/X11 d38 8 a45 3 X11INC = -I/usr/X11R6/include X11LIB = -L/usr/X11R6/lib @@@@ -175,18 +187,18 @@@@ d51 3 a53 4 -DISTDIR = /home/ftp/pub/emulators/mame +#DESTDIR = /usr/games +#MANDIR = /usr/local/man/man6 +#DISTDIR = /home/ftp/pub/emulators/mame d57 1 a57 1 +MDIR = \"$(PREFIX)/lib/mame\" d61 1 a61 1 +SDIR = \"$(PREFIX)/lib/mame\" d65 1 a65 1 +MRC = \"$(PREFIX)/lib/mame/xmamerc\" d69 2 a70 1 @@@@ -209,8 +221,8 @@@@ a72 1 # DONTUSE_TIMER is mandatory for SVGALIB -else you'll get a compile error- d80 1 a80 1 @@@@ -232,7 +244,7 @@@@ d89 19 a107 2 @@@@ -321,12 +333,12 @@@@ #If you want sound add to DEFS.netbsd_i386 "-DUSE_AUDIO" and d111 2 a112 2 +DEFS.NetBSD = -DX86_ASM -DLSB_FIRST -DUNIX -Dnetbsd_i386 -DNETBSD \ -DHAVE_GETTIMEOFDAY -DUSE_AUDIO d115 2 a116 2 +LIBS.NetBSD = $(X11LIB) -lX11 -lXext -lXi -lm +CFLAGS.NetBSD = $(X11INC) -O2 $(ARCHOPS) -fstrength-reduce -funroll-loops \ d119 1 a119 1 +INST.NetBSD = doinstall a122 122 @@@@ -414,7 +426,7 @@@@ # Perhaps one day original mame sources will use POSIX strcasecmp and M_PI # instead MS-DOS counterparts... ( a long and sad history ...) CFLAGS = $(CAPABILITIES) $(SOUND_OPTS) $(DBGFLAGS) $(OPTFLAGS) \ - $(XPM) $(IL) $(INCDIRS) $(CFLAGS.$(ARCH)) -Dstricmp=strcasecmp -DPI=M_PI + $(XPM) $(IL) $(INCDIRS) $(CFLAGS.$(OPSYS)) -Dstricmp=strcasecmp -DPI=M_PI OBJOSDEP = obj/unix/osdepend.a @@@@ -585,13 +597,13 @@@@ # not sure why, but was in original xmame makefile long time ago... VPATH = src src/Z80 src/M6502 src/I86 src/M6809 src/M68000 src/unix src/zipfiles -all: objdirs osdepend zipfiles xmame.$(ARCH) +all: objdirs osdepend zipfiles xmame.$(OPSYS) -OBJDIRS= obj.$(ARCH) obj.$(ARCH)/msdos obj.$(ARCH)/unix obj.$(ARCH)/zipfiles \ - obj.$(ARCH)/I86 obj.$(ARCH)/I8039 obj.$(ARCH)/Z80 obj.$(ARCH)/M6502 \ - obj.$(ARCH)/M6808 obj.$(ARCH)/M6809 obj.$(ARCH)/M68000 \ - obj.$(ARCH)/drivers obj.$(ARCH)/machine \ - obj.$(ARCH)/vidhrdw obj.$(ARCH)/sndhrdw +OBJDIRS= obj.$(OPSYS) obj.$(OPSYS)/msdos obj.$(OPSYS)/unix obj.$(OPSYS)/zipfiles \ + obj.$(OPSYS)/I86 obj.$(OPSYS)/I8039 obj.$(OPSYS)/Z80 obj.$(OPSYS)/M6502 \ + obj.$(OPSYS)/M6808 obj.$(OPSYS)/M6809 obj.$(OPSYS)/M68000 \ + obj.$(OPSYS)/drivers obj.$(OPSYS)/machine \ + obj.$(OPSYS)/vidhrdw obj.$(OPSYS)/sndhrdw $(OBJDIRS): -mkdir $@@ @@@@ -600,36 +612,36 @@@@ objlnk: -rm -fR obj - ln -s obj.$(ARCH) obj + ln -s obj.$(OPSYS) obj -xmame.$(ARCH): $(OBJS) - $(LD) -g3 -o xmame.$(ARCH) $(OBJS) $(ZLIB) $(JSLIB) $(XPMLIB) $(LIBS.$(ARCH)) +xmame.$(OPSYS): $(OBJS) + $(LD) -g3 -o xmame.$(OPSYS) $(OBJS) $(ZLIB) $(JSLIB) $(XPMLIB) $(LIBS.$(OPSYS)) xlistdev: xlistdev.c - $(CC) $(X11INC) xlistdev.c -o xlistdev $(JSLIB) $(LIBS.$(ARCH)) + $(CC) $(X11INC) xlistdev.c -o xlistdev $(JSLIB) $(LIBS.$(OPSYS)) # obj/unix/osdepend.a: osdepend: ( \ cd src/unix; \ - $(MAKE) CC="$(CC)" ARCH="$(ARCH)" DEFS="$(CONF) $(DEFS.$(ARCH))" CFLAGS="$(CFLAGS)" \ + $(MAKE) CC="$(CC)" OPSYS="$(OPSYS)" DEFS="$(CONF) $(DEFS.$(OPSYS))" CFLAGS="$(CFLAGS)" \ ) zipfiles: FRC ( \ cd src/zipfiles; \ - $(MAKE) CC="$(CC)" ARCH="$(ARCH)" DEFS="$(CONF) $(DEFS.$(ARCH))" CFLAGS="$(CFLAGS)" \ + $(MAKE) CC="$(CC)" OPSYS="$(OPSYS)" ZLIB="$(ZLIB)" DEFS="$(CONF) $(DEFS.$(OPSYS))" CFLAGS="$(CFLAGS)" \ ) FRC: -sndserver.$(ARCH): obj/unix/sndserver.o obj/unix/osdepend.a - $(LD) -g3 -o sndserver.$(ARCH) obj/unix/sndserver.o $(LIBS.$(ARCH)) +sndserver.$(OPSYS): obj/unix/sndserver.o obj/unix/osdepend.a + $(LD) -g3 -o sndserver.$(OPSYS) obj/unix/sndserver.o $(LIBS.$(OPSYS)) obj/%.o: src/%.c - $(CC) $(DEFS.$(ARCH)) $(CFLAGS) -o $@@ -c $< + $(CC) $(DEFS.$(OPSYS)) $(CFLAGS) -o $@@ -c $< sndtest: sndtest.c gcc -o sndtest sndtest.c @@@@ -647,33 +659,33 @@@@ src/I86/instr.h install: install-bin install-man - @@echo X-Mame $(VERSION) for $(ARCH) installation completed + @@echo X-Mame $(VERSION) for $(OPSYS) installation completed -install-bin: $(INST.$(ARCH)) xmame.$(ARCH) +install-bin: $(INST.$(OPSYS)) xmame.$(OPSYS) install-man: - @@echo installing manual pages under $(MANDIR) ... - $(INSTALL) doc/xmame.man $(MANDIR)/xmame.6 + @@echo installing manual pages under $(PREFIX)/man/man6 ... + $(INSTALL_MAN) doc/xmame.man $(PREFIX)/man/man6/xmame.6 doinstall: - @@echo installing binaries under $(DESTDIR)... - $(INSTALL) xmame.$(ARCH) $(DESTDIR)/xmame + @@echo installing binaries under $(PREFIX)/bin... + $(INSTALL_PROGRAM) xmame.$(OPSYS) $(PREFIX)/bin/xmame # Every SVGALIB-based software must be run setuid. Beware security !!! doinstallsvgalib: - @@echo installing binaries under $(DESTDIR)... - $(INSTALL) xmame.$(ARCH) $(DESTDIR)/mame - chmod 4755 $(DESTDIR)/mame + @@echo installing binaries under $(PREFIX)... + $(INSTALL) xmame.$(OPSYS) $(PREFIX)/mame + chmod 4755 $(PREFIX)/mame #clean now depends on objdirs, cause otherwise it just might rm the wrong ARCH clean: objdirs - rm -f $(OBJS) xmame.$(ARCH) xlistdev sndserver.* - ( cd src/unix; $(MAKE) ARCH="$(ARCH)" clean; ) - ( cd src/zipfiles; $(MAKE) ARCH="$(ARCH)" clean; ) + rm -f $(OBJS) xmame.$(OPSYS) xlistdev sndserver.* + ( cd src/unix; $(MAKE) OPSYS="$(OPSYS)" clean; ) + ( cd src/zipfiles; $(MAKE) OPSYS="$(OPSYS)" clean; ) rm -f sndtest bindist: - tar zcvf $(DISTDIR)/xmame.$(ARCH)_bin.tgz xmame.$(ARCH) doc + tar zcvf $(DISTDIR)/xmame.$(OPSYS)_bin.tgz xmame.$(OPSYS) doc srcdist: pristine ( cd ..; tar zcvf $(DISTDIR)/xmame-$(VERSION)_src.tgz xmame-$(VERSION) ) @ 1.2 log @Enable the joystick on the i386 port. @ text @d1 2 a2 2 --- makefile.unix.orig Thu Jan 29 07:21:09 1998 +++ makefile.unix Mon Mar 16 00:51:58 1998 d25 1 a25 1 @@@@ -73,8 +73,11 @@@@ d34 1 d38 4 d43 3 a45 1 @@@@ -92,7 +95,9 @@@@ d55 1 a55 1 @@@@ -114,7 +119,9 @@@@ d65 1 a65 1 @@@@ -156,8 +163,8 @@@@ d76 1 a76 1 @@@@ -175,18 +182,18 @@@@ d101 1 a101 1 @@@@ -209,8 +216,8 @@@@ d112 1 a112 1 @@@@ -232,7 +239,7 @@@@ d121 1 a121 1 @@@@ -321,12 +328,12 @@@@ d138 1 a138 1 @@@@ -414,7 +421,7 @@@@ d147 1 a147 1 @@@@ -585,13 +592,13 @@@@ d167 1 a167 1 @@@@ -600,36 +607,36 @@@@ d213 1 a213 1 @@@@ -647,33 +654,33 @@@@ @ 1.1 log @Initial import of "xmame-0.30.1" package based on work by Tim Rightnour. @ text @d1 2 a2 2 --- makefile.unix.orig Thu Jan 29 13:21:09 1998 +++ makefile.unix Sat Feb 14 21:37:06 1998 d38 1 a38 1 @@@@ -92,7 +95,7 @@@@ d42 3 a44 2 -JOY = -DUSE_JOYSTICK +#JOY = -DUSE_JOYSTICK d48 1 a48 7 @@@@ -109,12 +112,12 @@@@ # use provided program "xlistdev" to now available ones # and dont forget to include library in linker definition !! #JS = -DX11_JOYSTICK -JSNAME = \"Joystick\" +#JSNAME = \"Joystick\" # JSPOLL = -DUSE_X11_JOYEVENTS d52 3 a54 2 -JS = -DI386_JOYSTICK +#JS = -DI386_JOYSTICK d58 1 a58 1 @@@@ -156,8 +159,8 @@@@ d69 1 a69 1 @@@@ -175,18 +178,18 @@@@ d94 1 a94 1 @@@@ -209,8 +212,8 @@@@ d105 1 a105 1 @@@@ -232,7 +235,7 @@@@ d114 1 a114 1 @@@@ -321,12 +324,12 @@@@ d131 1 a131 1 @@@@ -414,7 +417,7 @@@@ d140 1 a140 1 @@@@ -585,13 +588,13 @@@@ d160 1 a160 1 @@@@ -600,36 +603,36 @@@@ d206 1 a206 1 @@@@ -647,33 +650,33 @@@@ @