Mesa (master): scons: Use static glew library on Unices to avoid binary compatability issues

Jose Fonseca jrfonseca at kemper.freedesktop.org
Fri Jan 8 00:34:36 UTC 2010


Module: Mesa
Branch: master
Commit: de22c940a1df66d13825dd15c015eafabb61a11d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=de22c940a1df66d13825dd15c015eafabb61a11d

Author: José Fonseca <jfonseca at vmware.com>
Date:   Fri Jan  8 00:33:58 2010 +0000

scons: Use static glew library on Unices to avoid binary compatability issues

Fixes bug 25926.

---

 src/glew/SConscript |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/glew/SConscript b/src/glew/SConscript
index a49e2da..ce6e71e 100644
--- a/src/glew/SConscript
+++ b/src/glew/SConscript
@@ -26,7 +26,6 @@ lib_env = env.Clone()
 
 lib_env.Append(CPPDEFINES = [
     'GLEW_BUILD',
-    #'GLEW_STATIC',
     #'GLEW_MX', # Multiple Rendering Contexts support
 ])
 
@@ -35,17 +34,18 @@ if lib_env['platform'] == 'windows':
 else:
     target = 'GLEW'
 
-glew = lib_env.SharedLibrary(
-    target = target,
-    source = [
-        'glew.c',
-    ],
-)
-
-env.InstallSharedLibrary(glew, version=(1, 5, 2))
+source = [
+    'glew.c',
+]
 
 if lib_env['platform'] == 'windows':
+    glew = lib_env.SharedLibrary(target = target, source = source) 
+    env.InstallSharedLibrary(glew, version=(1, 5, 2))
     glew = lib_env.FindIxes(glew, 'LIBPREFIX', 'LIBSUFFIX')
+else:
+    # Use static library on Unices to avoid binary compatability issues
+    lib_env.Append(CPPDEFINES = ['GLEW_STATIC'])
+    glew = lib_env.StaticLibrary(target = target, source = source) 
 
 # Program specific environment settings
 prog_env = env.Clone()




More information about the mesa-commit mailing list