mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-02 09:52:27 -04:00
Find nsis in any installed SDK
This commit is contained in:
parent
93510327be
commit
d87550fd5a
@ -784,9 +784,16 @@ class Installer:
|
|||||||
# Check if we have makensis first
|
# Check if we have makensis first
|
||||||
makensis = None
|
makensis = None
|
||||||
if (sys.platform.startswith("win")):
|
if (sys.platform.startswith("win")):
|
||||||
for p in os.defpath.split(";") + os.environ["PATH"].split(";"):
|
syspath = os.defpath.split(";") + os.environ["PATH"].split(";")
|
||||||
if os.path.isfile(os.path.join(p, "makensis.exe")):
|
for p in set(syspath):
|
||||||
makensis = os.path.join(p, "makensis.exe")
|
p1 = os.path.join(p, "makensis.exe")
|
||||||
|
p2 = os.path.join(os.path.dirname(p), "nsis", "makensis.exe")
|
||||||
|
if os.path.isfile(p1):
|
||||||
|
makensis = p1
|
||||||
|
break
|
||||||
|
elif os.path.isfile(p2):
|
||||||
|
makensis = p2
|
||||||
|
break
|
||||||
if not makensis:
|
if not makensis:
|
||||||
import pandac
|
import pandac
|
||||||
makensis = os.path.dirname(os.path.dirname(pandac.__file__))
|
makensis = os.path.dirname(os.path.dirname(pandac.__file__))
|
||||||
|
Loading…
x
Reference in New Issue
Block a user