group WITH_LEGACY_OPENGL with the other GL options

Blender subsystems that care about OpenGL use GL_DEFINITIONS, which now includes the newest (temporary) WITH_LEGACY_OPENGL.

Also updated Gawain's CMake to use this instead of its own logic.
This commit is contained in:
Mike Erwin
2017-04-24 17:41:26 -04:00
parent 0f143627d2
commit 9c87bb124a
2 changed files with 5 additions and 7 deletions

View File

@@ -1074,6 +1074,10 @@ if(WITH_GL_EGL)
endif()
if(WITH_LEGACY_OPENGL)
list(APPEND GL_DEFINITIONS -DWITH_LEGACY_OPENGL)
endif()
if(WITH_GL_PROFILE_COMPAT)
list(APPEND GL_DEFINITIONS -DWITH_GL_PROFILE_COMPAT)
endif()

View File

@@ -28,12 +28,6 @@ set(SRC
gawain/vertex_format.h
)
# remove this when we switch to core profile
if(WITH_GL_PROFILE_COMPAT)
add_definitions(-DWITH_GL_PROFILE_COMPAT)
add_definitions(-DWITH_OPENGL_LEGACY)
else()
add_definitions(-DWITH_GL_PROFILE_CORE)
endif()
add_definitions(${GL_DEFINITIONS})
blender_add_lib(bf_intern_gawain "${SRC}" "${INC}" "${INC_SYS}")