1 files changed, 19 insertions, 14 deletions
diff --git a/src/glew/SConscript b/src/glew/SConscript
index b4541a7c26..330231d2c6 100644
--- a/src/glew/SConscript
+++ b/src/glew/SConscript
@@ -3,14 +3,9 @@ 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',
 ])
@@ -29,31 +24,41 @@ else:
         'X11',
     ])
 
-if env['platform'] == 'windows':
+# 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 = env.SharedLibrary(
+glew = lib_env.SharedLibrary(
     target = target,
     source = [
         'glew.c',
     ],
 )
 
-if env['platform'] == 'windows':
-    glew = env.FindIxes(glew, 'LIBPREFIX', 'LIBSUFFIX')
+if lib_env['platform'] == 'windows':
+    glew = lib_env.FindIxes(glew, 'LIBPREFIX', 'LIBSUFFIX')
 
-env = env.Clone()
+# Program specific environment settings
+prog_env = env.Clone()
 
-env.Prepend(LIBS = [glew])
+prog_env.Prepend(LIBS = [glew])
 
-env.Program(
+prog_env.Program(
     target = 'glewinfo',
     source = ['glewinfo.c'],
 )
 
-env.Program(
+prog_env.Program(
     target = 'visualinfo',
     source = ['visualinfo.c'],
 )