diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2002-09-08 21:04:30 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2002-09-08 21:04:30 +0000 |
| commit | c494227445ddb63f0eba775e70fabfc00285f2ad (patch) | |
| tree | 589451aefb2a0eaacb9d71c125dfb9c986364506 /games | |
| parent | Fix build on -current (Build/link C++ code with ${CXX}) (diff) | |
Fix build on -current (build/link C++ code with ${CXX})
Notes
Notes:
svn path=/head/; revision=65855
Diffstat (limited to 'games')
| -rw-r--r-- | games/xjig/files/patch-aa | 57 |
1 files changed, 21 insertions, 36 deletions
diff --git a/games/xjig/files/patch-aa b/games/xjig/files/patch-aa index 94ce11ef4926..ed00fa812db4 100644 --- a/games/xjig/files/patch-aa +++ b/games/xjig/files/patch-aa @@ -1,36 +1,21 @@ -*** Makefile.Linux.orig Thu Jul 18 04:10:55 1996 ---- Makefile.Linux Wed Sep 17 03:51:48 1997 -*************** -*** 1,7 **** - - ### compiler section - CXX = gcc -Wall -fstrength-reduce -fpcc-struct-return -! CXXFLAGS = -g -DUSE_MIT_SHM - - ### default file to be used, when no options are set - ---- 1,7 ---- - - ### compiler section - CXX = gcc -Wall -fstrength-reduce -fpcc-struct-return -! CXXFLAGS += -DUSE_MIT_SHM -I${X_INCLUDE} - - ### default file to be used, when no options are set - -*************** LDFLAGS = -L$(XLIB_DIR) -*** 20,26 **** - .SUFFIXES: .C .o - - .C.o: -! $(CXX) -I$(X_INCLUDE) $(CXXFLAGS) -c $< - - LD = $(CXX) - ---- 20,26 ---- - .SUFFIXES: .C .o - - .C.o: -! $(CXX) $(CXXFLAGS) -c $< - - LD = $(CXX) - +--- Makefile.Linux.orig Wed Jul 17 13:10:55 1996 ++++ Makefile.Linux Sun Sep 8 14:02:00 2002 +@@ -1,7 +1,7 @@ + + ### compiler section +-CXX = gcc -Wall -fstrength-reduce -fpcc-struct-return +-CXXFLAGS = -g -DUSE_MIT_SHM ++CXX ?= c++ ++CXXFLAGS += -Wall -fstrength-reduce -fpcc-struct-return -DUSE_MIT_SHM -I${X_INCLUDE} + + ### default file to be used, when no options are set + +@@ -20,7 +20,7 @@ + .SUFFIXES: .C .o + + .C.o: +- $(CXX) -I$(X_INCLUDE) $(CXXFLAGS) -c $< ++ $(CXX) $(CXXFLAGS) -c $< + + LD = $(CXX) + |