[Bf-blender-cvs] [94789e30a58] blender2.8: Gawain: fix building WITH_GL_PROFILE_CORE
Mike Erwin
noreply at git.blender.org
Tue Apr 18 21:09:35 CEST 2017
Commit: 94789e30a587fc1ed834bc2a2a80295edd72ac5c
Author: Mike Erwin
Date: Tue Apr 18 14:51:42 2017 -0400
Branches: blender2.8
https://developer.blender.org/rB94789e30a587fc1ed834bc2a2a80295edd72ac5c
Gawain: fix building WITH_GL_PROFILE_CORE
I intially hard-coded this for compatibility profile. This commit makes the library respect the main CMake options so they match the rest of Blender.
===================================================================
M intern/gawain/CMakeLists.txt
===================================================================
diff --git a/intern/gawain/CMakeLists.txt b/intern/gawain/CMakeLists.txt
index 99adab851c7..bce0b1d4c3c 100644
--- a/intern/gawain/CMakeLists.txt
+++ b/intern/gawain/CMakeLists.txt
@@ -29,6 +29,11 @@ set(SRC
)
# remove this when we switch to core profile
-add_definitions(-DWITH_GL_PROFILE_COMPAT)
+if(WITH_GL_PROFILE_COMPAT)
+ add_definitions(-DWITH_GL_PROFILE_COMPAT)
+ add_definitions(-DWITH_OPENGL_LEGACY)
+else()
+ add_definitions(-DWITH_GL_PROFILE_CORE)
+endif()
blender_add_lib(bf_intern_gawain "${SRC}" "${INC}" "${INC_SYS}")
More information about the Bf-blender-cvs
mailing list