mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-03 10:22:45 -04:00
X11 is also plugin requirement
This commit is contained in:
parent
1e07f44712
commit
b594cb7dbd
@ -190,10 +190,10 @@ elif (DISTRIBUTOR == ""):
|
|||||||
|
|
||||||
if (RUNTIME):
|
if (RUNTIME):
|
||||||
for pkg in PkgListGet():
|
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)
|
PkgDisable(pkg)
|
||||||
elif (PkgSkip(pkg)==1):
|
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")):
|
if (sys.platform.startswith("win")):
|
||||||
os.environ["BISON_SIMPLE"] = "thirdparty/win-util/bison.simple"
|
os.environ["BISON_SIMPLE"] = "thirdparty/win-util/bison.simple"
|
||||||
@ -427,12 +427,13 @@ if (COMPILER=="LINUX"):
|
|||||||
PkgEnable("WX", tool = "wx-config")
|
PkgEnable("WX", tool = "wx-config")
|
||||||
if (RUNTIME):
|
if (RUNTIME):
|
||||||
PkgEnable("NPAPI", "", (), ("xulrunner-*/stable", "xulrunner-*/stable/npapi.h", "nspr/prtypes.h", "nspr"))
|
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
|
# 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("CGGL", "", ("CgGL"), "Cg/cgGL.h")
|
||||||
PkgEnable("X11", "x11", "X11", "Xlib.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:
|
for pkg in MAYAVERSIONS:
|
||||||
if (PkgSkip(pkg)==0 and (pkg in SDK)):
|
if (PkgSkip(pkg)==0 and (pkg in SDK)):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user