diff options
| author | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-08-14 08:21:15 +0000 |
|---|---|---|
| committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2001-08-14 08:21:15 +0000 |
| commit | cfa6bd7a8a7e7110aee3d5f58f139e6d34abd61d (patch) | |
| tree | 3362b7377bf5f51fadde6b777fcb111ac5750dfc /games | |
| parent | - Fix Content of LD_SEARCH_FLAGS (diff) | |
Fix a breakage due to threaded Mesa.
Submitted by: bento
Notes
Notes:
svn path=/head/; revision=46223
Diffstat (limited to 'games')
| -rw-r--r-- | games/battalion/Makefile | 5 | ||||
| -rw-r--r-- | games/battalion/files/patch-aa | 17 |
2 files changed, 17 insertions, 5 deletions
diff --git a/games/battalion/Makefile b/games/battalion/Makefile index 1153b4b3808c..9f7f79a0401c 100644 --- a/games/battalion/Makefile +++ b/games/battalion/Makefile @@ -13,10 +13,13 @@ DISTFILES= battalionSource1.4.tar.Z battalionSUN4.tar.gz MAINTAINER= ports@FreeBSD.org +WRKSRC= ${WRKDIR}/battalionSource + ALL_TARGET= # empty USE_X_PREFIX= yes USE_MESA= yes -WRKSRC= ${WRKDIR}/battalionSource +MAKE_ENV= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \ + PTHREAD_LIBS="${PTHREAD_LIBS}" MAN6= battalion.6 diff --git a/games/battalion/files/patch-aa b/games/battalion/files/patch-aa index d6684ec366d9..663073d32c1e 100644 --- a/games/battalion/files/patch-aa +++ b/games/battalion/files/patch-aa @@ -1,5 +1,8 @@ ---- Makefile.orig Thu Jan 16 16:31:58 1997 -+++ Makefile Wed Mar 29 13:08:11 1998 + +$FreeBSD$ + +--- Makefile.orig Thu Jan 16 18:31:58 1997 ++++ Makefile Tue Aug 14 11:16:57 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) @@ -50,12 +53,18 @@ # STEP 8: ADD ANY SPECIAL LIBRARY PATHS -@@ -106,7 +106,7 @@ +@@ -106,12 +106,12 @@ 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 ++LIBS = -L./. -L${X11BASE}/lib -lm -lX11 -lXext -lcompat $(PTHREAD_LIBS) all: $(TARGET) + $(OBJ): $(?:.o=.c) +- $(CC) $(CFLAGS) $(LIBFLAG) $(OS) $(WHICHLIB) $(AUDIODEF) -c $? ++ $(CC) $(CFLAGS) $(PTHREAD_CFLAGS) $(LIBFLAG) $(OS) $(WHICHLIB) $(AUDIODEF) -c $? + + $(TARGET): $(OBJ) + $(CC) -o $(TARGET) $(OBJ) $(LIBFLAGS) $(GLIB) $(LIBS) $(AUDIOLIB) |