Mercurial > mxe-octave

annotate src/win64-nsis.patch @ 5893:53a6c7df43f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Mesa 3D: Update to version 21.1.8. * src/mesa.mk: Update version and checksum. * src/mesa-2-uninitialized.patch: Remove file. * dist-files.mk: Remove file from list.
author Markus Mützel <markus.muetzel@gmx.de>
date Thu, 16 Sep 2021 22:37:45 +0200
parents 7e15ef9bf1e5
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3804
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
1 diff -ur nsis-2.46-src.orig/SCons/Tools/crossmingw.py nsis-2.46-src/SCons/Tools/crossmingw.py
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
2 --- nsis-2.46-src.orig/SCons/Tools/crossmingw.py 2015-02-08 20:55:24.129440718 -0500
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
3 +++ nsis-2.46-src/SCons/Tools/crossmingw.py 2015-02-08 20:58:12.005446948 -0500
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
4 @@ -145,15 +145,15 @@
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
5 SCons.Tool.Tool(tool)(env)
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
6
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
7 #... but a few things differ:
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
8 - env['CC'] = mingw_prefix + 'gcc'
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
9 + env['CC'] = mingw_prefix + 'gcc -m32'
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
10 env['SHCCFLAGS'] = SCons.Util.CLVar('$CCFLAGS')
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
11 - env['CXX'] = mingw_prefix + 'g++'
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
12 + env['CXX'] = mingw_prefix + 'g++ -m32'
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
13 env['SHCXXFLAGS'] = SCons.Util.CLVar('$CXXFLAGS')
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
14 env['SHLINKFLAGS'] = SCons.Util.CLVar('$LINKFLAGS -shared')
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
15 env['SHLINKCOM'] = shlib_action
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
16 env.Append(SHLIBEMITTER = [shlib_emitter])
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
17 - env['LINK'] = mingw_prefix + 'g++'
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
18 - env['AS'] = mingw_prefix + 'as'
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
19 + env['LINK'] = mingw_prefix + 'g++ -m32'
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
20 + env['AS'] = mingw_prefix + 'as -m32'
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
21 env['AR'] = mingw_prefix + 'ar'
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
22 env['RANLIB'] = mingw_prefix + 'ranlib'
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
23 env['WIN32DEFPREFIX'] = ''
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
24 @@ -161,7 +161,7 @@
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
25 env['SHOBJSUFFIX'] = '.o'
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
26 env['STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME'] = 1
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
27
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
28 - env['RC'] = mingw_prefix + 'windres'
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
29 + env['RC'] = mingw_prefix + 'windres --target=pe-i386'
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
30 env['RCFLAGS'] = SCons.Util.CLVar('')
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
31 env['RCCOM'] = '$RC $_CPPDEFFLAGS $_CPPINCFLAGS ${INCPREFIX}${SOURCE.dir} $RCFLAGS -i $SOURCE -o $TARGET'
7e15ef9bf1e5 Update build-gcc, nsis to compile when in w64 mode.
John D
parents:
diff changeset
32 env['BUILDERS']['RES'] = res_builder