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

added MSVCRT_FLAG

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4963 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2007-03-02 11:17:08 +00:00
parent 78a980fe03
commit b293ebb229
4 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Contrib/NSIS Menu/SConscript
View file

@ -63,7 +63,7 @@ if os.environ.has_key('WXWIN'):
libs, libs,
res = rc, res = rc,
resources = resources, resources = resources,
flags = ['/MD', '$EXCEPTION_FLAG'], flags = ['$MSVCRT_FLAG', '$EXCEPTION_FLAG'],
libpath = wxlib, libpath = wxlib,
incpath = wxinc, incpath = wxinc,
root_util = True root_util = True

1
SCons/Config/default
View file

@ -12,6 +12,7 @@ defenv['C_FLAG'] = ''
defenv['CPP_FLAG'] = '' defenv['CPP_FLAG'] = ''
defenv['CPP_REQUIRES_STDLIB'] = 0 defenv['CPP_REQUIRES_STDLIB'] = 0
defenv['SUBSYS_CON'] = '' defenv['SUBSYS_CON'] = ''
defenv['MSVCRT_FLAG'] = ''
### stub environment ### stub environment

1
SCons/Config/gnu
View file

@ -30,6 +30,7 @@ defenv['CPP_FLAG'] = '-x c++'
defenv['ALIGN_FLAG'] = '-Wl,--file-alignment,512' 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'] = ''
### helper functions ### helper functions

1
SCons/Config/ms
View file

@ -11,6 +11,7 @@ defenv['C_FLAG'] = '/TC'
defenv['CPP_FLAG'] = '/TP' defenv['CPP_FLAG'] = '/TP'
defenv['CPP_REQUIRES_STDLIB'] = 0 defenv['CPP_REQUIRES_STDLIB'] = 0
defenv['SUBSYS_CON'] = '/subsystem:console' defenv['SUBSYS_CON'] = '/subsystem:console'
defenv['MSVCRT_FLAG'] = '/MD'
if float(defenv['MSVS_VERSION'].replace('Exp','')) >= 8.0: if float(defenv['MSVS_VERSION'].replace('Exp','')) >= 8.0:
defenv['EXCEPTION_FLAG'] = '/EHsc' defenv['EXCEPTION_FLAG'] = '/EHsc'