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

Fix makepanda, squelch libpandaexpress import error

Browse Source
This commit is contained in:
rdb 2015-03-30 00:21:31 +02:00
parent 5827959056
commit af18bfd18d
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
direct/src/extensions_native/extension_native_helpers.py
View File

@ -107,14 +107,13 @@ def Dtool_PreloadDLL(module):
# Dtool_FindModule to find our panda3d.core module. However, we # Dtool_FindModule to find our panda3d.core module. However, we
# should be able to import it. To differentiate the old-style Panda # should be able to import it. To differentiate the old-style Panda
# build (with .dll's) from the new-style Panda build (with .pyd's), we # build (with .dll's) from the new-style Panda build (with .pyd's), we
# first try to import libpandaexpress directly; if it succeeds we're # first try to import panda3d.core directly; if it succeeds we're in a
# in an old-style build, and if it fails we must be in a new-style # new-style build, and if it fails we must be in an old-style build.
# build.
try: try:
from panda3d.core import *
except ImportError:
Dtool_PreloadDLL("libpandaexpress") Dtool_PreloadDLL("libpandaexpress")
from libpandaexpress import * from libpandaexpress import *
except ImportError:
from panda3d.core import *
def Dtool_ObjectToDict(cls, name, obj): def Dtool_ObjectToDict(cls, name, obj):
cls.DtoolClassDict[name] = obj; cls.DtoolClassDict[name] = obj;

2
makepanda/makepanda.py
View File

@ -238,7 +238,7 @@ def parseopts(args):
if option == "--use-" + pkg.lower(): if option == "--use-" + pkg.lower():
PkgEnable(pkg) PkgEnable(pkg)
break break
elif option == "--use-" + pkg.lower(): elif option == "--no-" + pkg.lower():
PkgDisable(pkg) PkgDisable(pkg)
break break
elif option == "--" + pkg.lower() + "-incdir": elif option == "--" + pkg.lower() + "-incdir":