[trigger-rally] 10/14: Refresh 20_system_tinyxml.patch
Markus Koschany
apo at moszumanska.debian.org
Mon Dec 19 14:25:41 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository trigger-rally.
commit eb70aea578a4f3fc345f0565f28d344311a3fca5
Author: Markus Koschany <apo at debian.org>
Date: Mon Dec 19 14:32:11 2016 +0100
Refresh 20_system_tinyxml.patch
---
debian/patches/20_system_tinyxml.patch | 30 ++++++++++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 31 insertions(+)
diff --git a/debian/patches/20_system_tinyxml.patch b/debian/patches/20_system_tinyxml.patch
new file mode 100644
index 0000000..092dd22
--- /dev/null
+++ b/debian/patches/20_system_tinyxml.patch
@@ -0,0 +1,30 @@
+From: Markus Koschany <apo at debian.org>
+Date: Mon, 19 Dec 2016 14:31:42 +0100
+Subject: 20_system_tinyxml
+
+---
+ src/GNUmakefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/GNUmakefile b/src/GNUmakefile
+index 9471f58..1b6ad2c 100644
+--- a/src/GNUmakefile
++++ b/src/GNUmakefile
+@@ -16,7 +16,7 @@ TR_EXEFILE := $(TR_BINDIR)/$(TR_EXENAME)
+ TR_CFGFILE := $(TR_BINDIR)/$(TR_CFGNAME)
+ TR_DATAFILES := $(shell cd $(TR_DATADIR); find * -type f)
+ TR_DOCFILES := $(shell cd $(TR_DOCDIR); find * -type f)
+-PROJDIRS := PEngine PSim TinyXML2 Trigger
++PROJDIRS := PEngine PSim Trigger
+ SRCFILES := $(shell find $(PROJDIRS) -type f -name "*.cpp")
+ OBJFILES := $(patsubst %.cpp, %.o, $(SRCFILES))
+ DEPFILES := $(patsubst %.cpp, %.d, $(SRCFILES))
+@@ -26,7 +26,7 @@ DMACROS := -DNDEBUG -DUNIX -DPACKAGE_VERSION=\"$(DISTVER)\"
+ INCDIRS := -I'./include'
+ CXXFLAGS += -std=c++11 $(WARNINGS) $(OPTIMS)
+ CPPFLAGS += $(DMACROS) $(INCDIRS)
+-EXTRA_LIBS := -lSDL2main -lGL -lGLU -lGLEW -lSDL2 -lSDL2_image -lphysfs -lopenal -lalut -lpthread
++EXTRA_LIBS := -lSDL2main -lGL -lGLU -lGLEW -lSDL2 -lSDL2_image -lphysfs -lopenal -lalut -lpthread -ltinyxml
+ LDFLAGS += $(EXTRA_LIBS)
+ INSTALL_PROGRAM := install --mode=0755
+ INSTALL_DATA := install --mode=0644
diff --git a/debian/patches/series b/debian/patches/series
index 626aaca..0f66114 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
verbose-build.patch
disable-strip.patch
+20_system_tinyxml.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/trigger-rally.git
More information about the Pkg-games-commits
mailing list