mirror/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2026-02-21 06:39:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

OSX build tweaks and fixes (always use Python framework for SDK)

Browse Source
This commit is contained in:
rdb
2015-03-30 17:58:04 +02:00
parent 40fff906d1
commit 7097ea4a0e
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
makepanda/makepanda.py
View File

@@ -778,8 +778,7 @@ if (COMPILER=="GCC"):
SmartPkgEnable("ROCKET", "", rocket_libs, "Rocket/Core.h")
if not PkgSkip("PYTHON"):
if GetTarget() == "darwin" and SDK.get("MACOSX") and not RTDIST:
# When targeting a specific OSX version, use the system Python framework in the standard Mac SDK.
if GetTarget() == "darwin" and not RTDIST and not PkgHasCustomLocation("PYTHON"):
LibName("PYTHON", "-framework Python")
else:
SmartPkgEnable("PYTHON", "", SDK["PYTHONVERSION"], (SDK["PYTHONVERSION"], SDK["PYTHONVERSION"] + "/Python.h"), tool = SDK["PYTHONVERSION"] + "-config")
@@ -6741,7 +6740,7 @@ def MakeInstallerOSX():
dist = open("dstroot/Panda3D/Panda3D.mpkg/Contents/distribution.dist", "w")
dist.write('<?xml version="1.0" encoding="utf-8"?>\n')
dist.write('<installer-script minSpecVersion="1.000000" authoringTool="com.apple.PackageMaker" authoringToolVersion="3.0.3" authoringToolBuild="174">\n')
dist.write(' <title>Panda3D</title>\n')
dist.write(' <title>Panda3D SDK %s</title>\n' % (VERSION))
dist.write(' <options customize="always" allow-external-scripts="no" rootVolumeOnly="false"/>\n')
dist.write(' <license language="en" mime-type="text/plain">%s</license>\n' % ReadFile("doc/LICENSE"))
dist.write(' <choices-outline>\n')
@@ -6780,8 +6779,8 @@ def MakeInstallerOSX():
dist.write('</installer-script>\n')
dist.close()
oscmd('hdiutil create Panda3D-rw.dmg -srcfolder dstroot/Panda3D')
oscmd('hdiutil convert Panda3D-rw.dmg -format UDBZ -o Panda3D-%s.dmg' % VERSION)
oscmd('hdiutil create Panda3D-rw.dmg -volname "Panda3D SDK %s" -srcfolder dstroot/Panda3D' % (VERSION))
oscmd('hdiutil convert Panda3D-rw.dmg -format UDBZ -o Panda3D-%s.dmg' % (VERSION))
oscmd('rm -f Panda3D-rw.dmg')
def MakeInstallerFreeBSD():

4
makepanda/makepandacore.py
View File

@@ -1897,8 +1897,8 @@ def SdkLocatePython(prefer_thirdparty_python=False):
SDK["PYTHONEXEC"] = tp_python + "/bin/" + SDK["PYTHONVERSION"]
SDK["PYTHON"] = tp_python + "/include/" + SDK["PYTHONVERSION"]
elif GetTarget() == 'darwin' and SDK.get("MACOSX"):
# When targeting a specific Mac OS X version, use the system Python framework.
elif GetTarget() == 'darwin':
# On Mac OS X, use the system Python framework.
py_fwx = SDK.get("MACOSX", "") + "/System/Library/Frameworks/Python.framework/Versions/Current"
if not os.path.islink(py_fwx):

2
pandatool/src/mayaprogs/mayapath.cxx
View File

@@ -46,6 +46,8 @@
#if defined(_WIN32)
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#else
#include <sys/stat.h>
#endif
#define QUOTESTR(x) #x