diff options
| author | Chia-I Wu <[email protected]> | 2011-01-15 03:15:41 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2011-01-15 12:35:22 +0800 |
| commit | b70d0a6a51da42fc390e82161a96c80fd8c653ff (patch) | |
| tree | e700924f60c8ce15be346e83e352ccbe65086183 /src/gallium | |
| parent | 6f769a690b005c054f71429423ad6ef8d1bc058c (diff) | |
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.
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | 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 25c49ea9d18..381ef4e862d 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']: |