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

OSX mesa dependency issue, and some changes for 10.6 too

This commit is contained in:
rdb 2009-08-31 19:16:49 +00:00
parent 912f533e1e
commit 6b8b843438
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
makepanda/makepanda.py
View File

@ -478,7 +478,6 @@ if (COMPILER=="LINUX"):
LibName("CARBON", "-framework Carbon")
LibName("COCOA", "-framework Cocoa")
LibName("GLUT", "-framework OpenGL")
LibName("GLUT", "-lOSMesa")
# Fix for a bug in OSX:
LibName("GLUT", "-dylib_file /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib")
else:
@ -610,8 +609,11 @@ def CompileCxx(obj,src,opts):
if (opt=="ALWAYS") or (opts.count(opt)): cmd += ' -D' + var + '=' + val
for x in ipath: cmd += ' -I' + x
if (sys.platform == "darwin"):
cmd += " -isysroot " + SDK["MACOSX"] + " -arch i386"
if ("NOPPC" not in opts): cmd += " -arch ppc"
if (int(platform.mac_ver()[0][3]) >= 6):
cmd += " -isysroot " + SDK["MACOSX"] + " -arch x86_64"
else:
cmd += " -isysroot " + SDK["MACOSX"] + " -arch i386"
if ("NOPPC" not in opts): cmd += " -arch ppc"
optlevel = GetOptimizeOption(opts)
if (optlevel==1): cmd += " -g -D_DEBUG"
if (optlevel==2): cmd += " -O1 -D_DEBUG"

4
makepanda/makepandacore.py
View File

@ -966,7 +966,9 @@ def SdkLocateMSPlatform():
def SdkLocateMacOSX():
if (sys.platform != "darwin"): return
if (os.path.exists("/Developer/SDKs/MacOSX10.5.sdk")):
if (os.path.exists("/Developer/SDKs/MacOSX10.6.sdk")):
SDK["MACOSX"] = "/Developer/SDKs/MacOSX10.6.sdk"
elif (os.path.exists("/Developer/SDKs/MacOSX10.5.sdk")):
SDK["MACOSX"] = "/Developer/SDKs/MacOSX10.5.sdk"
elif (os.path.exists("/Developer/SDKs/MacOSX10.4u.sdk")):
SDK["MACOSX"] = "/Developer/SDKs/MacOSX10.4u.sdk"