From ef67ad05cb2a23e555cfbfc67faf435677fbcf73 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Thu, 4 Feb 2010 09:21:00 +0000 Subject: [PATCH] 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 deletion(-) diff --git a/progs/SConscript b/progs/SConscript index 66a1745271d..2ec95a282e8 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 5234e6d58ac..9363b5ca5cc 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') -- 2.30.2