From a84218485d629c925d5136674a1a129fa2e04ae3 Mon Sep 17 00:00:00 2001 From: rdb Date: Sat, 18 Apr 2009 10:32:28 +0000 Subject: [PATCH] pulling in 1.10.2.2: Better support for Maya on OSX --- makepanda/makepanda.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 3e4d91c32d..6024c00a27 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -328,7 +328,12 @@ if (COMPILER=="LINUX"): for pkg in MAYAVERSIONS: if (PkgSkip(pkg)==0): - LibDirectory(pkg, SDK[pkg] + '/lib') + # On OSX, the dir *can* be named 'MacOS' instead of 'lib'. + if (sys.platform == "darwin"): + if (os.path.isdir(SDK[pkg] + "/lib")): LibDirectory(pkg, SDK[pkg] + "/lib") + if (os.path.isdir(SDK[pkg] + "/MacOS")): LibDirectory(pkg, SDK[pkg] + "/MacOS") + else: + LibDirectory(pkg, SDK[pkg] + "/lib") IncDirectory(pkg, SDK[pkg] + "/include") DefSymbol(pkg, "MAYAVERSION", pkg)