3804
|
1 diff -ur nsis-2.46-src.orig/SCons/Tools/crossmingw.py nsis-2.46-src/SCons/Tools/crossmingw.py |
|
2 --- nsis-2.46-src.orig/SCons/Tools/crossmingw.py 2015-02-08 20:55:24.129440718 -0500 |
|
3 +++ nsis-2.46-src/SCons/Tools/crossmingw.py 2015-02-08 20:58:12.005446948 -0500 |
|
4 @@ -145,15 +145,15 @@ |
|
5 SCons.Tool.Tool(tool)(env) |
|
6 |
|
7 #... but a few things differ: |
|
8 - env['CC'] = mingw_prefix + 'gcc' |
|
9 + env['CC'] = mingw_prefix + 'gcc -m32' |
|
10 env['SHCCFLAGS'] = SCons.Util.CLVar('$CCFLAGS') |
|
11 - env['CXX'] = mingw_prefix + 'g++' |
|
12 + env['CXX'] = mingw_prefix + 'g++ -m32' |
|
13 env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS') |
|
14 env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS -shared') |
|
15 env['SHLINKCOM'] = shlib_action |
|
16 env.Append(SHLIBEMITTER = [shlib_emitter]) |
|
17 - env['LINK'] = mingw_prefix + 'g++' |
|
18 - env['AS'] = mingw_prefix + 'as' |
|
19 + env['LINK'] = mingw_prefix + 'g++ -m32' |
|
20 + env['AS'] = mingw_prefix + 'as -m32' |
|
21 env['AR'] = mingw_prefix + 'ar' |
|
22 env['RANLIB'] = mingw_prefix + 'ranlib' |
|
23 env['WIN32DEFPREFIX'] = '' |
|
24 @@ -161,7 +161,7 @@ |
|
25 env['SHOBJSUFFIX'] = '.o' |
|
26 env['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 1 |
|
27 |
|
28 - env['RC'] = mingw_prefix + 'windres' |
|
29 + env['RC'] = mingw_prefix + 'windres --target=pe-i386' |
|
30 env['RCFLAGS'] = SCons.Util.CLVar('') |
|
31 env['RCCOM'] = '$RC $_CPPDEFFLAGS $_CPPINCFLAGS ${INCPREFIX}${SOURCE.dir} $RCFLAGS -i $SOURCE -o $TARGET' |
|
32 env['BUILDERS']['RES'] = res_builder |