Mercurial > mxe-octave

view src/win64-nsis.patch @ 4449:1933a9113e65

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
of-*: add octave as a dependancy to the of packages is binary enable is set (Bug #46235) * src/of-actuarial.mk, src/of-communications.mk, src/of-control.mk, src/of-data-smoothing.mk, src/of-database.mk, src/of-dataframe.mk, src/of-dicom.mk, src/of-financial.mk, src/of-fits.mk, src/of-fl-core.mk, src/of-fuzzy-logic-toolkit.mk, src/of-ga.mk, src/of-general.mk, src/of-generate_html.mk, src/of-geometry.mk, src/of-gsl.mk, src/of-image.mk, src/of-instrument-control.mk, src/of-interval.mk, src/of-io.mk, src/of-linear-algebra.mk, src/of-lssa.mk, src/of-ltfat.mk, src/of-mapping.mk, src/of-miscellaneous.mk, src/of-nan.mk, src/of-netcdf.mk, src/of-nurbs.mk, src/of-ocs.mk, src/of-octcdf.mk, src/of-odepkg.mk, src/of-optim.mk, src/of-quaternion.mk, src/of-queueing.mk, src/of-signal.mk, src/of-sockets.mk, src/of-sparsersb.mk, src/of-specfun.mk, src/of-splines.mk, src/of-statistics.mk, src/of-stk.mk, src/of-strings.mk, src/of-struct.mk, src/of-tisean.mk, src/of-tsa.mk, src/of-video.mk, src/of-windows.mk, src/of-zenity.mk, src/of-zeromq.mk: add $(PKG)_DEPS += $(OCTAVE_TARGET) if ENABLE_BINARY_PACKAGES = yes
author John D
date Mon, 14 Aug 2017 09:12:34 -0400
parents 7e15ef9bf1e5
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