[netpanzer] 94/118: Rebase use-system-libs.patch

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository netpanzer.

commit ca8a6848b297dc7ef8d34fa3465e665a9b1cc2dd
Author: Markus Koschany <apo at debian.org>
Date:   Sun Jun 5 07:47:53 2016 +0200

    Rebase use-system-libs.patch
---
 debian/patches/series                |  1 +
 debian/patches/use-system-libs.patch | 72 ++++++++++++++++++++++++++++++++++++
 2 files changed, 73 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..af72458
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use-system-libs.patch
diff --git a/debian/patches/use-system-libs.patch b/debian/patches/use-system-libs.patch
new file mode 100644
index 0000000..588f5fe
--- /dev/null
+++ b/debian/patches/use-system-libs.patch
@@ -0,0 +1,72 @@
+From: Markus Koschany <apo at debian.org>
+Date: Sun, 5 Jun 2016 07:47:42 +0200
+Subject: use system libs
+
+---
+ SConstruct | 20 ++------------------
+ 1 file changed, 2 insertions(+), 18 deletions(-)
+
+diff --git a/SConstruct b/SConstruct
+index 53a6045..2db5bbb 100644
+--- a/SConstruct
++++ b/SConstruct
+@@ -158,15 +158,13 @@ env.Append(CCFLAGS = ['-Wall'])
+ 
+ env.VariantDir(buildpath,'.',duplicate=0)
+ 
+-luaenv = env.Clone()
+-physfsenv = env.Clone()
+ networkenv = env.Clone()
+ 
+ ################################################################
+ # Configure Environments
+ ################################################################
+ 
+-env.Append( CPPPATH = [ 'src/Lib', 'src/NetPanzer', 'src/Lib/physfs', 'src/Lib/lua'] )
++env.Append( CPPPATH = [ 'src/Lib', 'src/NetPanzer' ] )
+ 
+ # for this platform
+ if thisplatform == 'darwin':
+@@ -175,14 +173,10 @@ if thisplatform == 'darwin':
+     networkenv.Append( CPPPATH = ['/Library/Frameworks/SDL.framework/Headers'] )
+     if env['universal'] != 'false':
+ 		env.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] )
+-		luaenv.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] )
+-		physfsenv.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] )
+ 		networkenv.Append( CCFLAGS = [ '-arch', 'ppc', '-arch', 'i386' ] )
+ 		env.Append( LINKFLAGS = [ '-mmacosx-version-min=10.4', '-arch', 'ppc', '-arch', 'i386' ] )
+     else:
+         env.Append( CCFLAGS = [ '-arch', 'i386' ] )
+-        luaenv.Append( CCFLAGS = [ '-arch', 'i386' ] )
+-        physfsenv.Append( CCFLAGS = [ '-arch', 'i386' ] )
+         networkenv.Append( CCFLAGS = [ '-arch', 'i386' ] )
+         env.Append( LINKFLAGS = [ '-arch', 'i386' ] )
+     env.AppendUnique(FRAMEWORKS=Split('SDL SDL_mixer Cocoa IOKit'))
+@@ -214,18 +208,8 @@ else:
+ networkenv.Append(           CPPPATH = [ 'src/Lib' ] )
+ MakeStaticLib(          networkenv, 'npnetwork', 'Network', '*.cpp')
+ 
+-# BUILDS LUA
+-luaenv.Append(           CPPPATH = [ 'src/Lib/lua'] )
+-MakeStaticLib(          luaenv, 'nplua', 'lua', '*.c')
+-
+-# BUILDS PHYSFS
+-physfsenv.Append( CFLAGS = [ '-DPHYSFS_SUPPORTS_ZIP=1', '-DZ_PREFIX=1', '-DPHYSFS_NO_CDROM_SUPPORT=1' ] )
+-physfsenv.Append( CPPPATH = [ 'src/Lib/physfs', 'src/Lib/physfs/zlib123' ] )
+-MakeStaticLib(physfsenv, 'npphysfs', 'physfs physfs/platform physfs/archivers physfs/zlib123', '*.c')
+-
+ # BUILDS 2D
+ env.Append( CFLAGS = [ '-DZ_PREFIX=1' ] )
+-env.Append( CPPPATH = 'src/Lib/physfs/zlib123' )
+ MakeStaticLib(env, 'np2d', '2D 2D/libpng', '*.c*')
+ 
+ # BUILDS REST OF LIBRARIES
+@@ -246,7 +230,7 @@ env.Append( NPSOURCES = globSources(env, 'src/NetPanzer', npdirs, "*.cpp") )
+ if env.has_key('WINICON'):
+     env.Append( NPSOURCES = env['WINICON'] )
+ 
+-env.Prepend( LIBS = ['np2d','nplua','npnetwork','nplibs','npphysfs'] )
++env.Prepend( LIBS = ['np2d','lua5.1','npnetwork','nplibs','physfs'] )
+ env.Prepend( LIBPATH = libpath )
+ 
+ netpanzer = env.Program( binpath+'netpanzer'+exeappend, env['NPSOURCES'])

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/netpanzer.git