From: José Fonseca Date: Fri, 8 Jan 2010 00:33:58 +0000 (+0000) Subject: scons: Use static glew library on Unices to avoid binary compatability issues X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=de22c940a1df66d13825dd15c015eafabb61a11d;p=mesa.git scons: Use static glew library on Unices to avoid binary compatability issues Fixes bug 25926. --- diff --git a/src/glew/SConscript b/src/glew/SConscript index a49e2da5b1c..ce6e71e1570 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()