|
|
@@ -880,6 +880,8 @@ def WriteConfigSettings():
|
|
|
dtool_config["HAVE_PROC_SELF_MAPS"] = 'UNDEF'
|
|
|
dtool_config["HAVE_PROC_SELF_CMDLINE"] = 'UNDEF'
|
|
|
dtool_config["HAVE_PROC_SELF_ENVIRON"] = 'UNDEF'
|
|
|
+ # OSX still doesn't always recognize the <auto> correctly.
|
|
|
+ prc_parameters["DEFAULT_PRC_DIR"] = '"/Applications/Panda3D/' + VERSION + '/lib"'
|
|
|
|
|
|
if (OPTIMIZE <= 3):
|
|
|
if (dtool_config["HAVE_NET"] != 'UNDEF'):
|
|
|
@@ -3609,7 +3611,9 @@ def MakeInstallerOSX():
|
|
|
import compileall
|
|
|
PYTHONV=SDK["PYTHONVERSION"].replace("python", "").strip()
|
|
|
if (os.path.isfile("Panda3D-tpl-rw.dmg")): oscmd("rm -f Panda3D-tpl-rw.dmg")
|
|
|
- if (os.path.isdir("Panda3D-tpl-rw")): oscmd("rm -rf Panda3D-tpl-rw")
|
|
|
+ if (os.path.isdir("Panda3D-tpl-rw")):
|
|
|
+ oscmd("hdiutil detach Panda3D-tpl-rw -quiet -force")
|
|
|
+ oscmd("rm -rf Panda3D-tpl-rw")
|
|
|
if (os.path.isfile("Panda3D-%s.dmg" % VERSION)): oscmd("rm -f Panda3D-%s.dmg" % VERSION)
|
|
|
oscmd("hdiutil convert -format UDRW -o Panda3D-tpl-rw.dmg makepanda/Panda3D-tpl.dmg")
|
|
|
oscmd("mkdir Panda3D-tpl-rw")
|
|
|
@@ -3620,6 +3624,10 @@ def MakeInstallerOSX():
|
|
|
oscmd("mkdir -p Panda3D-tpl-rw/Panda3D/%s/bin" % VERSION)
|
|
|
oscmd("sed -e 's@\\$1@%s@' < direct/src/directscripts/profilepaths-osx.command >> Panda3D-tpl-rw/panda3dpaths.command" % VERSION)
|
|
|
oscmd("sed -e 's@model-cache-@# model-cache-@' -e 's@$THIS_PRC_DIR/[.][.]@/Applications/Panda3D/%s@' < built/etc/Config.prc > Panda3D-tpl-rw/Panda3D/%s/etc/Config.prc" % (VERSION, VERSION))
|
|
|
+ # Append the plugin-path to the Config.prc.
|
|
|
+ f = open("Panda3D-tpl-rw/Panda3D/%s/etc/Config.prc" % VERSION)
|
|
|
+ f.write("plugin-path /Applications/Panda3D/%s/lib\n\n" % VERSION)
|
|
|
+ f.close()
|
|
|
oscmd("cp built/etc/Confauto.prc Panda3D-tpl-rw/Panda3D/%s/etc/Confauto.prc" % VERSION)
|
|
|
oscmd("cp -R built/include Panda3D-tpl-rw/Panda3D/%s/include" % VERSION)
|
|
|
oscmd("cp -R direct Panda3D-tpl-rw/Panda3D/%s/lib/direct" % VERSION)
|
|
|
@@ -3671,4 +3679,3 @@ SaveDependencyCache()
|
|
|
WARNINGS.append("Elapsed Time: "+PrettyTime(time.time() - STARTTIME))
|
|
|
|
|
|
printStatus("Makepanda Final Status Report", WARNINGS)
|
|
|
-
|
rdb