moved NSISCALL detection to scons
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@5814 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
parent
61530710bc
commit
f6e4fefbf5
5 changed files with 22 additions and 21 deletions
|
@ -13,6 +13,11 @@ defenv['CPP_FLAG'] = ''
|
|||
defenv['CPP_REQUIRES_STDLIB'] = 0
|
||||
defenv['SUBSYS_CON'] = ''
|
||||
defenv['MSVCRT_FLAG'] = ''
|
||||
defenv['STDCALL'] = ''
|
||||
|
||||
### defines
|
||||
|
||||
defenv.Append(CPPDEFINES = {'NSISCALL' : '$STDCALL'})
|
||||
|
||||
### stub environment
|
||||
|
||||
|
|
|
@ -31,6 +31,11 @@ defenv['ALIGN_FLAG'] = '-Wl,--file-alignment,512'
|
|||
defenv['CPP_REQUIRES_STDLIB'] = 1
|
||||
defenv['SUBSYS_CON'] = '-Wl,--subsystem,console'
|
||||
defenv['MSVCRT_FLAG'] = ''
|
||||
defenv['STDCALL'] = '__attribute__((__stdcall__))'
|
||||
|
||||
### defines
|
||||
|
||||
defenv.Append(CPPDEFINES = {'NSISCALL' : '$STDCALL'})
|
||||
|
||||
### helper functions
|
||||
|
||||
|
|
|
@ -13,6 +13,11 @@ defenv['CPP_FLAG'] = ''
|
|||
defenv['CPP_REQUIRES_STDLIB'] = 0
|
||||
defenv['SUBSYS_CON'] = ''
|
||||
defenv['MSVCRT_FLAG'] = ''
|
||||
defenv['STDCALL'] = ''
|
||||
|
||||
### defines
|
||||
|
||||
defenv.Append(CPPDEFINES = {'NSISCALL' : '$STDCALL'})
|
||||
|
||||
### stub environment
|
||||
|
||||
|
|
|
@ -12,6 +12,7 @@ defenv['CPP_FLAG'] = '/TP'
|
|||
defenv['CPP_REQUIRES_STDLIB'] = 0
|
||||
defenv['SUBSYS_CON'] = '/subsystem:console'
|
||||
defenv['MSVCRT_FLAG'] = '/MD'
|
||||
defenv['STDCALL'] = '__stdcall'
|
||||
|
||||
if float(defenv['MSVS_VERSION'].replace('Exp','')) >= 8.0:
|
||||
defenv['EXCEPTION_FLAG'] = '/EHsc'
|
||||
|
@ -20,6 +21,12 @@ if float(defenv['MSVS_VERSION'].replace('Exp','')) >= 8.0:
|
|||
else:
|
||||
defenv['EXCEPTION_FLAG'] = '/GX'
|
||||
|
||||
### defines
|
||||
|
||||
defenv.Append(CPPDEFINES = {'NSISCALL' : '$STDCALL'})
|
||||
|
||||
### asm
|
||||
|
||||
defenv.Append(ASFLAGS = ['/coff'])
|
||||
|
||||
### debug
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue