[Bf-blender-cvs] [9add165] soc-2014-viewport_context: Add glew-mx defines

Campbell Barton noreply at git.blender.org
Sun Jul 27 19:17:13 CEST 2014


Commit: 9add1653736ca91e658c0db4d83db8fd98a6a1b2
Author: Campbell Barton
Date:   Mon Jul 28 03:16:51 2014 +1000
Branches: soc-2014-viewport_context
https://developer.blender.org/rB9add1653736ca91e658c0db4d83db8fd98a6a1b2

Add glew-mx defines

===================================================================

M	extern/glew-es/CMakeLists.txt
M	extern/glew-es/SConscript
M	extern/glew/CMakeLists.txt
M	extern/glew/SConscript

===================================================================

diff --git a/extern/glew-es/CMakeLists.txt b/extern/glew-es/CMakeLists.txt
index ea25425..ba80d3f 100644
--- a/extern/glew-es/CMakeLists.txt
+++ b/extern/glew-es/CMakeLists.txt
@@ -49,4 +49,9 @@ set(SRC
 
 add_definitions(${GL_DEFINITIONS})
 
+if(WITH_GLEW_MX)
+	add_definitions(-DGLEW_MX)
+endif()
+
+
 blender_add_lib(extern_glew_es "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/extern/glew-es/SConscript b/extern/glew-es/SConscript
index 078bedb..b7c713c 100644
--- a/extern/glew-es/SConscript
+++ b/extern/glew-es/SConscript
@@ -7,6 +7,8 @@ Import('env')
 sources = ['src/glew.c']
 
 defs = env['BF_GL_DEFINITIONS']
+if env['WITH_BF_GLEW_MX']:
+    defs += ['GLEW_MX']
 incs = ['include']
 
 env.BlenderLib ( 'extern_glew_es', sources, incs, defs, libtype=['extern','player'], priority=[50,230] )
diff --git a/extern/glew/CMakeLists.txt b/extern/glew/CMakeLists.txt
index 1ddaf63..f264b39 100644
--- a/extern/glew/CMakeLists.txt
+++ b/extern/glew/CMakeLists.txt
@@ -47,4 +47,8 @@ set(SRC
 
 add_definitions(${GL_DEFINITIONS})
 
+if(WITH_GLEW_MX)
+	add_definitions(-DGLEW_MX)
+endif()
+
 blender_add_lib(extern_glew "${SRC}" "${INC}" "${INC_SYS}")
diff --git a/extern/glew/SConscript b/extern/glew/SConscript
index 5f521a3..d825968 100644
--- a/extern/glew/SConscript
+++ b/extern/glew/SConscript
@@ -7,6 +7,9 @@ Import('env')
 sources = ['src/glew.c']
 
 defs = env['BF_GL_DEFINITIONS']
+if env['WITH_BF_GLEW_MX']:
+    defs += ['GLEW_MX']
+
 incs = ['include']
 
 env.BlenderLib ( 'extern_glew', sources, incs, defs, libtype=['extern','player'], priority=[50,230] )




More information about the Bf-blender-cvs mailing list