diff options
author | frueauf <frueauf> | 1998-08-06 21:07:39 +0000 |
---|---|---|
committer | frueauf <frueauf> | 1998-08-06 21:07:39 +0000 |
commit | bc9f6db320f456f8ce8bbdccdc744b1487aeaa41 (patch) | |
tree | 764a785e7df19d9e7b8e5da40562096b574a22e8 /games/battalion/patches | |
parent | 069718e0f68737176eeabdb35d3cd1afebbf5754 (diff) | |
download | pkgsrc-bc9f6db320f456f8ce8bbdccdc744b1487aeaa41.tar.gz |
Initial addition of battalion-1.4, a virtual reality 3D GL game for X11.
Closes pr 5849 by Tim Rightnour.
Diffstat (limited to 'games/battalion/patches')
-rw-r--r-- | games/battalion/patches/patch-aa | 45 | ||||
-rw-r--r-- | games/battalion/patches/patch-ab | 33 |
2 files changed, 78 insertions, 0 deletions
diff --git a/games/battalion/patches/patch-aa b/games/battalion/patches/patch-aa new file mode 100644 index 00000000000..79e4f7c9267 --- /dev/null +++ b/games/battalion/patches/patch-aa @@ -0,0 +1,45 @@ +--- Makefile.orig Thu Jan 16 09:31:58 1997 ++++ Makefile Sat Jul 25 09:22:54 1998 +@@ -25,3 +25,3 @@ + # ------------------------------------------------------------ +-CC = CC ++CC = cc + +@@ -39,5 +39,5 @@ + # ------------------------------------------------------------ +-#GLIB = -lMesaGL -lMesaGLU ++GLIB = -lMesaGL -lMesaGLU + # or +-GLIB = -lGL -lGLU ++#GLIB = -lGL -lGLU + +@@ -53,3 +53,3 @@ + # ------------------------------------------------------------ +-OS = -DSGIVERSION ++#OS = -DSGIVERSION + # or +@@ -79,4 +79,4 @@ + # ------------------------------------------------------------ +-AUDIOLIB = -laudio -laudiofile +-AUDIODEF = -DSGIAUDIO ++#AUDIOLIB = -laudio -laudiofile ++#AUDIODEF = -DSGIAUDIO + +@@ -93,4 +93,5 @@ + # ------------------------------------------------------------ +-CFLAGS = -O -I/usr/local/X11/include -I/usr/demo/SOUND/ -I./. +- ++CFLAGS = -O $(DEFS) -I$(PREFIX)/include -I./. ++DATADIR = $(PREFIX)/share/battalion/ ++DEFS = -DDATADIR=\"$(DATADIR)\" + +@@ -99,3 +100,3 @@ + # ------------------------------------------------------------ +-LIBFLAGS = ++LIBFLAGS = $(RPATH) -L$(PREFIX)/lib -lcompat + +@@ -117,2 +118,4 @@ + $(CC) -o $(TARGET) $(OBJ) $(LIBFLAGS) $(GLIB) $(LIBS) $(AUDIOLIB) ++ ++install: + diff --git a/games/battalion/patches/patch-ab b/games/battalion/patches/patch-ab new file mode 100644 index 00000000000..0ebb29a52ee --- /dev/null +++ b/games/battalion/patches/patch-ab @@ -0,0 +1,33 @@ +--- battalion.c.orig Thu Jan 16 09:31:59 1997 ++++ battalion.c Sat Jul 25 08:58:02 1998 +@@ -2876,7 +2876,12 @@ + strcat(dataPath, "/"); +- +- strcpy(fullPath, dataPath); +- strcat(fullPath, "battalion.sho"); +- roadFile = fopen(fullPath, "rb"); + } ++ else { ++ strcat(dataPath, DATADIR); ++ if (dataPath[strlen(dataPath)-1] != '/') ++ strcat(dataPath, "/"); ++ } ++ strcpy(fullPath, dataPath); ++ strcat(fullPath, "battalion.sho"); ++ roadFile = fopen(fullPath, "rb"); ++ + #endif +@@ -2900,6 +2905,6 @@ + { +- roadFile = fopen("./battalion.data/battalion.sho", "rb"); ++ roadFile = fopen(DATADIR "battalion.data/battalion.sho", "rb"); + if (roadFile != NULL) + { +- strcpy(dataPath, "./battalion.data/"); ++ strcpy(dataPath, DATADIR "battalion.data/"); + fclose(roadFile); +@@ -2992,3 +2997,3 @@ + else +- strcpy(scoredataPath, "/usr/tmp"); ++ strcpy(scoredataPath, DATADIR); + |