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

added MSVS_VERSION option to scons command-line to specify which compiler to use

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6110 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
wizou 2010-07-04 00:07:59 +00:00
parent 9d452fc5d1
commit 403ff55f81
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
SConstruct
View file

@ -151,6 +151,7 @@ opts.Add(('IGNORETESTS', 'A comma-separated list of test files that will be ran
opts.Add(('PATH', 'A colon-separated list of system paths instead of the default - TEMPORARY AND MAY DEPRECATE', None))
opts.Add(('TOOLSET', 'A comma-separated list of specific tools used for building instead of the default', None))
opts.Add(BoolVariable('MSTOOLKIT', 'Use Microsoft Visual C++ Toolkit', 'no'))
opts.Add(EnumVariable('MSVS_VERSION', 'MS Visual C++ version', os.environ.get('MSVS_VERSION'), allowed_values=('6.0', '7.0', '7.1', '8.0', '8.0Exp', '9.0', '9.0Exp', '10.0', '10.0Exp')))
opts.Add(BoolVariable('CHMDOCS', 'Build CHM documentation, requires hhc.exe', hhc))
opts.Add(PathVariable('APPEND_CPPPATH', 'Additional paths to search for include files', None))
opts.Add(PathVariable('APPEND_LIBPATH', 'Additional paths to search for libraries', None))
@ -176,6 +177,7 @@ opts.Add(('PREFIX_PLUGINAPI_LIB','Path to install plugin static library to.', No
opts.Update(defenv)
Help(opts.GenerateHelpText(defenv))
Tool("msvc")(defenv)
# add prefixes defines
if 'NSIS_CONFIG_CONST_DATA_PATH' in defenv['NSIS_CPPDEFINES']:

3
Source/mmap.cpp
View file

@ -17,7 +17,8 @@
#include "mmap.h"
#include <cstdio> // for f*
#include <cassert> // for assert
#include "tchar.h"
#include "tchar.h"
#include <limits.h>
#ifndef _WIN32
# include <sys/types.h> // for freebsd
# include <sys/mman.h>