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

a few minor fixes, including better support for Xcode 4.3 on OSX Lion

Browse Source
This commit is contained in:
rdb 2012-07-25 09:47:34 +00:00
parent f565e3fb09
commit e131c12dcb
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
makepanda/makepandacore.py
View File

@ -684,14 +684,16 @@ def ReadFile(wfile):
data = srchandle.read() data = srchandle.read()
srchandle.close() srchandle.close()
return data return data
except: exit("Cannot read "+wfile) except Exception, ex:
exit("Cannot read %s: %s" % (wfile, ex))
def WriteFile(wfile, data): def WriteFile(wfile, data):
try: try:
dsthandle = open(wfile, "wb") dsthandle = open(wfile, "wb")
dsthandle.write(data) dsthandle.write(data)
dsthandle.close() dsthandle.close()
except: exit("Cannot write "+wfile) except Exception, ex:
exit("Cannot write to %s: %s" % (wfile, ex))
def ConditionalWriteFile(dest,desiredcontents): def ConditionalWriteFile(dest,desiredcontents):
try: try:
@ -1183,8 +1185,11 @@ def SmartPkgEnable(pkg, pkgconfig = None, libs = None, incs = None, defs = None,
return return
if (os.path.isdir(GetThirdpartyDir() + pkg.lower())): if (os.path.isdir(GetThirdpartyDir() + pkg.lower())):
if os.path.isdir(GetThirdpartyDir() + pkg.lower() + "/include"):
IncDirectory(target_pkg, GetThirdpartyDir() + pkg.lower() + "/include") IncDirectory(target_pkg, GetThirdpartyDir() + pkg.lower() + "/include")
if os.path.isdir(GetThirdpartyDir() + pkg.lower() + "/lib"):
LibDirectory(target_pkg, GetThirdpartyDir() + pkg.lower() + "/lib") LibDirectory(target_pkg, GetThirdpartyDir() + pkg.lower() + "/lib")
if (PkgSkip("PYTHON") == 0): if (PkgSkip("PYTHON") == 0):
LibDirectory(target_pkg, GetThirdpartyDir() + pkg.lower() + "/lib/" + SDK["PYTHONVERSION"]) LibDirectory(target_pkg, GetThirdpartyDir() + pkg.lower() + "/lib/" + SDK["PYTHONVERSION"])
@ -1652,6 +1657,14 @@ def SdkLocateMacOSX(osxtarget = None):
SDK["MACOSX"] = "/Developer/SDKs/MacOSX%s.sdk" % osxtarget SDK["MACOSX"] = "/Developer/SDKs/MacOSX%s.sdk" % osxtarget
elif (os.path.exists("/Developer/SDKs/MacOSX%s.0.sdk" % osxtarget)): elif (os.path.exists("/Developer/SDKs/MacOSX%s.0.sdk" % osxtarget)):
SDK["MACOSX"] = "/Developer/SDKs/MacOSX%s.0.sdk" % osxtarget SDK["MACOSX"] = "/Developer/SDKs/MacOSX%s.0.sdk" % osxtarget
elif (os.path.exists("/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX%s.sdk" % osxtarget)):
SDK["MACOSX"] = "/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX%s.sdk" % osxtarget
else:
handle = os.popen("xcode-select -print-path")
result = handle.read().strip().rstrip('/')
handle.close()
if (os.path.exists("%s/Platforms/MacOSX.platform/Developer/SDKs/MacOSX%s.sdk" % (result, osxtarget))):
SDK["MACOSX"] = "%s/Platforms/MacOSX.platform/Developer/SDKs/MacOSX%s.sdk" % (result, osxtarget)
else: else:
exit("Couldn't find any MacOSX SDK for OSX version %s!" % osxtarget) exit("Couldn't find any MacOSX SDK for OSX version %s!" % osxtarget)
else: else: