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

Fixed a comment typo... used // instead of #

Browse Source 
Added warnings and automatic checking to see if thirdparty libs exists.

--everything now works with 64bit even though we have an incomplete thirdparty library set
This commit is contained in:
Bei Yang 2009-04-25 08:32:23 +00:00
parent c7ddc2094c
commit ece33e86e6
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makepanda/makepanda.py
View File

@ -796,7 +796,7 @@ DTOOL_CONFIG=[
("HAVE_DX9", 'UNDEF', 'UNDEF'), ("HAVE_DX9", 'UNDEF', 'UNDEF'),
("HAVE_CHROMIUM", 'UNDEF', 'UNDEF'), ("HAVE_CHROMIUM", 'UNDEF', 'UNDEF'),
("HAVE_THREADS", '1', '1'), ("HAVE_THREADS", '1', '1'),
("SIMPLE_THREADS", '1', '1'), ("SIMPLE_THREADS", 'UNDEF', '1'),
("HAVE_AUDIO", '1', '1'), ("HAVE_AUDIO", '1', '1'),
("NOTIFY_DEBUG", 'UNDEF', 'UNDEF'), ("NOTIFY_DEBUG", 'UNDEF', 'UNDEF'),
("DO_PSTATS", 'UNDEF', 'UNDEF'), ("DO_PSTATS", 'UNDEF', 'UNDEF'),
@ -917,7 +917,7 @@ def WriteConfigSettings():
dtool_config={} dtool_config={}
prc_parameters={} prc_parameters={}
if (sys.platform == "win32"): if (sys.platform == "win32") or (sys.platform == "win64"):
for key,win,unix in DTOOL_CONFIG: for key,win,unix in DTOOL_CONFIG:
dtool_config[key] = win dtool_config[key] = win
for key,win,unix in PRC_PARAMETERS: for key,win,unix in PRC_PARAMETERS:

12
makepanda/makepandacore.py
View File

@ -884,10 +884,10 @@ def SdkLocateMSPlatform():
# Doesn't work with the Express versions, so we're checking for the "atlmfc" dir, which is not in the Express # Doesn't work with the Express versions, so we're checking for the "atlmfc" dir, which is not in the Express
if (platsdk == 0 and os.path.isdir(os.path.join(GetProgramFiles(), "Microsoft Visual Studio 9\\VC\\atlmfc"))): if (platsdk == 0 and os.path.isdir(os.path.join(GetProgramFiles(), "Microsoft Visual Studio 9\\VC\\atlmfc"))):
platsdk = os.path.join(GetProgramFiles(), "Microsoft Visual Studio 9\\VC\\PlatformSDK") platsdk = os.path.join(GetProgramFiles(), "Microsoft Visual Studio 9\\VC\\PlatformSDK")
//This may not be the best idea but it does give a warning #This may not be the best idea but it does give a warning
if (platsdk == 0): if (platsdk == 0):
if( os.environ.has_key("WindowsSdkDir") ): if( os.environ.has_key("WindowsSdkDir") ):
print "Warning: Windows SDK directory not found in registry, found in Environment variables instead" WARNINGS.append("Windows SDK directory not found in registry, found in Environment variables instead")
platsdk = os.environ["WindowsSdkDir"] platsdk = os.environ["WindowsSdkDir"]
if (platsdk != 0): if (platsdk != 0):
if (not platsdk.endswith("//")): if (not platsdk.endswith("//")):
@ -1002,6 +1002,14 @@ def LibDirectory(opt, dir):
LIBDIRECTORIES.append((opt, dir)) LIBDIRECTORIES.append((opt, dir))
def LibName(opt, name): def LibName(opt, name):
#check to see if the lib file actually exists for the thrid party library given
#are we a thrid party library?
if name.startswith("thirdparty"):
#does this lib exists
if not os.path.exists(name):
PkgDisable(opt)
WARNINGS.append(name + " not found. Skipping Package " + opt)
return
LIBNAMES.append((opt, name)) LIBNAMES.append((opt, name))
def DefSymbol(opt, sym, val): def DefSymbol(opt, sym, val):