diff options
| author | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2015-06-16 01:16:17 +0000 |
|---|---|---|
| committer | Dmitry Marakasov <amdmi3@FreeBSD.org> | 2015-06-16 01:16:17 +0000 |
| commit | 0b14ee2fd2d15a103ddf2d14b0748de853edec25 (patch) | |
| tree | 6b7515b9d0840b6a766c84ebf52b765b8bcad47f | |
| parent | e050e0e43cd80691d159d37b6b4faa3ce72762a4 (diff) | |
| download | ports-0b14ee2fd2d15a103ddf2d14b0748de853edec25.tar.gz ports-0b14ee2fd2d15a103ddf2d14b0748de853edec25.zip | |
MFH: r388525
- Disable precompiled headers to fix build with old gcc on -current kernel
- Regenerate patch with make-patch
Approved by: ports-secteam (build fix blanket)
Notes
Notes:
svn path=/branches/2015Q2/; revision=389804
| -rw-r--r-- | games/sauerbraten/files/patch-src_Makefile | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/games/sauerbraten/files/patch-src_Makefile b/games/sauerbraten/files/patch-src_Makefile index 1b1d63824d07..7cdce6b312f7 100644 --- a/games/sauerbraten/files/patch-src_Makefile +++ b/games/sauerbraten/files/patch-src_Makefile @@ -1,5 +1,5 @@ ---- src/Makefile 2012-08-28 00:30:07.000000000 -0500 -+++ src/Makefile 2013-03-24 00:38:04.000000000 -0500 +--- src/Makefile.orig 2012-08-28 05:30:07 UTC ++++ src/Makefile @@ -1,8 +1,7 @@ -CXXFLAGS= -O3 -fomit-frame-pointer override CXXFLAGS+= -Wall -fsigned-char -fno-exceptions -fno-rtti @@ -10,7 +10,7 @@ INCLUDES= -Ishared -Iengine -Ifpsgame -Ienet/include -@@ -36,8 +35,8 @@ +@@ -36,8 +35,8 @@ STD_LIBS= -static-libgcc -static-libstdc endif CLIENT_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lSDL -lSDL_image -lSDL_mixer -lzlib1 -lopengl32 -lenet -lws2_32 -lwinmm else @@ -21,7 +21,14 @@ endif ifeq ($(PLATFORM),Linux) CLIENT_LIBS+= -lrt -@@ -105,8 +104,8 @@ +@@ -98,15 +97,13 @@ CLIENT_OBJS= \ + fpsgame/waypoint.o \ + fpsgame/weapon.o + +-CLIENT_PCH= shared/cube.h.gch engine/engine.h.gch fpsgame/game.h.gch +- + ifneq (,$(findstring MINGW,$(PLATFORM))) + SERVER_INCLUDES= -DSTANDALONE $(INCLUDES) -Iinclude SERVER_LIBS= -mwindows $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm MASTER_LIBS= $(STD_LIBS) -L$(WINBIN) -L$(WINLIB) -lzlib1 -lenet -lws2_32 -lwinmm else |