TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-03 18:31:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use 64-bit regview when making 64-bit builds to fix interaction between Python installations/libraries and Panda3D

Browse Source
This commit is contained in:
rdb 2014-01-14 10:42:03 +00:00
parent 07404ff694
commit cd01f15c77
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
makepanda/makepanda.py
View File

@ -5908,6 +5908,11 @@ def MakeInstallerNSIS(file, fullname, smdirectory, installdir):
psource = os.path.abspath(".") psource = os.path.abspath(".")
panda = os.path.abspath(GetOutputDir()) panda = os.path.abspath(GetOutputDir())
if GetTargetArch() == 'x64':
regview = '64'
else:
regview = '32'
nsis_defs = { nsis_defs = {
'COMPRESSOR' : COMPRESSOR, 'COMPRESSOR' : COMPRESSOR,
'NAME' : fullname, 'NAME' : fullname,
@ -5924,6 +5929,7 @@ def MakeInstallerNSIS(file, fullname, smdirectory, installdir):
'PANDACONF' : os.path.join(panda, 'etc'), 'PANDACONF' : os.path.join(panda, 'etc'),
'PSOURCE' : psource, 'PSOURCE' : psource,
'PYEXTRAS' : os.path.join(os.path.abspath(GetThirdpartyBase()), 'win-extras'), 'PYEXTRAS' : os.path.join(os.path.abspath(GetThirdpartyBase()), 'win-extras'),
'REGVIEW' : regview,
} }
if GetHost() == 'windows': if GetHost() == 'windows':