TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-29 00:06:44 -04:00
Code Issues Packages Projects Releases Wiki Activity

makepackage: fix regression in MakeInstaller on Windows

Browse Source
This commit is contained in:
rdb 2020-01-05 18:52:26 +01:00
parent 399797d0b1
commit 8137bea8f8
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
makepanda/makepackage.py
View File

@ -1074,12 +1074,11 @@ def MakeInstallerAndroid(version, **kwargs):
def MakeInstaller(version, **kwargs): def MakeInstaller(version, **kwargs):
target = GetTarget() target = GetTarget()
if target == 'windows': if target == 'windows':
if kwargs.get('installdir') is None: dir = kwargs.pop('installdir', None)
if dir is None:
dir = "C:\\Panda3D-" + version dir = "C:\\Panda3D-" + version
if GetTargetArch() == 'x64': if GetTargetArch() == 'x64':
dir += '-x64' dir += '-x64'
else:
dir = kwargs['installdir']
fn = "Panda3D-" fn = "Panda3D-"