diff options
| author | Christian König <[email protected]> | 2011-07-11 10:48:59 +0200 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-07-11 10:48:59 +0200 |
| commit | f919547f3785b1d8839b9fc5c00ac397e30896a1 (patch) | |
| tree | 910cd4fd7ffcd2781a303bb79395a0ee3c044c7d /src/gallium/targets | |
| parent | cd4f18089e44872ce9e3c04ac5e808a7204ffc49 (diff) | |
| parent | 12265d26ddc72f62de927ac24e12ab41fcd8d1c5 (diff) | |
Merge remote-tracking branch 'origin/master' into pipe-video
Conflicts:
src/gallium/drivers/r600/r600_pipe.c
src/gallium/drivers/r600/r600_state_inlines.h
Diffstat (limited to 'src/gallium/targets')
| -rw-r--r-- | src/gallium/targets/libgl-xlib/SConscript | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/gallium/targets/libgl-xlib/SConscript b/src/gallium/targets/libgl-xlib/SConscript index 7d5d9bc47a9..ad8b0992e46 100644 --- a/src/gallium/targets/libgl-xlib/SConscript +++ b/src/gallium/targets/libgl-xlib/SConscript @@ -48,14 +48,17 @@ if False: env.Append(CPPDEFINES = 'GALLIUM_CELL') env.Prepend(LIBS = [cell]) -# TODO: write a wrapper function http://www.scons.org/wiki/WrapperFunctions -libgl = env.SharedLibrary( +# libGL.so.1.5 +libgl_1_5 = env.SharedLibrary( target ='GL', source = sources, + SHLIBSUFFIX = env['SHLIBSUFFIX'] + '.1.5', ) -if False: - # XXX: Only install this libGL.so if DRI not enabled - libgl = env.InstallSharedLibrary(libgl, version=(1, 5)) +# libGL.so.1 +libgl = env.subst('${SHLIBPREFIX}GL${SHLIBSUFFIX}') +libgl_1 = libgl + '.1' +env.Command(libgl_1, libgl_1_5, "ln -sf ${SOURCE.file} ${TARGET}") +env.Command(libgl, libgl_1, "ln -sf ${SOURCE.file} ${TARGET}") env.Alias('libgl-xlib', libgl) |