dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes for MinGW (substart and system.dll still broken)

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6154 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2011-06-15 22:48:02 +00:00
parent 96af71d0d1
commit fd1febb2f0
4 changed files with 17 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Contrib/ExDLL/SConscript
View file

@ -67,4 +67,5 @@ plugin_env.Append(LIBPATH = ['#$BUILD_PREFIX/api/nsis'])
plugin_env.Append(LIBS = [lib_target]) plugin_env.Append(LIBS = [lib_target])
plugin_uenv.Append(CPPPATH = ['#$BUILD_PREFIX/api']) plugin_uenv.Append(CPPPATH = ['#$BUILD_PREFIX/api'])
plugin_uenv.Append(LIBPATH = ['#$BUILD_PREFIX/api/nsis']) plugin_uenv.Append(LIBPATH = ['#$BUILD_PREFIX/api/nsis'])
plugin_uenv.Append(LIBS = [lib_target+'W']) if env['UNICODE']: # MinGW ANSI build tries to link with pluginapi and pluginapiW, this is a hack to stop that [Anders]
plugin_uenv.Append(LIBS = [lib_target+'W'])

2
SCons/Config/gnu
View file

@ -31,7 +31,7 @@ defenv['ALIGN_FLAG'] = '-Wl,--file-alignment,512'
defenv['CPP_REQUIRES_STDLIB'] = 1 defenv['CPP_REQUIRES_STDLIB'] = 1
defenv['SUBSYS_CON'] = '-Wl,--subsystem,console' defenv['SUBSYS_CON'] = '-Wl,--subsystem,console'
defenv['MSVCRT_FLAG'] = '' defenv['MSVCRT_FLAG'] = ''
defenv['STDCALL'] = ' __attribute__((__stdcall__))' defenv['STDCALL'] = '__attribute__((__stdcall__))'
### defines ### defines

15
Source/Platform.h
View file

@ -28,7 +28,6 @@
#include <commctrl.h> #include <commctrl.h>
#include <shellapi.h> #include <shellapi.h>
#include <shlwapi.h> #include <shlwapi.h>
#pragma comment(lib, "shlwapi.lib")
#include "tchar.h" #include "tchar.h"
#else #else
# ifndef EXEHEAD # ifndef EXEHEAD
@ -110,6 +109,10 @@ typedef DWORDLONG ULONGLONG,*PULONGLONG;
#endif #endif
#ifndef INT_MAX
#include <limits.h>
#endif
// mingw32 and w64-mingw32 do not define ULONG_PTR // mingw32 and w64-mingw32 do not define ULONG_PTR
// but rather declare ULONG_PTR via typedef (see basetsd.h) // but rather declare ULONG_PTR via typedef (see basetsd.h)
@ -220,7 +223,7 @@ typedef DWORDLONG ULONGLONG,*PULONGLONG;
// functions // functions
// Anders: MSVC's swprintf is non standard, use _snwprintf when you really mean swprintf // Anders: MSVC's swprintf is non standard, use _snwprintf when you really mean swprintf
#if !defined(_MSC_VER) && !defined(_snwprintf) #if !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(_snwprintf)
#define _snwprintf swprintf #define _snwprintf swprintf
#endif #endif
@ -236,6 +239,14 @@ typedef DWORDLONG ULONGLONG,*PULONGLONG;
// defines // defines
#ifndef WC_NO_BEST_FIT_CHARS
# define MEM_LARGE_PAGES 0x20000000
#endif
#ifndef WC_NO_BEST_FIT_CHARS
# define WC_NO_BEST_FIT_CHARS 0x400
#endif
#ifndef IDC_HAND #ifndef IDC_HAND
# define IDC_HAND MAKEINTRESOURCE(32649) # define IDC_HAND MAKEINTRESOURCE(32649)
#endif #endif

1
Source/SConscript
View file

@ -53,6 +53,7 @@ libs = Split("""
user32 user32
pthread pthread
iconv iconv
shlwapi
""") """)
Import('env AddAvailableLibs AddZLib') Import('env AddAvailableLibs AddZLib')