kolan
/
Overlay
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Unneded patch for 0ad removed

This commit is contained in:
Kolan Sh 2012-05-20 00:16:03 +04:00
parent 777119112f
commit 8e731fed9c
1 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
games-strategy/0ad/files/11339_alpha9-fcollada-makefile.patch
View File

@ -1,26 +0,0 @@
From: hasufell <julian.ospald@googlemail.com>
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