summaryrefslogtreecommitdiff
path: root/src/gallium/targets/egl-static/SConscript
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2011-06-30 17:36:37 +0100
committerJosé Fonseca <jfonseca@vmware.com>2011-06-30 17:36:37 +0100
commit235225ec935002b4669d14a48c9c20864a5496f8 (patch)
tree5c86cb6b91f65605a6e5d1a4c727a35f96516664 /src/gallium/targets/egl-static/SConscript
parent2699fce0d69db5158427c8b6c8194b2eefc5e58b (diff)
scons: Expose pkg-config in a simpler manner.
Diffstat (limited to 'src/gallium/targets/egl-static/SConscript')
-rw-r--r--src/gallium/targets/egl-static/SConscript16
1 files changed, 6 insertions, 10 deletions
diff --git a/src/gallium/targets/egl-static/SConscript b/src/gallium/targets/egl-static/SConscript
index cbd98cc416a..dfd05437231 100644
--- a/src/gallium/targets/egl-static/SConscript
+++ b/src/gallium/targets/egl-static/SConscript
@@ -79,21 +79,17 @@ if True:
openvg_name = 'OpenVG' if env['platform'] != 'windows' else 'libOpenVG'
env.Prepend(LIBS = [openvg_name, st_vega])
-if env['x11']:
+if env['HAVE_X11']:
env.Prepend(LIBS = [
ws_xlib,
- env['X11_LIBS'],
])
-
-if env['dri']:
- env.ParseConfig('pkg-config --cflags --libs xfixes')
+ env.PkgUseModules('X11')
# pipe drivers
-if env['drm']:
- env.ParseConfig('pkg-config --cflags --libs libdrm')
+if env['HAVE_DRM']:
+ env.PkgUseModules('DRM')
- if env['drm_intel']:
- env.ParseConfig('pkg-config --cflags --libs libdrm_intel')
+ if env['HAVE_DRM_INTEL']:
env.Append(CPPDEFINES = ['_EGL_PIPE_I915', '_EGL_PIPE_I965'])
env.Prepend(LIBS = [
i915drm,
@@ -103,7 +99,7 @@ if env['drm']:
ws_wrapper,
])
- if env['drm_radeon']:
+ if env['HAVE_DRM_RADEON']:
env.Append(CPPDEFINES = ['_EGL_PIPE_R300', '_EGL_PIPE_R600'])
env.Prepend(LIBS = [
radeonwinsys,