projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
45fe1d7
)
scons: Use static glew library on Unices to avoid binary compatability issues
author
José Fonseca
<jfonseca@vmware.com>
Fri, 8 Jan 2010 00:33:58 +0000
(
00:33
+0000)
committer
José Fonseca
<jfonseca@vmware.com>
Fri, 8 Jan 2010 00:33:58 +0000
(
00:33
+0000)
Fixes bug 25926.
src/glew/SConscript
patch
|
blob
|
history
diff --git
a/src/glew/SConscript
b/src/glew/SConscript
index a49e2da5b1c2fa628b9eac2fb480b0d5f780c3f4..ce6e71e1570751ecd40f6e018af3b13d7818fa48 100644
(file)
--- a/
src/glew/SConscript
+++ b/
src/glew/SConscript
@@
-26,7
+26,6
@@
lib_env = env.Clone()
lib_env.Append(CPPDEFINES = [
'GLEW_BUILD',
lib_env.Append(CPPDEFINES = [
'GLEW_BUILD',
- #'GLEW_STATIC',
#'GLEW_MX', # Multiple Rendering Contexts support
])
#'GLEW_MX', # Multiple Rendering Contexts support
])
@@
-35,17
+34,18
@@
if lib_env['platform'] == 'windows':
else:
target = 'GLEW'
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':
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')
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()
# Program specific environment settings
prog_env = env.Clone()