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

Fix creating 32bit binaries on Linux/amd64

Browse Source
This commit is contained in:
Daniel Gibson
2011-11-23 21:17:49 +01:00
parent 15597777fc
commit 87d583c3ba
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,7 @@
# http://scons.sourceforge.net # http://scons.sourceforge.net
import os import os
import platform
import scons_utils import scons_utils
@@ -14,7 +15,7 @@ class idBuildCurl( scons_utils.idSetupBase ):
def Compile( self, target = None, source = None, env = None ): def Compile( self, target = None, source = None, env = None ):
self.TrySimpleCommand( 'cd curl ; make clean' ) 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 ): if ( self.debug ):
cmd += '--enable-debug' cmd += '--enable-debug'
else: else:
@@ -37,5 +38,8 @@ else:
g_env.Command( target_name, None, Action( build.Compile ) ) g_env.Command( target_name, None, Action( build.Compile ) )
curl_libs = [ target_name, '/usr/lib/libz.a' ] if platform.architecture()[0] == '64bit':
curl_libs = [ target_name, '/usr/lib32/libz.a' ]
else:
curl_libs = [ target_name, '/usr/lib/libz.a' ]
Return( 'curl_libs' ) Return( 'curl_libs' )