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

Basic Win64 support (MSVC)

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6439 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2014-02-08 00:13:52 +00:00
parent 204f371097
commit d799ee53d7
52 changed files with 380 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

8
SConstruct
View file

@ -1,5 +1,5 @@
EnsureSConsVersion(1,2)
stubs = [
'bzip2',
'lzma',
@ -260,7 +260,7 @@ if (not defenv.has_key('VER_PACKED')) and defenv.has_key('VER_MAJOR') and defenv
if defenv.has_key('VER_PACKED'):
f.write('#define NSIS_PACKEDVERSION _T("%s")\n' % defenv['VER_PACKED'])
if defenv.has_key('VER_MAJOR') and not defenv.has_key('VERSION'):
if defenv.has_key('VER_MAJOR') and defenv.get('VERSION','') == '':
defenv['VERSION'] = defenv['VER_MAJOR']
if defenv.has_key('VER_MINOR'):
defenv['VERSION'] += '.' + defenv['VER_MINOR']
@ -694,7 +694,9 @@ for plugin in plugin_libs + plugins:
srcpath = 'Contrib/' + plugin
build_dir = '$BUILD_PREFIX/' + plugin
pvariants = [{'e':plugin_env.Clone()}] # BUGBUG64: Only build unicode plugins
pvariants = []
if GetArcCPU(defenv) == 'x86':
pvariants += [{'e':plugin_env.Clone()}]
if defenv['UNICODE']:
pvariants += [{'e':plugin_uenv.Clone()}]
for pvariant in pvariants: