mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-23 00:43:28 +00:00
Code Issues Releases Activity

Fix a breakage due to threaded Mesa.

Browse Source 
Submitted by:	bento
This commit is contained in:
Maxim Sobolev 2001-08-14 08:21:15 +00:00
parent db2cbd7315
commit cfa6bd7a8a
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=46223
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
games/battalion/Makefile
View File

@ -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

17
games/battalion/files/patch-aa
View File

@ -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)