From 19e7de101afbbb3bf4a4f723b96cc01bc3374b56 Mon Sep 17 00:00:00 2001 From: rdb Date: Thu, 24 Dec 2009 10:27:28 +0000 Subject: [PATCH] Fixes for compile issues with static X11 and OpenCV builds --- makepanda/makepanda.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 1604246108..cdf95453f2 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -465,7 +465,7 @@ if (COMPILER=="LINUX"): # CgGL is covered by the Cg framework, and we don't need X11 components on OSX if (PkgSkip("NVIDIACG")==0 and not RUNTIME): SmartPkgEnable("CGGL", "", ("CgGL"), "Cg/cgGL.h") - SmartPkgEnable("X11", "x11", "X11", ("X11", "X11/Xlib.h")) + SmartPkgEnable("X11", ("x11", "xcb", "xau"), ("X11", "xcb", "Xau"), ("X11", "X11/Xlib.h")) if (not RUNTIME): SmartPkgEnable("XF86DGA", "xxf86dga", "Xxf86dga", "X11/extensions/xf86dga.h") @@ -2663,7 +2663,7 @@ if (not RUNTIME): # if (not RUNTIME): - OPTS=['DIR:panda/src/vision', 'BUILDING:VISION', 'ARTOOLKIT', 'OPENCV', 'DX9', 'DIRECTCAM'] + OPTS=['DIR:panda/src/vision', 'BUILDING:VISION', 'ARTOOLKIT', 'OPENCV', 'DX9', 'DIRECTCAM', 'JPEG'] TargetAdd('vision_composite1.obj', opts=OPTS, input='vision_composite1.cxx') IGATEFILES=GetDirectoryContents('panda/src/vision', ["*.h", "*_composite.cxx"]) TargetAdd('libvision.in', opts=OPTS, input=IGATEFILES)