diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2002-09-08 22:31:54 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2002-09-08 22:31:54 +0000 |
| commit | c9ddd7ec9c9224e536f0bdcd14044394ab41415d (patch) | |
| tree | 02e99895b58c1b9be77c381eb51c0b6d4eaa9e2d /games | |
| parent | use GLIB_CONFIG. (diff) | |
Fix build in -current (build/link C++ code with ${CXX})
Notes
Notes:
svn path=/head/; revision=65860
Diffstat (limited to 'games')
| -rw-r--r-- | games/uox3/Makefile | 2 | ||||
| -rw-r--r-- | games/uox3/files/patch-ai | 34 |
2 files changed, 30 insertions, 6 deletions
diff --git a/games/uox3/Makefile b/games/uox3/Makefile index d85f1d2243f5..6ba78ce927b7 100644 --- a/games/uox3/Makefile +++ b/games/uox3/Makefile @@ -24,7 +24,7 @@ MAKEFILE= makefile ALL_TARGET= linux do-build: - cd ${WRKSRC}/dev && ${GMAKE} -f ${MAKEFILE} CFLAGS="${CFLAGS}" ${ALL_TARGET} + cd ${WRKSRC}/dev && ${GMAKE} -f ${MAKEFILE} CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" ${ALL_TARGET} do-install: -${RM} ${WRKDIR}/uox/uox3.ini.orig diff --git a/games/uox3/files/patch-ai b/games/uox3/files/patch-ai index 01f971b24966..124fd11cd0b5 100644 --- a/games/uox3/files/patch-ai +++ b/games/uox3/files/patch-ai @@ -1,12 +1,36 @@ -diff -ruN work.orig/dev/makefile work/dev/makefile ---- work.orig/dev/makefile Fri Nov 27 23:34:50 1998 -+++ work/dev/makefile Fri Sep 10 17:29:52 1999 -@@ -27,7 +27,7 @@ +--- work/dev/makefile.orig Fri Nov 27 23:34:50 1998 ++++ work/dev/makefile Sun Sep 8 13:29:35 2002 +@@ -1,10 +1,7 @@ + # This is a unified GNU Makfefile for all "other" targets - type "make" + # to get a list of targets! + +-CC = gcc +- +-# Optimization +-OPT = -O2 ++CXX ?= c++ + + # Name of executable + EXE = uox3.exe +@@ -27,7 +24,7 @@ # Objects OBJS := $(patsubst %.cpp, %.o, $(SRC)) -C_FLAGS = $(WARN) $(OTHER) $(OPT) $(DEBUG) -+C_FLAGS = $(CFLAGS) $(WARN) $(OTHER) $(OPT) $(DEBUG) ++C_FLAGS = $(CXXFLAGS) $(WARN) $(OTHER) $(DEBUG) all: @echo Please specify one of the following: +@@ -51,10 +48,10 @@ + + + $(EXE): $(OBJS) +- $(CC) -o $@ $(OBJS) $(LIBS) ++ $(CXX) -o $@ $(OBJS) $(LIBS) + + %.o: %.cpp uox3.h +- $(CC) -c $(C_FLAGS) $< -o $@ ++ $(CXX) -c $(C_FLAGS) $< -o $@ + + clean: + rm -f *.o uox3 |