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

proper MSVS_VERSION check

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4817 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2006-11-17 11:38:15 +00:00
parent f04bd2fa14
commit 7519ae9fe2
2 changed files with 30 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Contrib/Math/SConscript
View file

@ -23,7 +23,7 @@ docs = Split("""
Import('BuildPlugin env') Import('BuildPlugin env')
if env['MSVS_VERSION'] >= 8.0: if float(env['MSVS_VERSION']) >= 8.0:
files += ['Source/mathcrtmt.lib'] files += ['Source/mathcrtmt.lib']
else: else:
files += ['Source/mathcrt.lib'] files += ['Source/mathcrt.lib']

60
SCons/Config/ms
View file

@ -12,7 +12,7 @@ defenv['CPP_FLAG'] = '/TP'
defenv['CPP_REQUIRES_STDLIB'] = 0 defenv['CPP_REQUIRES_STDLIB'] = 0
defenv['SUBSYS_CON'] = '/subsystem:console' defenv['SUBSYS_CON'] = '/subsystem:console'
if defenv['MSVS_VERSION'] >= 8.0: if float(defenv['MSVS_VERSION']) >= 8.0:
defenv['EXCEPTION_FLAG'] = '/EHsc' defenv['EXCEPTION_FLAG'] = '/EHsc'
defenv.Append(CCFLAGS = '/GS-') defenv.Append(CCFLAGS = '/GS-')
else: else:
@ -31,42 +31,40 @@ if defenv['DEBUG']:
# if stl usage causes link failure, copy the good libcp.lib # if stl usage causes link failure, copy the good libcp.lib
# from one of the other lib folders and use it instead. # from one of the other lib folders and use it instead.
if not defenv['MSVS_VERSION'] >= 8.0: confenv = defenv.Clone()
conf = confenv.Configure()
confenv = defenv.Clone() libcptest = """
conf = confenv.Configure() #include <fstream>
int main() {
// %s
std::ofstream header("test", std::ofstream::out);
return 0;
}
"""
libcptest = """ conf.env.PrependENVPath('LIB', Dir('#/.sconf_temp').abspath)
#include <fstream> conf.env.Append(CCFLAGS = ['$EXCEPTION_FLAG'])
int main() {
// %s
std::ofstream header("test", std::ofstream::out);
return 0;
}
"""
conf.env.PrependENVPath('LIB', Dir('#/.sconf_temp').abspath) if not conf.TryLink(libcptest % 'no change', '.cpp'):
conf.env.Append(CCFLAGS = ['$EXCEPTION_FLAG']) import os, shutil
if not conf.TryLink(libcptest % 'no change', '.cpp'): libdirs = defenv['ENV']['LIB'].split(os.pathsep)
import os, shutil
libdirs = defenv['ENV']['LIB'].split(os.pathsep) for libdir in libdirs:
try:
libcp = r'%s\libcp.lib' % libdir
shutil.copy(libcp, Dir('#/.sconf_temp').abspath)
if conf.TryLink(libcptest % (r'using %s' % libcp), '.cpp'):
defenv.PrependENVPath('LIB', Dir('#/.sconf_temp').abspath)
break
except IOError:
continue
else:
print "*** Couldn't find a good version of libcp.lib"
Exit(2)
for libdir in libdirs: conf.Finish()
try:
libcp = r'%s\libcp.lib' % libdir
shutil.copy(libcp, Dir('#/.sconf_temp').abspath)
if conf.TryLink(libcptest % (r'using %s' % libcp), '.cpp'):
defenv.PrependENVPath('LIB', Dir('#/.sconf_temp').abspath)
break
except IOError:
continue
else:
print "*** Couldn't find a good version of libcp.lib"
Exit(2)
conf.Finish()
### stub environment ### stub environment