From 91056337a8e6a608c71aa1d8e73954882d21d308 Mon Sep 17 00:00:00 2001 From: Dalai Felinto Date: Mon, 10 Apr 2017 08:30:09 +0200 Subject: Add stubs to build WITH_GL_PROFILE_CORE This is an auto-generated list, crossing gl-deprecated.h, glew.h and the Blender code. It allows Blender to build with core profile. WITH_OPENGL_LEGACY=ON: nothing changes WITH_OPENGL_LEGACY=OFF and WITH_GL_PROFILE_CORE=OFF: It stubs deprecated legacy calls. WITH_OPENGL_LEGACY=OFF and WITH_GL_PROFILE_CORE=ON: It stubs deprecated legacy calls thus allowing Blender to build with core profile only. Technically you only want to use WITH_OPENGL_LEGACY=OFF when WITH_GL_PROFILE_CORE=ON. But it doesn't hurt to have it working for both scenarios. Reviewed by: merwin Differential Revision: https://developer.blender.org/D2610 --- intern/glew-mx/glew-mx.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'intern/glew-mx') diff --git a/intern/glew-mx/glew-mx.h b/intern/glew-mx/glew-mx.h index ed17ea4a0e6..813e95958b5 100644 --- a/intern/glew-mx/glew-mx.h +++ b/intern/glew-mx/glew-mx.h @@ -85,7 +85,7 @@ extern MXContext *_mx_context; /* If compiling only for OpenGL 3.2 Core Profile then we should make sure * no legacy API entries or symbolic constants are used. */ -#if defined(WITH_GL_PROFILE_CORE) && !defined(WITH_GL_PROFILE_COMPAT) && !defined(WITH_GL_PROFILE_ES20) +#if (!defined(WITH_LEGACY_OPENGL)) || defined(WITH_GL_PROFILE_CORE) && !defined(WITH_GL_PROFILE_COMPAT) && !defined(WITH_GL_PROFILE_ES20) # include "intern/gl-deprecated.h" #endif -- cgit v1.2.3