Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 16 Jun 2015 01:16:18 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org
Subject:   svn commit: r389804 - branches/2015Q2/games/sauerbraten/files
Message-ID:  <201506160116.t5G1GINQ004557@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Tue Jun 16 01:16:17 2015
New Revision: 389804
URL: https://svnweb.freebsd.org/changeset/ports/389804

Log:
  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)

Modified:
  branches/2015Q2/games/sauerbraten/files/patch-src_Makefile
Directory Properties:
  branches/2015Q2/   (props changed)

Modified: branches/2015Q2/games/sauerbraten/files/patch-src_Makefile
==============================================================================
--- branches/2015Q2/games/sauerbraten/files/patch-src_Makefile	Tue Jun 16 01:15:12 2015	(r389803)
+++ branches/2015Q2/games/sauerbraten/files/patch-src_Makefile	Tue Jun 16 01:16:17 2015	(r389804)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506160116.t5G1GINQ004557>