Mesa (master): targets/egl-static: Assorted cleanups and fixes.
Chia-I Wu
olv at kemper.freedesktop.org
Sat Jan 15 05:21:12 UTC 2011
Module: Mesa
Branch: master
Commit: b70d0a6a51da42fc390e82161a96c80fd8c653ff
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b70d0a6a51da42fc390e82161a96c80fd8c653ff
Author: Chia-I Wu <olv at lunarg.com>
Date: Sat Jan 15 03:15:41 2011 +0800
targets/egl-static: Assorted cleanups and fixes.
Share more code between windows and non-windows platforms. Check
env['x11'] for X11 and add env['X11_LIBS'] to LIBS. Add ws_wrapper for
i965g.
---
src/gallium/targets/egl-static/SConscript | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/gallium/targets/egl-static/SConscript b/src/gallium/targets/egl-static/SConscript
index 25c49ea..381ef4e 100644
--- a/src/gallium/targets/egl-static/SConscript
+++ b/src/gallium/targets/egl-static/SConscript
@@ -32,6 +32,7 @@ env.Prepend(LIBS = [
galahad,
gallium,
egl,
+ st_egl,
])
if env['llvm']:
@@ -55,28 +56,26 @@ if env['platform'] == 'windows':
])
env.Prepend(LIBS = [
- st_egl,
ws_gdi,
])
-
- # OpenVG
- env.Append(CPPDEFINES = ['FEATURE_VG=1'])
- env.Prepend(LIBS = [openvg, st_vega])
else:
- env.Prepend(LIBS = [
- st_egl,
- ws_xlib,
- ])
-
# OpenGL
env.Append(CPPDEFINES = ['FEATURE_GL=1'])
env.Prepend(LIBS = ['GL', 'talloc', glsl, mesa])
- # OpenVG
+# OpenVG
+if True:
env.Append(CPPDEFINES = ['FEATURE_VG=1'])
env.Prepend(LIBPATH = [openvg.dir])
- env.Prepend(LIBS = ['OpenVG', st_vega])
+ # manually add LIBPREFIX on windows
+ openvg_name = 'OpenVG' if env['platform'] != 'windows' else 'libOpenVG'
+ env.Prepend(LIBS = [openvg_name, st_vega])
+if env['x11']:
+ env.Prepend(LIBS = [
+ ws_xlib,
+ env['X11_LIBS'],
+ ])
if env['dri']:
env.ParseConfig('pkg-config --cflags --libs xfixes')
@@ -93,6 +92,7 @@ if env['drm']:
i915,
i965drm,
i965,
+ ws_wrapper,
])
if env['drm_radeon']:
More information about the mesa-commit
mailing list