projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
r300g: remove one flush
[mesa.git]
/
src
/
glew
/
SConscript
diff --git
a/src/glew/SConscript
b/src/glew/SConscript
index 1d7dbb9b78f96d43bbc9c6fe8d00a5954e508ec3..4b5b5b8d0ffaff92dcde952a0069cc45df55d690 100644
(file)
--- a/
src/glew/SConscript
+++ b/
src/glew/SConscript
@@
-15,6
+15,7
@@
if env['platform'] == 'windows':
'user32',
])
else:
'user32',
])
else:
+ env.Tool('x11')
env.PrependUnique(LIBS = [
'GLU',
'GL',
env.PrependUnique(LIBS = [
'GLU',
'GL',
@@
-26,7
+27,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,23
+35,27
@@
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))
+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()
prog_env.Prepend(LIBS = [glew])
# Program specific environment settings
prog_env = env.Clone()
prog_env.Prepend(LIBS = [glew])
+if prog_env['platform'] == 'darwin':
+ prog_env.Append(FRAMEWORKS = ['AGL'])
+
prog_env.Program(
target = 'glewinfo',
source = ['glewinfo.c'],
prog_env.Program(
target = 'glewinfo',
source = ['glewinfo.c'],