scons: Use only the shared object name when linking progs.

Otherwise the whole path gets baked into the executable.

diff --git a/progs/SConscript b/progs/SConscript
index 66a1745271d8c5767760760078cfb2392a74b089..2ec95a282e86fc4c96f3a768d613a257e28eeb19 100644 (file)
--- 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 5234e6d58ac2f4deb6625a5d5a1108b7baf351c9..9363b5ca5ccbc5c6e84791e00f6903121c954d1e 100644 (file)
--- 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')