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

(-)battalion/Makefile (+2 lines)
Lines 17-22 Link Here
17
USE_X_PREFIX=	yes
17
USE_X_PREFIX=	yes
18
USE_MESA=	yes
18
USE_MESA=	yes
19
WRKSRC=		${WRKDIR}/battalionSource
19
WRKSRC=		${WRKDIR}/battalionSource
20
MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
21
		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
20
22
21
MAN6=		battalion.6
23
MAN6=		battalion.6
22
24
(-)battalion/files/patch-aa (-4 / +4 lines)
Lines 1-5 Link Here
1
--- Makefile.orig	Thu Jan 16 16:31:58 1997
1
--- Makefile.orig	Thu Jan 16 11:31:58 1997
2
+++ Makefile	Wed Mar 29 13:08:11 1998
2
+++ Makefile	Fri Aug 10 00:51:07 2001
3
@@ -23,7 +23,7 @@
3
@@ -23,7 +23,7 @@
4
 # (the program should compile with no warning messages - if you
4
 # (the program should compile with no warning messages - if you
5
 #  see a warning message please let me know about it)
5
 #  see a warning message please let me know about it)
Lines 46-52 Link Here
46
 # STEP 7: CHOOSE ANY OPTIMIZATIONS OR ADD ANY SPECIAL INCLUSIONS
46
 # STEP 7: CHOOSE ANY OPTIMIZATIONS OR ADD ANY SPECIAL INCLUSIONS
47
 # ------------------------------------------------------------
47
 # ------------------------------------------------------------
48
-CFLAGS     = -O  -I/usr/local/X11/include -I/usr/demo/SOUND/ -I./.
48
-CFLAGS     = -O  -I/usr/local/X11/include -I/usr/demo/SOUND/ -I./.
49
+CFLAGS+= -I${X11BASE}/include -DPREFIX=\"${PREFIX}\"
49
+CFLAGS+= -I${X11BASE}/include -DPREFIX=\"${PREFIX}\" ${PTHREAD_CFLAGS}
50
 
50
 
51
 
51
 
52
 # STEP 8: ADD ANY SPECIAL LIBRARY PATHS
52
 # STEP 8: ADD ANY SPECIAL LIBRARY PATHS
Lines 55-61 Link Here
55
 
55
 
56
 OBJ 	= battalion.o audio.o net.o gprim.o graphics.o objects.o text.o update.o tk.o font.o
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
57
-LIBS    = -L./. -L/usr/X11R6/lib -lm -lX11 -lXext
58
+LIBS    = -L./. -L${X11BASE}/lib -lm -lX11 -lXext -lcompat
58
+LIBS    = -L./. -L${X11BASE}/lib -lm -lX11 -lXext -lcompat ${PTHREAD_LIBS}
59
 
59
 
60
 all:	$(TARGET)
60
 all:	$(TARGET)

Return to bug 29593