4612
|
1 diff -ur nsis-3.03-src.orig/SCons/Config/gnu nsis-3.03-src/SCons/Config/gnu |
|
2 --- nsis-3.03-src.orig/SCons/Config/gnu 2018-03-03 19:38:08.620291177 -0500 |
|
3 +++ nsis-3.03-src/SCons/Config/gnu 2018-03-03 19:38:20.109576191 -0500 |
4605
|
4 @@ -45,11 +45,6 @@ |
|
5 defenv['MSVCRT_FLAG'] = '' |
|
6 defenv['STDCALL'] = '"__attribute__((__stdcall__))"' |
|
7 |
|
8 -# Don't allow mingw to link with LIBGCC*.DLL and LIBSTDC++-*.DLL |
|
9 -if defenv['PLATFORM'] == 'win32': |
|
10 - defenv.Append(LINKFLAGS = ['-static-libgcc']) |
|
11 - defenv.Append(LINKFLAGS = ['-static-libstdc++']) |
|
12 - |
|
13 ### defines |
|
14 |
|
15 defenv.Append(CPPDEFINES = [('NSISCALL', '$STDCALL')]) |
4612
|
16 @@ -141,7 +136,6 @@ |
4605
|
17 plugin_env.Append(LINKFLAGS = ['$ALIGN_FLAG']) # 512 bytes align |
|
18 plugin_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file |
4612
|
19 plugin_env.Append(LINKFLAGS = ['-static-libgcc']) # remove libgcc*.dll dependency |
4605
|
20 -plugin_env.Append(LINKFLAGS = ['-static-libstdc++']) # remove libstdc++*.dll dependency |
|
21 |
|
22 plugin_uenv = plugin_env.Clone() |
|
23 plugin_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE']) |