File 0001-don-t-link-X-libs-statically.diff of Package enemy-territory

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-don-t-link-X-libs-statically.diff of Package enemy-territory (Revision 31780d2d8604bb877ba3352138624ed1)

Currently displaying revision 31780d2d8604bb877ba3352138624ed1 , Show latest

From 56bf5f98ef2e5e4f3fb84d2829671cbf85592e07 Mon Sep 17 00:00:00 2001
From: Ludwig Nussel <ludwig.nussel@suse.de>
Date: Fri, 13 Aug 2010 14:21:08 +0200
Subject: [PATCH 1/3] don't link X libs statically

---
 src/SConscript.core |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)

diff --git a/src/SConscript.core b/src/SConscript.core
index 9b022dc..3e09479 100644
--- a/src/SConscript.core
+++ b/src/SConscript.core
@@ -243,12 +243,6 @@ botlib_objs = []
 for i in botlib_list:
 	botlib_objs.append( botlib_env.StaticObject( os.path.join( 'botlib', i ) ) )
 
-staticx11_libs = [ 'libXxf86dga.a', 'libXxf86vm.a' ]
-if ( os.path.exists( os.path.join( '/usr/lib', staticx11_libs[0] ) ) ):
-	staticx11_libs = [ os.path.join( '/usr/lib', i ) for i in staticx11_libs ]
-else:
-	staticx11_libs = [ os.path.join( '/usr/X11R6/lib', i ) for i in staticx11_libs ]
-
 if ( g_os == 'Linux' ):
 	nasm_env = Environment( tools = [ 'nasm' ] )
 	nasm_env['ASFLAGS'] = '-f elf'
@@ -269,7 +263,7 @@ local_env = g_env.Clone()
 if ( g_os == 'Linux' ):
 	local_env.Append( LIBS = [ 'dl' ] )
 	if ( local_dedicated == 0 ):
-		local_env.Append( LIBS = [ 'X11', 'Xext', 'm' ] )
+		local_env.Append( LIBS = [ 'X11', 'Xext', 'Xxf86dga', 'Xxf86vm', 'm' ] )
 		local_env.Append( LIBPATH = [ '/usr/X11R6/lib' ] )
 		local_env.Append( CPPPATH = [ 'curl-7.12.2/include' ] )
 	else:
@@ -321,7 +315,6 @@ if ( local_dedicated == 0 ):
 	if ( g_os == 'Linux' ):
 		source_list += snd_mixa
 		source_list += linux_full_sources
-		source_list += staticx11_libs
 	if ( g_os == 'win32' ):
 		source_list += win32_full_sources
 else:
-- 
1.7.1

Places

File 0001-don-t-link-X-libs-statically.diff of Package enemy-territory (Revision 31780d2d8604bb877ba3352138624ed1)

Places