Mercurial > mxe-octave

view src/win64-nsis.patch @ 3804:7e15ef9bf1e5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update build-gcc, nsis to compile when in w64 mode. * src/build-binutils.mk: add windows 64 conditionals to binutils to compile multilib * src/build-gcc.mk:add windows 64 conditionals to gcc to compile multilib * src/nsis.mk: add PKG_BUILD target for windows 64 * src/win64-nsis.patch: new file. * dist-files.mk: add reference to win64-nsis.patch.
author John D
date Tue, 17 Feb 2015 14:48:23 -0500
parents
children
line wrap: on
line source

diff -ur nsis-2.46-src.orig/SCons/Tools/crossmingw.py nsis-2.46-src/SCons/Tools/crossmingw.py
--- nsis-2.46-src.orig/SCons/Tools/crossmingw.py	2015-02-08 20:55:24.129440718 -0500
+++ nsis-2.46-src/SCons/Tools/crossmingw.py	2015-02-08 20:58:12.005446948 -0500
@@ -145,15 +145,15 @@
         SCons.Tool.Tool(tool)(env)
 
     #... but a few things differ:
-    env['CC'] = mingw_prefix + 'gcc'
+    env['CC'] = mingw_prefix + 'gcc -m32'
     env['SHCCFLAGS'] = SCons.Util.CLVar('$CCFLAGS')
-    env['CXX'] = mingw_prefix + 'g++'
+    env['CXX'] = mingw_prefix + 'g++ -m32'
     env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')
     env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS -shared')
     env['SHLINKCOM']   = shlib_action
     env.Append(SHLIBEMITTER = [shlib_emitter])
-    env['LINK'] = mingw_prefix + 'g++'
-    env['AS'] = mingw_prefix + 'as'
+    env['LINK'] = mingw_prefix + 'g++ -m32'
+    env['AS'] = mingw_prefix + 'as -m32'
     env['AR'] = mingw_prefix + 'ar'
     env['RANLIB'] = mingw_prefix + 'ranlib'
     env['WIN32DEFPREFIX']        = ''
@@ -161,7 +161,7 @@
     env['SHOBJSUFFIX'] = '.o'
     env['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 1
 
-    env['RC'] = mingw_prefix + 'windres'
+    env['RC'] = mingw_prefix + 'windres --target=pe-i386'
     env['RCFLAGS'] = SCons.Util.CLVar('')
     env['RCCOM'] = '$RC $_CPPDEFFLAGS $_CPPINCFLAGS ${INCPREFIX}${SOURCE.dir} $RCFLAGS -i $SOURCE -o $TARGET'
     env['BUILDERS']['RES'] = res_builder