$NetBSD: patch-aa,v 1.10 1998/11/12 23:20:10 frueauf Exp $ --- makefile.unix.orig Wed Aug 26 18:40:21 1998 +++ makefile.unix Mon Aug 31 04:06:42 1998 @@ -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 @@ -99,18 +99,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/$(NAME) # *** 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\" ############################################################################## @@ -118,7 +118,9 @@ ############################################################################## # *** To disable joystick support comment next line -# JOY = -DUSE_JOYSTICK +ifeq (${NETBSD_JOYSTICK},yes) +JOY = -DUSE_JOYSTICK +endif # *** To disable mouse support comment next line MOUSE = -DUSE_MOUSE @@ -137,7 +139,9 @@ # JSLIB = -lXi # On iX86 based OS's, if supported, you can use standard joystick driver -# JS = -DI386_JOYSTICK +ifeq (${NETBSD_JOYSTICK},yes) +JS = -DI386_JOYSTICK +endif # Linux FM-TOWNS game PAD joystick emulation support # Thanks to Osamu Kurati for provided patch @@ -158,8 +162,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 @@ -192,7 +196,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 @@ -215,14 +219,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 x11 -# MSHM = -DUSE_MITSHM +ifeq (${DISPLAY_METHOD},x11) +MSHM = -DUSE_MITSHM +endif # standard location for X11 # 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 +X11LIB = -L${PREFIX}/lib # for Sun systems # X11INC = -I/usr/openwin/include # X11LIB = -L/usr/openwin/lib @@ -243,11 +249,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 +ARCH = netbsd +MACHINE = $(shell uname -m) ######## Sparc/SunOS ( no sound ) # ARCH = sunos ######## ix86/Solaris @@ -282,7 +289,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 +ifeq (${MACHINE},i386) +DEFS.netbsd = -DLSB_FIRST -DX86_ASM -DNETBSD -DUSE_AUDIO +else +DEFS.netbsd = -DLSB_FIRST -DACORN -DNETBSD -DUSE_AUDIO +endif DEFS.sunos = -Dsun -DCLOCKS_PER_SEC=1000000 -DACORN DEFS.solaris = -Dsun -DACORN DEFS.solaris_i386 = -DLSB_FIRST -Dsun -Dsolaris @@ -300,12 +311,14 @@ LIBS.solaris_i386 = -lm -lnsl -lsocket LIBS.irix = -lm -laudio LIBS.aix = -lm -lUMSobj +LIBS.netbsd = -lm ############################################################################## # **** Architecture dependent cflags. Only change if you know what're you doing... ############################################################################## 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 ############################################################################# # **** Display dependent libs. Only change if you know what're you doing...