Attachment 15870 Details for Bug 29313 – file.diff

[patch] file.diff

file.diff (text/plain), 6.10 KB, created by jmcoopr on 2001-07-30 03:00:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: jmcoopr

Created: 2001-07-30 03:00:00 UTC

Size: 6.10 KB

patch

obsolete

>diff -ruN battalion/files/patch-Makefile battalion.new/files/patch-Makefile
>--- battalion/files/patch-Makefile	Wed Dec 31 16:00:00 1969
>+++ battalion.new/files/patch-Makefile	Sun Jul 29 18:53:08 2001
>@@ -0,0 +1,68 @@
>+--- Makefile	Thu Jan 16 08:31:58 1997
>++++ Makefile.new	Sun Jul 29 18:52:32 2001
>+@@ -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
>+ 
>+ 
>+ # STEP 2: IF YOU WANT TO COMPILE WITH THE MESA LIBRARIES THEN
>+@@ -39,7 +39,7 @@
>+ # ------------------------------------------------------------
>+ #GLIB = -lMesaGL -lMesaGLU
>+ # or
>+-GLIB =  -lGL -lGLU
>++GLIB =  -lMesaGL -lMesaGLU
>+ 
>+ 
>+ # STEP 4: CHOOSE WHICH HARDWARE / OS YOU ARE RUNNING
>+@@ -51,9 +51,9 @@
>+ #         with the other Makefile.)
>+ #
>+ # ------------------------------------------------------------
>+-OS = -DSGIVERSION
>++#OS = -DSGIVERSION
>+ # or
>+-#OS = -DSUNVERSION
>++OS = -DSUNVERSION
>+ # or
>+ #OS = -DLINUXVERSION
>+ # or
>+@@ -77,8 +77,8 @@
>+ # in audio.c then everything works fine.
>+ #
>+ # ------------------------------------------------------------
>+-AUDIOLIB = -laudio -laudiofile
>+-AUDIODEF = -DSGIAUDIO
>++#AUDIOLIB = -laudio -laudiofile
>++#AUDIODEF = -DSGIAUDIO
>+ 
>+ 
>+ # STEP 6: IF YOU ARE COMPILING FOR A SUN AND WANT (RUDIMENTARY)
>+@@ -91,13 +91,13 @@
>+ 
>+ # STEP 7: CHOOSE ANY OPTIMIZATIONS OR ADD ANY SPECIAL INCLUSIONS
>+ # ------------------------------------------------------------
>+-CFLAGS     = -O  -I/usr/local/X11/include -I/usr/demo/SOUND/ -I./.
>++CFLAGS+= -I${X11BASE}/include -DPREFIX=\"${PREFIX}\" -pthread
>+ 
>+ 
>+ # STEP 8: ADD ANY SPECIAL LIBRARY PATHS
>+ #         (USEFUL TO POINT TO WHERE THE MESA LIBRARIES RESIDE)
>+ # ------------------------------------------------------------
>+-LIBFLAGS     = 
>++LIBFLAGS     = -pthread 
>+ 
>+ # you should now be able to type 'make' and everything should be fine ...
>+ 
>+@@ -106,7 +106,7 @@
>+ TARGET 	= battalion
>+ 
>+ OBJ 	= battalion.o audio.o net.o gprim.o graphics.o objects.o text.o update.o tk.o font.o
>+-LIBS    = -L./. -L/usr/X11R6/lib -lm -lX11 -lXext
>++LIBS    = -L./. -L${X11BASE}/lib -lm -lX11 -lXext -lcompat
>+ 
>+ all:	$(TARGET)
>+ 
>diff -ruN battalion/files/patch-aa battalion.new/files/patch-aa
>--- battalion/files/patch-aa	Sat Apr  1 16:57:01 2000
>+++ battalion.new/files/patch-aa	Wed Dec 31 16:00:00 1969
>@@ -1,61 +0,0 @@
>---- Makefile.orig	Thu Jan 16 16:31:58 1997
>-+++ Makefile	Wed Mar 29 13:08:11 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
>- 
>- 
>- # STEP 2: IF YOU WANT TO COMPILE WITH THE MESA LIBRARIES THEN
>-@@ -39,7 +39,7 @@
>- # ------------------------------------------------------------
>- #GLIB = -lMesaGL -lMesaGLU
>- # or
>--GLIB =  -lGL -lGLU
>-+GLIB =  -lMesaGL -lMesaGLU
>- 
>- 
>- # STEP 4: CHOOSE WHICH HARDWARE / OS YOU ARE RUNNING
>-@@ -51,9 +51,9 @@
>- #         with the other Makefile.)
>- #
>- # ------------------------------------------------------------
>--OS = -DSGIVERSION
>-+#OS = -DSGIVERSION
>- # or
>--#OS = -DSUNVERSION
>-+OS = -DSUNVERSION
>- # or
>- #OS = -DLINUXVERSION
>- # or
>-@@ -77,8 +77,8 @@
>- # in audio.c then everything works fine.
>- #
>- # ------------------------------------------------------------
>--AUDIOLIB = -laudio -laudiofile
>--AUDIODEF = -DSGIAUDIO
>-+#AUDIOLIB = -laudio -laudiofile
>-+#AUDIODEF = -DSGIAUDIO
>- 
>- 
>- # STEP 6: IF YOU ARE COMPILING FOR A SUN AND WANT (RUDIMENTARY)
>-@@ -91,7 +91,7 @@
>- 
>- # STEP 7: CHOOSE ANY OPTIMIZATIONS OR ADD ANY SPECIAL INCLUSIONS
>- # ------------------------------------------------------------
>--CFLAGS     = -O  -I/usr/local/X11/include -I/usr/demo/SOUND/ -I./.
>-+CFLAGS+= -I${X11BASE}/include -DPREFIX=\"${PREFIX}\"
>- 
>- 
>- # STEP 8: ADD ANY SPECIAL LIBRARY PATHS
>-@@ -106,7 +106,7 @@
>- TARGET 	= battalion
>- 
>- OBJ 	= battalion.o audio.o net.o gprim.o graphics.o objects.o text.o update.o tk.o font.o
>--LIBS    = -L./. -L/usr/X11R6/lib -lm -lX11 -lXext
>-+LIBS    = -L./. -L${X11BASE}/lib -lm -lX11 -lXext -lcompat
>- 
>- all:	$(TARGET)
>- 
>diff -ruN battalion/files/patch-ab battalion.new/files/patch-ab
>--- battalion/files/patch-ab	Sat Apr  1 16:57:02 2000
>+++ battalion.new/files/patch-ab	Wed Dec 31 16:00:00 1969
>@@ -1,12 +0,0 @@
>---- battalion.c.orig	Thu Jan 16 16:31:59 1997
>-+++ battalion.c	Wed Mar 29 13:10:21 1998
>-@@ -2867,7 +2867,8 @@
>- 	roadFile = fopen(fullPath, "rb");	
>- #else
>- 
>--    dataPtr = getenv("BATTALIONDATADIR");
>-+/*    dataPtr = getenv("BATTALIONDATADIR"); */
>-+    dataPtr = PREFIX "/share/battalion";
>-     if (dataPtr != NULL)
>- 	{
>- 	strcpy(dataPath, dataPtr);
>diff -ruN battalion/files/patch-ac battalion.new/files/patch-ac
>--- battalion/files/patch-ac	Sat Apr  1 16:57:02 2000
>+++ battalion.new/files/patch-ac	Wed Dec 31 16:00:00 1969
>@@ -1,12 +0,0 @@
>---- battalion.h.orig	Fri Jan 17 01:31:59 1997
>-+++ battalion.h	Sat Apr  1 00:37:23 2000
>-@@ -59,7 +59,9 @@
>- #endif
>- 
>- #ifndef MACVERSION
>-+#ifndef __STDC__
>- #include <malloc.h>
>-+#endif
>- #include <pwd.h>
>- #endif
>- 
>diff -ruN battalion/files/patch-battalion.c battalion.new/files/patch-battalion.c
>--- battalion/files/patch-battalion.c	Wed Dec 31 16:00:00 1969
>+++ battalion.new/files/patch-battalion.c	Sun Jul 29 18:45:02 2001
>@@ -0,0 +1,12 @@
>+--- battalion.c.orig	Thu Jan 16 16:31:59 1997
>++++ battalion.c	Wed Mar 29 13:10:21 1998
>+@@ -2867,7 +2867,8 @@
>+ 	roadFile = fopen(fullPath, "rb");	
>+ #else
>+ 
>+-    dataPtr = getenv("BATTALIONDATADIR");
>++/*    dataPtr = getenv("BATTALIONDATADIR"); */
>++    dataPtr = PREFIX "/share/battalion";
>+     if (dataPtr != NULL)
>+ 	{
>+ 	strcpy(dataPath, dataPtr);
>diff -ruN battalion/files/patch-battalion.h battalion.new/files/patch-battalion.h
>--- battalion/files/patch-battalion.h	Wed Dec 31 16:00:00 1969
>+++ battalion.new/files/patch-battalion.h	Sun Jul 29 18:45:02 2001
>@@ -0,0 +1,12 @@
>+--- battalion.h.orig	Fri Jan 17 01:31:59 1997
>++++ battalion.h	Sat Apr  1 00:37:23 2000
>+@@ -59,7 +59,9 @@
>+ #endif
>+ 
>+ #ifndef MACVERSION
>++#ifndef __STDC__
>+ #include <malloc.h>
>++#endif
>+ #include <pwd.h>
>+ #endif
>+

Actions: View | Diff

Attachments on bug 29313: 15870