summaryrefslogtreecommitdiff
path: root/games/battalion/patches/patch-aa
diff options
context:
space:
mode:
Diffstat (limited to 'games/battalion/patches/patch-aa')
-rw-r--r--games/battalion/patches/patch-aa46
1 files changed, 35 insertions, 11 deletions
diff --git a/games/battalion/patches/patch-aa b/games/battalion/patches/patch-aa
index 5265e35472b..cfb3dc7cd74 100644
--- a/games/battalion/patches/patch-aa
+++ b/games/battalion/patches/patch-aa
@@ -1,13 +1,17 @@
-$NetBSD: patch-aa,v 1.3 1998/08/27 14:06:09 garbled Exp $
-
--- Makefile.orig Thu Jan 16 09:31:58 1997
-+++ Makefile Sat Jul 25 09:22:54 1998
-@@ -25,3 +25,3 @@
++++ Makefile Sun Sep 13 12:55:28 1998
+@@ -23,7 +23,7 @@
+ # (the program should compile with no warning messages - if you
+ # see a warning message please let me know about it)
# ------------------------------------------------------------
-CC = CC
+CC = cc
-@@ -39,5 +39,5 @@
+
+ # STEP 2: IF YOU WANT TO COMPILE WITH THE MESA LIBRARIES THEN
+@@ -37,9 +37,9 @@
+ # MESA OR OPENGL
+ #
# ------------------------------------------------------------
-#GLIB = -lMesaGL -lMesaGLU
+GLIB = -lMesaGL -lMesaGLU
@@ -15,33 +19,53 @@ $NetBSD: patch-aa,v 1.3 1998/08/27 14:06:09 garbled Exp $
-GLIB = -lGL -lGLU
+#GLIB = -lGL -lGLU
-@@ -53,3 +53,3 @@
+
+ # STEP 4: CHOOSE WHICH HARDWARE / OS YOU ARE RUNNING
+@@ -51,7 +51,7 @@
+ # with the other Makefile.)
+ #
# ------------------------------------------------------------
-OS = -DSGIVERSION
+#OS = -DSGIVERSION
# or
-@@ -79,4 +79,4 @@
+ #OS = -DSUNVERSION
+ # or
+@@ -77,8 +77,8 @@
+ # in audio.c then everything works fine.
+ #
# ------------------------------------------------------------
-AUDIOLIB = -laudio -laudiofile
-AUDIODEF = -DSGIAUDIO
+#AUDIOLIB = -laudio -laudiofile
+#AUDIODEF = -DSGIAUDIO
-@@ -93,4 +93,5 @@
+
+ # STEP 6: IF YOU ARE COMPILING FOR A SUN AND WANT (RUDIMENTARY)
+@@ -91,13 +91,15 @@
+
+ # STEP 7: CHOOSE ANY OPTIMIZATIONS OR ADD ANY SPECIAL INCLUSIONS
# ------------------------------------------------------------
-CFLAGS = -O -I/usr/local/X11/include -I/usr/demo/SOUND/ -I./.
-
+CFLAGS = -O $(DEFS) -I$(X11BASE)/include -I./.
+DATADIR = $(PREFIX)/share/battalion/
-+DEFS = -DDATADIR=\"$(DATADIR)\"
++VARDIR = /var/games/
++DEFS = -DDATADIR=\"$(DATADIR)\" -DVARDIR=\"$(VARDIR)\"
-@@ -99,3 +100,3 @@
+ # STEP 8: ADD ANY SPECIAL LIBRARY PATHS
+ # (USEFUL TO POINT TO WHERE THE MESA LIBRARIES RESIDE)
# ------------------------------------------------------------
-LIBFLAGS =
+LIBFLAGS = -Wl,-R$(X11BASE)/lib -L$(X11BASE)/lib -lcompat
-@@ -117,2 +118,4 @@
+ # you should now be able to type 'make' and everything should be fine ...
+
+@@ -115,6 +117,8 @@
+
+ $(TARGET): $(OBJ)
$(CC) -o $(TARGET) $(OBJ) $(LIBFLAGS) $(GLIB) $(LIBS) $(AUDIOLIB)
+
+install:
+ clean:
+ rm -f $(OBJ)