On second thought, X11 should not be an optional package

This commit is contained in:
rdb 2009-09-14 12:54:36 +00:00
parent 50c7efb6d9
commit fcf50a2726

View File

@ -46,7 +46,7 @@ PkgListSet(MAYAVERSIONS + MAXVERSIONS + DXVERSIONS + [
"PYTHON","ZLIB","PNG","JPEG","TIFF","VRPN","TINYXML", "PYTHON","ZLIB","PNG","JPEG","TIFF","VRPN","TINYXML",
"FMODEX","OPENAL","NVIDIACG","OPENSSL","FREETYPE", "FMODEX","OPENAL","NVIDIACG","OPENSSL","FREETYPE",
"FFTW","ARTOOLKIT","SQUISH","ODE","DIRECTCAM","NPAPI", "FFTW","ARTOOLKIT","SQUISH","ODE","DIRECTCAM","NPAPI",
"OPENCV","FFMPEG","FCOLLADA","X11","PANDATOOL" "OPENCV","FFMPEG","FCOLLADA","PANDATOOL"
]) ])
CheckPandaSourceTree() CheckPandaSourceTree()
@ -475,7 +475,7 @@ if (COMPILER=="LINUX"):
if (PkgSkip("OPENCV")==0): LibName("OPENCV", "-lml") if (PkgSkip("OPENCV")==0): LibName("OPENCV", "-lml")
if (PkgSkip("OPENCV")==0): LibName("OPENCV", "-lcxcore") if (PkgSkip("OPENCV")==0): LibName("OPENCV", "-lcxcore")
if (PkgSkip("TINYXML")==0): LibName("TINYXML", "-ltinyxml") if (PkgSkip("TINYXML")==0): LibName("TINYXML", "-ltinyxml")
if (PkgSkip("X11")==0): LibName("X11", "-lX11") LibName("X11", "-lX11")
LibName("XF86DGA", "-lXxf86dga") LibName("XF86DGA", "-lXxf86dga")
if (sys.platform == "darwin"): if (sys.platform == "darwin"):
LibName("ALWAYS", "-framework AppKit") LibName("ALWAYS", "-framework AppKit")