From cc972778c9419cf997a66a7bed26572f5d352578 Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 15 Jul 2009 15:24:28 +0000 Subject: [PATCH] Some OSX fixes: * Linker error fixed, G++ doesn't chew "-framework Blah" in double-quotes * Default PRC path back to etc, I hope it will work --- makepanda/makepanda.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 3e71a42c93..e54c942f6c 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -487,6 +487,9 @@ printStatus("Makepanda Initial Status Report", WARNINGS) ######################################################################## def BracketNameWithQuotes(name): + # Workaround for OSX bug - compiler doesn't like quoted "-framework Blah" there. + if (name.startswith("-framework")): return name + # Account for quoted name (leave as is) but quote everything else (e.g., to protect spaces within paths from improper parsing) if (name.startswith('"') and name.endswith('"')): return name else: return '"' + name + '"' @@ -1018,8 +1021,6 @@ 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 correctly. Might have been fixed by now though. - prc_parameters["DEFAULT_PRC_DIR"] = '"/Applications/Panda3D/' + VERSION + '/etc"' if (OPTIMIZE <= 3): if (dtool_config["HAVE_NET"] != 'UNDEF'):