$NetBSD: patch-aa,v 1.18 1999/04/03 21:45:16 mycroft Exp $ --- 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 @@ # *** 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) # *** 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 = /usr/games/lib/$(NAME) +XMAMEROOT = ${PREFIX}/share/$(NAME) ############################################################################## @@ -139,7 +139,9 @@ # JSLIB = -lXi # On iX86 based OS's, if supported, you can use standard joystick driver -# JSI386 = -DI386_JOYSTICK +ifeq (${NETBSD_JOYSTICK},yes) +JSI386 = -DI386_JOYSTICK +endif # Linux FM-TOWNS game PAD joystick emulation support # Thanks to Osamu Kurati for provided patch @@ -159,8 +161,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 @@ -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 ) 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 +endif # *** If you have the XIL library (Solaris 2.5.1 and higher), uncomment # the following lines: @@ -259,8 +263,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 +X11LIB = -L${PREFIX}/lib # for Sun systems # X11INC = -I/usr/openwin/include # X11LIB = -L/usr/openwin/lib @@ -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 @@ ######## 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 @@ -360,7 +365,11 @@ 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 +ifeq (${MACHINE},i386) +DEFS.netbsd = -DLSB_FIRST -DX86_ASM -DNETBSD +else +DEFS.netbsd = -DLSB_FIRST -DDALIGN_INTS -DALIGN_SHORTS -DNETBSD +endif DEFS.sunos = -DCLOCKS_PER_SEC=1000000 -DALIGN_INTS -DALIGN_SHORTS DEFS.solaris = -DALIGN_INTS -DALIGN_SHORTS DEFS.solaris_i386 = -DLSB_FIRST -Dsolaris @@ -385,12 +394,14 @@ LIBS.irix_al = -laudio LIBS.aix = -lUMSobj LIBS.unixware7 = -lsocket +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...