summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2010-01-08 00:33:58 +0000
committerJosé Fonseca <jfonseca@vmware.com>2010-01-08 00:33:58 +0000
commitde22c940a1df66d13825dd15c015eafabb61a11d (patch)
tree1638901ebb987f620b2e92e228da1bee4f082ebd
parent45fe1d7d008375b2e0ba255e42f0731a3dbd6a46 (diff)
scons: Use static glew library on Unices to avoid binary compatability issues
Fixes bug 25926.
-rw-r--r--src/glew/SConscript18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/glew/SConscript b/src/glew/SConscript
index a49e2da5b1..ce6e71e157 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()