RomanNum3ral
/
open_toontown_panda3d
mirror of https://github.com/open-toontown/panda3d.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Some OSX fixes: 

* Linker error fixed, G++ doesn't chew "-framework Blah" in double-quotes
 * Default PRC path back to <auto>etc, I hope it will work
This commit is contained in:
rdb 2009-07-15 15:24:28 +00:00
parent d2a4c55dc7
commit cc972778c9
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
makepanda/makepanda.py
View File

@ -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 <auto> 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'):