From cd01f15c77e4d1e751714e9fd1b6398a9566c147 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Tue, 14 Jan 2014 10:42:03 +0000
Subject: [PATCH] Use 64-bit regview when making 64-bit builds to fix
 interaction between Python installations/libraries and Panda3D

---
 makepanda/makepanda.py | 6 ++++++
 1 file changed, 6 insertions(+)

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