View | Details | Raw Unified | Return to bug 29313
Collapse All | Expand All

(-)battalion.new/files/patch-Makefile (+68 lines)
Line 0 Link Here
1 
--- Makefile	Thu Jan 16 08:31:58 1997
2 
+++ Makefile.new	Sun Jul 29 18:52:32 2001
3 
@@ -23,7 +23,7 @@
4 
 # (the program should compile with no warning messages - if you
5 
 #  see a warning message please let me know about it)
6 
 # ------------------------------------------------------------
7 
-CC = CC
8 
+#CC = CC
9
10
11 
 # STEP 2: IF YOU WANT TO COMPILE WITH THE MESA LIBRARIES THEN
12 
@@ -39,7 +39,7 @@
13 
 # ------------------------------------------------------------
14 
 #GLIB = -lMesaGL -lMesaGLU
15 
 # or
16 
-GLIB =  -lGL -lGLU
17 
+GLIB =  -lMesaGL -lMesaGLU
18
19
20 
 # STEP 4: CHOOSE WHICH HARDWARE / OS YOU ARE RUNNING
21 
@@ -51,9 +51,9 @@
22 
 #         with the other Makefile.)
23 
 #
24 
 # ------------------------------------------------------------
25 
-OS = -DSGIVERSION
26 
+#OS = -DSGIVERSION
27 
 # or
28 
-#OS = -DSUNVERSION
29 
+OS = -DSUNVERSION
30 
 # or
31 
 #OS = -DLINUXVERSION
32 
 # or
33 
@@ -77,8 +77,8 @@
34 
 # in audio.c then everything works fine.
35 
 #
36 
 # ------------------------------------------------------------
37 
-AUDIOLIB = -laudio -laudiofile
38 
-AUDIODEF = -DSGIAUDIO
39 
+#AUDIOLIB = -laudio -laudiofile
40 
+#AUDIODEF = -DSGIAUDIO
41
42
43 
 # STEP 6: IF YOU ARE COMPILING FOR A SUN AND WANT (RUDIMENTARY)
44 
@@ -91,13 +91,13 @@
45
46 
 # STEP 7: CHOOSE ANY OPTIMIZATIONS OR ADD ANY SPECIAL INCLUSIONS
47 
 # ------------------------------------------------------------
48 
-CFLAGS     = -O  -I/usr/local/X11/include -I/usr/demo/SOUND/ -I./.
49 
+CFLAGS+= -I${X11BASE}/include -DPREFIX=\"${PREFIX}\" -pthread
50
51
52 
 # STEP 8: ADD ANY SPECIAL LIBRARY PATHS
53 
 #         (USEFUL TO POINT TO WHERE THE MESA LIBRARIES RESIDE)
54 
 # ------------------------------------------------------------
55 
-LIBFLAGS     =
56 
+LIBFLAGS     = -pthread
57
58 
 # you should now be able to type 'make' and everything should be fine ...
59
60 
@@ -106,7 +106,7 @@
61 
 TARGET 	= battalion
62
63 
 OBJ 	= battalion.o audio.o net.o gprim.o graphics.o objects.o text.o update.o tk.o font.o
64 
-LIBS    = -L./. -L/usr/X11R6/lib -lm -lX11 -lXext
65 
+LIBS    = -L./. -L${X11BASE}/lib -lm -lX11 -lXext -lcompat
66
67 
 all:	$(TARGET)
68
(-)battalion.new/files/patch-aa (-61 lines)
Lines 1-61 Link Here
1 
--- Makefile.orig	Thu Jan 16 16:31:58 1997
2 
+++ Makefile	Wed Mar 29 13:08:11 1998
3 
@@ -23,7 +23,7 @@
4 
 # (the program should compile with no warning messages - if you
5 
 #  see a warning message please let me know about it)
6 
 # ------------------------------------------------------------
7 
-CC = CC
8 
+#CC = CC
9
10
11 
 # STEP 2: IF YOU WANT TO COMPILE WITH THE MESA LIBRARIES THEN
12 
@@ -39,7 +39,7 @@
13 
 # ------------------------------------------------------------
14 
 #GLIB = -lMesaGL -lMesaGLU
15 
 # or
16 
-GLIB =  -lGL -lGLU
17 
+GLIB =  -lMesaGL -lMesaGLU
18
19
20 
 # STEP 4: CHOOSE WHICH HARDWARE / OS YOU ARE RUNNING
