[Bf-blender-cvs] [835fa5e] soc-2014-viewport_context: * added new headers to CMakeLists * shouldn't be a need actually to disable deprecated name mangling

[Jason Wilkins]

Commit: 835fa5e001510f4d9e2902f6c31c751f20cdaf59
Author: Jason Wilkins
Date:   Fri Aug 1 10:01:26 2014 -0500
Branches: soc-2014-viewport_context
https://developer.blender.org/rB835fa5e001510f4d9e2902f6c31c751f20cdaf59

* added new headers to CMakeLists
* shouldn't be a need actually to disable deprecated name mangling

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

M	intern/glew-mx/CMakeLists.txt
M	intern/glew-mx/glew-mx.h

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

diff --git a/intern/glew-mx/CMakeLists.txt b/intern/glew-mx/CMakeLists.txt
index 7bf9bf5..bdb3925 100644
--- a/intern/glew-mx/CMakeLists.txt
+++ b/intern/glew-mx/CMakeLists.txt
@@ -29,9 +29,11 @@ set(INC
 )
 
 set(SRC
-	glew-mx.h
-
 	intern/glew-mx.c
+
+	glew-mx.h
+	intern/gl-deprecated.h
+	intern/symbol-binding.h
 )
 
 add_definitions(${GL_DEFINITIONS})
diff --git a/intern/glew-mx/glew-mx.h b/intern/glew-mx/glew-mx.h
index 5f4ccf9..0825133 100644
--- a/intern/glew-mx/glew-mx.h
+++ b/intern/glew-mx/glew-mx.h
@@ -82,13 +82,11 @@ extern MXContext *_mx_context;
 #include "intern/symbol-binding.h"
 
 
-/* If only compiling for OpenGL 3.2 Core Profile then we should make sure
+/* If compiling only for OpenGL 3.2 Core Profile then we should make sure
  * no legacy API entries or symbolic constants are used.
  */
-#ifndef MX_NO_MANGLE_DEPRECATED
-#  if defined(WITH_GL_PROFILE_CORE) && !defined(WITH_GL_PROFILE_COMPAT) && !defined(WITH_GL_PROFILE_ES20)
-#    include "intern/gl-deprecated.h"
-#  endif
+#if defined(WITH_GL_PROFILE_CORE) && !defined(WITH_GL_PROFILE_COMPAT) && !defined(WITH_GL_PROFILE_ES20)
+#  include "intern/gl-deprecated.h"
 #endif