Mesa (master): scons: Use only the shared object name when linking progs.
Jose Fonseca
jrfonseca at kemper.freedesktop.org
Thu Feb 4 09:25:19 UTC 2010
Module: Mesa
Branch: master
Commit: ef67ad05cb2a23e555cfbfc67faf435677fbcf73
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=ef67ad05cb2a23e555cfbfc67faf435677fbcf73
Author: José Fonseca <jfonseca at vmware.com>
Date: Thu Feb 4 09:21:00 2010 +0000
scons: Use only the shared object name when linking progs.
Otherwise the whole path gets baked into the executable.
---
progs/SConscript | 3 ++-
src/glut/glx/SConscript | 2 ++
2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/progs/SConscript b/progs/SConscript
index 66a1745..2ec95a2 100644
--- a/progs/SConscript
+++ b/progs/SConscript
@@ -23,7 +23,8 @@ if platform != 'embedded':
progs_env.Prepend(LIBS = ['GLU', 'GL'])
# Glut
- progs_env.Prepend(LIBS = [glut])
+ progs_env.Prepend(LIBPATH = [glut.dir])
+ progs_env.Prepend(LIBS = [glut.name])
# GLEW
progs_env.Prepend(LIBS = [glew])
diff --git a/src/glut/glx/SConscript b/src/glut/glx/SConscript
index 5234e6d..9363b5c 100644
--- a/src/glut/glx/SConscript
+++ b/src/glut/glx/SConscript
@@ -105,5 +105,7 @@ env.InstallSharedLibrary(glut, version=(3, 7, 1))
if env['platform'] == 'windows':
glut = env.FindIxes(glut, 'LIBPREFIX', 'LIBSUFFIX')
+else:
+ glut = env.FindIxes(glut, 'SHLIBPREFIX', 'SHLIBSUFFIX')
Export('glut')
More information about the mesa-commit
mailing list