21 
@@ -51,9 +51,9 @@
22 
 #         with the other Makefile.)
23 
 #
24 
 # ------------------------------------------------------------
25 
-OS = -DSGIVERSION
26 
+#OS = -DSGIVERSION
27 
 # or
28 
-#OS = -DSUNVERSION
29 
+OS = -DSUNVERSION
30 
 # or
31 
 #OS = -DLINUXVERSION
32 
 # or
33 
@@ -77,8 +77,8 @@
34 
 # in audio.c then everything works fine.
35 
 #
36 
 # ------------------------------------------------------------
37 
-AUDIOLIB = -laudio -laudiofile
38 
-AUDIODEF = -DSGIAUDIO
39 
+#AUDIOLIB = -laudio -laudiofile
40 
+#AUDIODEF = -DSGIAUDIO
41
42
43 
 # STEP 6: IF YOU ARE COMPILING FOR A SUN AND WANT (RUDIMENTARY)
44 
@@ -91,7 +91,7 @@
45
46 
 # STEP 7: CHOOSE ANY OPTIMIZATIONS OR ADD ANY SPECIAL INCLUSIONS
47 
 # ------------------------------------------------------------
48 
-CFLAGS     = -O  -I/usr/local/X11/include -I/usr/demo/SOUND/ -I./.
49 
+CFLAGS+= -I${X11BASE}/include -DPREFIX=\"${PREFIX}\"
50
51
52 
 # STEP 8: ADD ANY SPECIAL LIBRARY PATHS
53 
@@ -106,7 +106,7 @@
54 
 TARGET 	= battalion
55
56 
 OBJ 	= battalion.o audio.o net.o gprim.o graphics.o objects.o text.o update.o tk.o font.o
57 
-LIBS    = -L./. -L/usr/X11R6/lib -lm -lX11 -lXext
58 
+LIBS    = -L./. -L${X11BASE}/lib -lm -lX11 -lXext -lcompat
59
60 
 all:	$(TARGET)
61
(-)battalion.new/files/patch-ab (-12 lines)
Lines 1-12 Link Here
1 
--- battalion.c.orig	Thu Jan 16 16:31:59 1997
2 
+++ battalion.c	Wed Mar 29 13:10:21 1998
3 
@@ -2867,7 +2867,8 @@
4 
 	roadFile = fopen(fullPath, "rb");
5 
 #else
6
7 
-    dataPtr = getenv("BATTALIONDATADIR");
8 
+/*    dataPtr = getenv("BATTALIONDATADIR"); */
9 
+    dataPtr = PREFIX "/share/battalion";
10 
     if (dataPtr != NULL)
11 
 	{
12 
 	strcpy(dataPath, dataPtr);
(-)battalion.new/files/patch-ac (-12 lines)
Lines 1-12 Link Here
1 
--- battalion.h.orig	Fri Jan 17 01:31:59 1997
2 
+++ battalion.h	Sat Apr  1 00:37:23 2000
3 
@@ -59,7 +59,9 @@
4 
 #endif
5
6 
 #ifndef MACVERSION
7 
+#ifndef __STDC__
8 
 #include <malloc.h>
9 
+#endif
10 
 #include <pwd.h>
11 
 #endif
12
(-)battalion.new/files/patch-battalion.c (+12 lines)
Line 0 Link Here
1 
--- battalion.c.orig	Thu Jan 16 16:31:59 1997
2 
+++ battalion.c	Wed Mar 29 13:10:21 1998
3 
@@ -2867,7 +2867,8 @@
4 
 	roadFile = fopen(fullPath, "rb");
5 
 #else
6
7 
-    dataPtr = getenv("BATTALIONDATADIR");
8 
+/*    dataPtr = getenv("BATTALIONDATADIR"); */
9 
+    dataPtr = PREFIX "/share/battalion";
10 
     if (dataPtr != NULL)
11 
 	{
12 
 	strcpy(dataPath, dataPtr);
(-)battalion.new/files/patch-battalion.h (+12 lines)
Line 0 Link Here
1 
--- battalion.h.orig	Fri Jan 17 01:31:59 1997
2 
+++ battalion.h	Sat Apr  1 00:37:23 2000
3 
@@ -59,7 +59,9 @@
4 
 #endif
5
6 
 #ifndef MACVERSION
7 
+#ifndef __STDC__
8 
 #include <malloc.h>
9 
+#endif
10 
 #include <pwd.h>
11 
 #endif
12 

            






  

  Return to bug 29313