Mercurial > mxe-octave

annotate src/nsis-2-fixes.patch @ 4605:a62c4469e2aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nsis: update to version 3.03
author John W. Eaton <jwe@octave.org>
date Mon, 26 Feb 2018 10:34:17 -0500
parents
children 56320dd51677
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4605
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
1 diff -uNr a/SCons/Config/gnu b/SCons/Config/gnu
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
2 --- a/SCons/Config/gnu 2017-10-06 15:30:20.000000000 -0400
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
3 +++ b/SCons/Config/gnu 2018-02-26 09:36:48.769368160 -0500
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
4 @@ -45,11 +45,6 @@
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
5 defenv['MSVCRT_FLAG'] = ''
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
6 defenv['STDCALL'] = '"__attribute__((__stdcall__))"'
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
7
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
8 -# Don't allow mingw to link with LIBGCC*.DLL and LIBSTDC++-*.DLL
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
9 -if defenv['PLATFORM'] == 'win32':
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
10 - defenv.Append(LINKFLAGS = ['-static-libgcc'])
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
11 - defenv.Append(LINKFLAGS = ['-static-libstdc++'])
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
12 -
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
13 ### defines
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
14
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
15 defenv.Append(CPPDEFINES = [('NSISCALL', '$STDCALL')])
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
16 @@ -140,8 +135,6 @@
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
17 plugin_env.Append(LINKFLAGS = ['-mwindows']) # build windows executables
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
18 plugin_env.Append(LINKFLAGS = ['$ALIGN_FLAG']) # 512 bytes align
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
19 plugin_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
20 -plugin_env.Append(LINKFLAGS = ['-static-libgcc']) # remove libgcc*.dll dependency
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
21 -plugin_env.Append(LINKFLAGS = ['-static-libstdc++']) # remove libstdc++*.dll dependency
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
22
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
23 plugin_uenv = plugin_env.Clone()
a62c4469e2aa nsis: update to version 3.03
John W. Eaton <jwe@octave.org>
parents:
diff changeset
24 plugin_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE'])