Author: miriam
Date: 2013-08-16 13:44:39 +0000 (Fri, 16 Aug 2013)
New Revision: 14494
Added:
packages/trunk/pink-pony/debian/SConstruct
Removed:
packages/trunk/pink-pony/debian/options.cache
Modified:
packages/trunk/pink-pony/debian/changelog
packages/trunk/pink-pony/debian/rules
Log:
Compile with hardening options
Added: packages/trunk/pink-pony/debian/SConstruct
===================================================================
--- packages/trunk/pink-pony/debian/SConstruct (rev 0)
+++ packages/trunk/pink-pony/debian/SConstruct 2013-08-16 13:44:39 UTC (rev
14494)
@@ -0,0 +1,46 @@
+import os
+
+env = Environment()
+env['CC'] = 'g++'
+env['CCFLAGS'] = '-Wall -Wextra -Wno-unused-parameter :CFLAGS:
-I/usr/include/OpenEXR -I./lib'
+env['LINKFLAGS'] = ':LDFLAGS:'
+env['LIBS'] = ['GLU', 'GL', 'protobuf', 'IL', 'ILUT', 'tinyxml', 'glee']
+env.ParseConfig("pkg-config IlmBase --cflags --libs")
+env.ParseConfig("pkg-config libglfw --cflags --libs")
+env.ParseConfig("pkg-config ftgl --cflags --libs")
+env.ParseConfig("pkg-config sigc++-2.0 --cflags --libs")
+
+
+# conf = Configure(env)
+# if not conf.CheckLib('protobuf'):
+# print 'You have to install Google protocol buffers to compile this game.'
+# Exit(1)
+# if not conf.CheckLib('audiere'):
+# print 'You have to install the audiere sound library to compile this
game.'
+# Exit(1)
+# if not conf.CheckLib('IL'):
+# print 'You have to install the DevIL image loading library to compile
this game.'
+# Exit(1)
+# env = conf.Finish()
+
+
+env.Command(['lib/mesh.pb.cc', 'lib/mesh.pb.h'], 'mesh.proto',
+ 'protoc --cpp_out=lib mesh.proto')
+
+
+env.Program('mesh_compile',
+ ['mesh_compile.cc']
+ + Glob('lib/*cc'))
+env.Program('skeleton_compile',
+ ['skeleton_compile.cc']
+ + Glob('lib/*cc'))
+
+env.Program('Pony',
+ ['Pony.cc']
+ + Glob('lib/*cc'))
+env.Program('MapView',
+ ['MapView.cc']
+ + Glob('lib/*cc'))
+env.Program('ConfigFile',
+ ['ConfigFile.cc']
+ + Glob('lib/*cc'))
Modified: packages/trunk/pink-pony/debian/changelog
===================================================================
--- packages/trunk/pink-pony/debian/changelog 2013-08-16 09:25:46 UTC (rev
14493)
+++ packages/trunk/pink-pony/debian/changelog 2013-08-16 13:44:39 UTC (rev
14494)
@@ -7,6 +7,7 @@
* Removed dependency from libaudiere (not in Debian enymore)
* Upgraded Standards-Version to 3.9.4
* Upgraded compat level to 9
+ * Using hardening options for building the application
[ Evgeni Golov ]
* Correct Vcs-* URLs to point to anonscm.debian.org
Deleted: packages/trunk/pink-pony/debian/options.cache
===================================================================
--- packages/trunk/pink-pony/debian/options.cache 2013-08-16 09:25:46 UTC
(rev 14493)
+++ packages/trunk/pink-pony/debian/options.cache 2013-08-16 13:44:39 UTC
(rev 14494)
@@ -1,4 +0,0 @@
-CC = 'gcc'
-CXX = 'g++'
-CCFLAGS = ' :CFLAGS: '
-CXXFLAGS = ' :CFLAGS: '
Modified: packages/trunk/pink-pony/debian/rules
===================================================================
--- packages/trunk/pink-pony/debian/rules 2013-08-16 09:25:46 UTC (rev
14493)
+++ packages/trunk/pink-pony/debian/rules 2013-08-16 13:44:39 UTC (rev
14494)
@@ -25,13 +25,15 @@
# grep -r \"pony.options\" * | grep -v debian/
# grep -r \"levels.xml\" * | grep -v debian/
- sed -e 's/:CFLAGS:/$(CFLAGS) $(CPPFLAGS)/' < debian/options.cache >
options.cache
+ sed -e 's|:CFLAGS:|$(CFLAGS) $(CPPFLAGS)|g' \
+ -e 's|:LDFLAGS:|$(LDFLAGS) $(LDFLAGS2)|g' \
+ < debian/SConstruct > SConstruct.Debian
touch $@
build-stamp: config
dh_testdir
protoc mesh.proto --cpp_out=lib/
- scons \
+ scons -f SConstruct.Debian \
prefix=/usr \
resources_dir=/usr/share/pink-pony \
lib_dir="$(CURDIR)"
@@ -46,12 +48,14 @@
clean:
dh_testdir
dh_testroot
- rm -f build-stamp config-stamp
- -scons -c
- rm -f config.log options.cache
- rm -f lib/mesh.pb.cc lib/mesh.pb.h
- rm -rf .sconf_temp build
- rm -rf .sconsign.dblite screen0.tga
+ rm -fv build-stamp config-stamp
+ -scons -c -f SConstruct.Debian
+ rm -fv SConstruct.Debian
+ rm -fv config.log options.cache
+ rm -fv lib/mesh.pb.cc lib/mesh.pb.h
+ rm -rfv .sconf_temp build
+ rm -rfv .sconsign.dblite screen0.tga
+
[ ! -d debian/patches ] || $(MAKE) -f /usr/share/quilt/quilt.make
unpatch
dh_clean
_______________________________________________
Pkg-games-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
