diff options
| author | José Fonseca <jfonseca@vmware.com> | 2010-02-04 09:21:00 +0000 |
|---|---|---|
| committer | José Fonseca <jfonseca@vmware.com> | 2010-02-04 09:23:30 +0000 |
| commit | ef67ad05cb2a23e555cfbfc67faf435677fbcf73 (patch) | |
| tree | 1f7941492c144a691beabfab483af77fde6aeab1 | |
| parent | 7713069ae3ec24404d944d91614e4448b7c1a2c6 (diff) | |
scons: Use only the shared object name when linking progs.
Otherwise the whole path gets baked into the executable.
| -rw-r--r-- | progs/SConscript | 3 | ||||
| -rw-r--r-- | src/glut/glx/SConscript | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/progs/SConscript b/progs/SConscript index 66a1745271..2ec95a282e 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 5234e6d58a..9363b5ca5c 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') |