diff --git a/neo/sys/scons/SConscript.core b/neo/sys/scons/SConscript.core index e49b115..ff4693b 100644 --- a/neo/sys/scons/SConscript.core +++ b/neo/sys/scons/SConscript.core @@ -336,7 +336,7 @@ else: sound_env.Append( CPPDEFINES = 'NO_ALSA' ) 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 ): local_env.Append( LIBS = [ 'X11', 'Xext', 'Xxf86vm' ] ) # 'Xxf86dga', local_env.Append( LIBPATH = [ '/usr/X11R6/lib' ] ) diff --git a/neo/sys/scons/SConscript.curl b/neo/sys/scons/SConscript.curl index 4d889b9..abaa401 100644 --- a/neo/sys/scons/SConscript.curl +++ b/neo/sys/scons/SConscript.curl @@ -14,7 +14,7 @@ class idBuildCurl( scons_utils.idSetupBase ): def Compile( self, target = None, source = None, env = None ): self.TrySimpleCommand( 'cd curl ; make clean' ) - cmd = 'cd curl ; CC=\'' + env['CC'] + '\' ./configure --enable-shared=no --enable-static=yes --enable-http --enable-ftp --disable-gopher --enable-file --disable-ldap --disable-dict --disable-telnet --disable-manual --enable-libgcc --disable-ipv6 --without-ssl ' + cmd = 'cd curl ; CC=\'' + env['CC'] + '\' CFLAGS=\'-m32\' ./configure --enable-shared=no --enable-static=yes --enable-http --enable-ftp --disable-gopher --enable-file --disable-ldap --disable-dict --disable-telnet --disable-manual --enable-libgcc --disable-ipv6 --without-ssl ' if ( self.debug ): cmd += '--enable-debug' else: @@ -37,5 +37,5 @@ else: g_env.Command( target_name, None, Action( build.Compile ) ) -curl_libs = [ target_name, '/usr/lib/libz.a' ] +curl_libs = [ target_name ] Return( 'curl_libs' )