id-software/doom3.gpl
1
0
Fork 0
mirror of https://github.com/TTimo/doom3.gpl.git synced 2026-03-19 16:39:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Just use -lz instead of providing path to libz.a

Browse Source 
This is cleaner and more portable.
This commit is contained in:
Daniel Gibson
2011-11-24 21:49:54 +01:00
parent 87d583c3ba
commit 3bb47adf16
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
neo/sys/scons/SConscript.core
View File

@@ -336,7 +336,7 @@ else:
sound_env.Append( CPPDEFINES = 'NO_ALSA' ) sound_env.Append( CPPDEFINES = 'NO_ALSA' )
sound_lib = sound_env.StaticLibrary( 'sound', sound_list ) sound_lib = sound_env.StaticLibrary( 'sound', sound_list )
local_env.Append( LIBS = [ 'pthread', 'dl' ] ) local_env.Append( LIBS = [ 'pthread', 'dl', 'z' ] )
if ( local_dedicated == 0 ): if ( local_dedicated == 0 ):
local_env.Append( LIBS = [ 'X11', 'Xext', 'Xxf86vm' ] ) # 'Xxf86dga', local_env.Append( LIBS = [ 'X11', 'Xext', 'Xxf86vm' ] ) # 'Xxf86dga',
local_env.Append( LIBPATH = [ '/usr/X11R6/lib' ] ) local_env.Append( LIBPATH = [ '/usr/X11R6/lib' ] )

5
neo/sys/scons/SConscript.curl
View File

@@ -38,8 +38,5 @@ else:
g_env.Command( target_name, None, Action( build.Compile ) ) g_env.Command( target_name, None, Action( build.Compile ) )
if platform.architecture()[0] == '64bit': curl_libs = [ target_name ]
curl_libs = [ target_name, '/usr/lib32/libz.a' ]
else:
curl_libs = [ target_name, '/usr/lib/libz.a' ]
Return( 'curl_libs' ) Return( 'curl_libs' )