diff options
| author | kris <kris@FreeBSD.org> | 2002-09-09 06:31:54 +0800 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2002-09-09 06:31:54 +0800 |
| commit | b236ba81eee3f91297ba8cef886545d70b1d1f8d (patch) | |
| tree | 1e276db6b077f15853aa497e1a688028dbbe1a67 | |
| parent | c0c5b963f826a4c267546fa237a88fba58d6d135 (diff) | |
| download | freebsd-ports-gnome-b236ba81eee3f91297ba8cef886545d70b1d1f8d.tar.gz freebsd-ports-gnome-b236ba81eee3f91297ba8cef886545d70b1d1f8d.tar.zst freebsd-ports-gnome-b236ba81eee3f91297ba8cef886545d70b1d1f8d.zip | |
Fix build in -current (build/link C++ code with ${CXX})
| -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 |