From 8e731fed9ca2b1a380f0d99c2491f6de5dcfd291 Mon Sep 17 00:00:00 2001 From: Kolan Sh Date: Sun, 20 May 2012 00:16:03 +0400 Subject: [PATCH] Unneded patch for 0ad removed --- .../11339_alpha9-fcollada-makefile.patch | 26 ------------------- 1 file changed, 26 deletions(-) delete mode 100644 games-strategy/0ad/files/11339_alpha9-fcollada-makefile.patch diff --git a/games-strategy/0ad/files/11339_alpha9-fcollada-makefile.patch b/games-strategy/0ad/files/11339_alpha9-fcollada-makefile.patch deleted file mode 100644 index e397e869..00000000 --- a/games-strategy/0ad/files/11339_alpha9-fcollada-makefile.patch +++ /dev/null @@ -1,26 +0,0 @@ -From: hasufell -Date: Wed Apr 11 14:45:32 UTC 2012 - -FCollada Makefile does not respect CXX and flags - ---- libraries/fcollada/src/Makefile -+++ libraries/fcollada/src/Makefile -@@ -7,14 +7,14 @@ - PIC_FLAGS ?= -fpic - endif - --CXX := g++ --CXXFLAGS := -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS) -+CXX ?= g++ -+CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter -Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS) - CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL - CXXFLAGS_RELEASE := -O1 -DNDEBUG -DRETAIL - # (-O2 with gcc 4.3 causes linker errors when using this library, for unknown reasons, so stick with -O1) - CXXFLAGS_TEST := -O0 -g -D_DEBUG --LIBS := `pkg-config libxml-2.0 --libs` --INCLUDES := -IFCollada `pkg-config libxml-2.0 --cflags` -+LIBS += `pkg-config libxml-2.0 --libs` -+INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags` - INCLUDES_TEST := -IFCollada/FColladaTest $(INCLUDES) - - # FCollada is not aliasing-safe, so disallow dangerous optimisations