From b594cb7dbd16bebd8ac4e989b9eb139be5cc1777 Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 28 Oct 2009 16:38:08 +0000 Subject: [PATCH] X11 is also plugin requirement --- makepanda/makepanda.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index c3ab1a353f..87fe050242 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -190,10 +190,10 @@ elif (DISTRIBUTOR == ""): if (RUNTIME): for pkg in PkgListGet(): - if pkg not in ["OPENSSL", "TINYXML", "ZLIB", "NPAPI", "JPEG", "PNG"]: + if pkg not in ["OPENSSL", "TINYXML", "ZLIB", "NPAPI", "JPEG", "X11", "PNG"]: PkgDisable(pkg) elif (PkgSkip(pkg)==1): - exit("Runtime must be compiled with OpenSSL, TinyXML, ZLib, NPAPI, JPEG and PNG support!") + exit("Runtime must be compiled with OpenSSL, TinyXML, ZLib, NPAPI, JPEG, X11 and PNG support!") if (sys.platform.startswith("win")): os.environ["BISON_SIMPLE"] = "thirdparty/win-util/bison.simple" @@ -427,12 +427,13 @@ if (COMPILER=="LINUX"): PkgEnable("WX", tool = "wx-config") if (RUNTIME): PkgEnable("NPAPI", "", (), ("xulrunner-*/stable", "xulrunner-*/stable/npapi.h", "nspr/prtypes.h", "nspr")) - if (sys.platform != "darwin" and not RUNTIME): + if (sys.platform != "darwin"): # CgGL is covered by the Cg framework, and we don't need X11 components on OSX - if (PkgSkip("NVIDIACG")==0): + if (PkgSkip("NVIDIACG")==0 and not RUNTIME): PkgEnable("CGGL", "", ("CgGL"), "Cg/cgGL.h") PkgEnable("X11", "x11", "X11", "Xlib.h") - PkgEnable("XF86DGA", "xxf86dga", "Xxf86dga", "X11/extensions/xf86dga.h") + if (not RUNTIME): + PkgEnable("XF86DGA", "xxf86dga", "Xxf86dga", "X11/extensions/xf86dga.h") for pkg in MAYAVERSIONS: if (PkgSkip(pkg)==0 and (pkg in SDK)):