diff options
author | Michal Krol <michal@vmware.com> | 2010-01-05 11:04:50 +0100 |
---|---|---|
committer | Michal Krol <michal@vmware.com> | 2010-01-05 11:04:50 +0100 |
commit | 9b21b3c52a8a7d58d08151d1a6bf25c472dec213 (patch) | |
tree | d9083b6af4e2e9b70a7fa6cd31bac45a36e0f6b6 /src/glew | |
parent | 543b9566bdaa48fea2df1866fa1310c1cdbcde27 (diff) | |
parent | 1f9aa38f4e2be47229d92be2c1189c2b8d9c7133 (diff) |
Merge branch 'master' into instanced-arrays
Conflicts:
src/gallium/auxiliary/tgsi/tgsi_dump.c
src/gallium/include/pipe/p_shader_tokens.h
Diffstat (limited to 'src/glew')
-rw-r--r-- | src/glew/SConscript | 57 |
1 files changed, 36 insertions, 21 deletions
diff --git a/src/glew/SConscript b/src/glew/SConscript index 1161be6e63..1d7dbb9b78 100644 --- a/src/glew/SConscript +++ b/src/glew/SConscript @@ -1,29 +1,12 @@ Import('*') -if env['platform'] not in ['windows', 'linux']: - Return() - +# Shared environment settings env = env.Clone() -env.Append(CPPDEFINES = [ - 'GLEW_BUILD', - 'GLEW_STATIC', - #'GLEW_MX', # Multiple Rendering Contexts support -]) - env.PrependUnique(CPPPATH = [ '#/include', ]) -glew = env.StaticLibrary( - target = 'glew', - source = [ - 'glew.c', - ], -) - -env = env.Clone() - if env['platform'] == 'windows': env.PrependUnique(LIBS = [ 'glu32', @@ -37,14 +20,46 @@ else: 'GL', 'X11', ]) -env.Prepend(LIBS = [glew]) -env.Program( +# Library specific environment settings +lib_env = env.Clone() + +lib_env.Append(CPPDEFINES = [ + 'GLEW_BUILD', + #'GLEW_STATIC', + #'GLEW_MX', # Multiple Rendering Contexts support +]) + +if lib_env['platform'] == 'windows': + target = 'glew' +else: + target = 'GLEW' + +glew = lib_env.SharedLibrary( + target = target, + source = [ + 'glew.c', + ], +) + +env.InstallSharedLibrary(glew, version=(1, 5)) + +if lib_env['platform'] == 'windows': + glew = lib_env.FindIxes(glew, 'LIBPREFIX', 'LIBSUFFIX') + +# Program specific environment settings +prog_env = env.Clone() + +prog_env.Prepend(LIBS = [glew]) + +prog_env.Program( target = 'glewinfo', source = ['glewinfo.c'], ) -env.Program( +prog_env.Program( target = 'visualinfo', source = ['visualinfo.c'], ) + +Export('glew') |