From a76d9682b4a5f22e92d11773ceaf0617e544af3f Mon Sep 17 00:00:00 2001 From: rdb Date: Tue, 22 Sep 2009 17:27:04 +0000 Subject: [PATCH] CgGL is in the Cg framework on OSX --- makepanda/makepanda.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index e3f09b4329..4c24138c22 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -386,7 +386,6 @@ if (COMPILER=="LINUX"): # Name pkg-config libs, include(dir)s PkgEnable("ARTOOLKIT", "", ("AR"), "AR/ar.h") - PkgEnable("CGGL", "", ("CgGL"), "Cg/cgGL.h", framework = "CgGL") PkgEnable("FCOLLADA", "", ("FCollada"), "FCollada.h") PkgEnable("FFMPEG", ffmpeg_libs, ffmpeg_libs, ffmpeg_libs) PkgEnable("FFTW", "", ("fftw", "rfftw"), ("fftw.h", "rfftw.h")) @@ -411,7 +410,9 @@ if (COMPILER=="LINUX"): PkgEnable("NPAPI", "", (), ("xulrunner-*/stable", "xulrunner-*/stable/npapi.h")) PkgEnable("WX", tool = "wx-config") if (sys.platform != "darwin"): - PkgEnable("X11", "x11", "X11", "Xlib.h") + # CgGL is covered by the Cg framework, and we don't need X11 components on OSX + PkgEnable("CGGL", "", ("CgGL"), "Cg/cgGL.h", framework = "CgGL") + PkgEnable("X11", "x11", "X11", "Xlib.h") PkgEnable("XF86DGA", "xxf86dga", "Xxf86dga", "X11/extensions/xf86dga.h") for pkg in MAYAVERSIONS: