--- xmame-0.71.1/makefile.unix 2003-07-20 03:20:44.000000000 +1000 +++ xmame-0.71.1-patched/makefile.unix 2003-08-01 13:09:41.000000000 +1000 @@ -97,7 +97,7 @@ # If you want to use whatever CFLAGS are currently set in your # environment, then comment this out. -CFLAGS = +# CFLAGS = ########################################################################### @@ -106,7 +106,7 @@ ########################################################################### # gcc on x86 -CFLAGS = -O -Wall -Wno-unused +# CFLAGS = -O -Wall -Wno-unused # gcc on x86 with some optimizations # CFLAGS = -O2 -Wall -Wno-unused -mcpu=i686 -fomit-frame-pointer \ @@ -121,7 +121,7 @@ # -fstrength-reduce -traditional-cpp # gcc on OpenStep/PPC or Mac OS X -# CFLAGS = -O2 -Wall -Wno-unused -funroll-loops -traditional-cpp \ +CFLAGS = -O2 -Wall -Wno-unused -funroll-loops \ # -fstrength-reduce -fomit-frame-pointer -ffast-math -fsigned-char # IRIX MIPSpro with really serious optimization for R10K O2 @@ -283,7 +283,7 @@ ########################################################################### # Normal linking. -LD = $(CC) -Wl,-s +# LD = $(CC) -Wl,-s # For the Intel C++ Compiler -- expect large link time due to -ipo # optimization. @@ -293,7 +293,7 @@ # LD = $(CC) -pg # No profiling (less strace output), but include debug info. -# LD = $(CC) +LD = $(CC) # For debugging only. This only works with GNU binutils!! # LD = $(CC) -Wl,-warn-common @@ -314,7 +314,7 @@ # Does your platform have a separate libm? Only comment this out if you # have math libraries included within libc. This is very rare; you will # probably only need it for OpenStep and BeOS systems. -SEPARATE_LIBM = 1 +# SEPARATE_LIBM = 1 # Does your platform have ranlib? Leave this untouched unless you are # using IRIX, Unixware 7, or the Intel C++ Compiler. @@ -369,7 +369,7 @@ # Does your system support the gettimeofday() function? If so, we # encourage you to enable this feature. Otherwise, comment it out. # :-( -HAVE_GETTIMEOFDAY = 1 +# HAVE_GETTIMEOFDAY = 1 # Uncomment this if you want to link with ElectricFence (for developers # only). @@ -383,7 +383,7 @@ # Select destination directory for your compiled program, manual page, # and binary distribution. ifndef PREFIX -PREFIX = /usr/local +PREFIX = @FINKPREFIX@ endif BINDIR = $(PREFIX)/bin MANDIR = $(PREFIX)/share/man/man6 @@ -397,7 +397,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 @@ -415,7 +415,7 @@ # MY_CPU = m68k # Generic RISC (PowerPC, SPARC, HPPA, IBM) -# MY_CPU = risc +MY_CPU = risc # Generic RISC, LSB-first (RISC (Ultrix machines) & PlayStation2) # MY_CPU = risc_lsb @@ -429,7 +429,7 @@ ########################################################################### # Linux -ARCH = linux +# ARCH = linux # FreeBSD # ARCH = freebsd @@ -466,7 +466,7 @@ # ARCH = beos # generic UNIX, no sound -# ARCH = generic +ARCH = generic # (*) For IRIX 6.5 or higher add -DHAVE_SNPRINTF to CFLAGS.irix(_al) in # src/unix/Makefile @@ -511,7 +511,7 @@ # SOUND_ALSA = 1 # SOUND_ARTS_TEIRA = 1 # SOUND_ARTS_SMOTEK = 1 -# SOUND_SDL = 1 +SOUND_ESOUND = 1 # SOUND_WAVEOUT = 1 @@ -557,10 +557,10 @@ # Uncomment any extensions you wish to use. # MIT-Shared Memory X Extensions -X11_MITSHM = 1 +# 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. @@ -580,8 +580,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 -I/@FINKPREFIX@/include +X11LIB = -L/usr/X11R6/lib -L/@FINKPREFIX@/lib # Standard location for Sun systems # X11INC = -I/usr/openwin/include @@ -652,12 +652,12 @@ # Choose ELF or a.out # ELF settings: No leading underscores + ELF object format. Tested with # Linux/i386. Also for Solaris/x86, for example. -ASM_STRIP = src/unix/contrib/porting/strip_ -NASM_FMT = -f elf +# ASM_STRIP = src/unix/contrib/porting/strip_ +# NASM_FMT = -f elf # a.out settings: Leading underscores + a.out object format. Tested with # netBSD i386. Also for older Linux installs, FreeBSD, and others. -# ASM_STRIP = true # no strip command -# NASM_FMT = -f aoutb +ASM_STRIP = true # no strip command +NASM_FMT = -f aoutb ###########################################################################