Remove deprecated MAC_OS definition

cginternals · Nov 26, 2014 · aced1ad · aced1ad
1 parent fe57f93
commit aced1ad
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/cmake/PlatformMacOS.cmake b/cmake/PlatformMacOS.cmake
@@ -25,7 +25,7 @@ set(CMAKE_XCODE_ATTRIBUTE_CLANG_CXX_LIBRARY "libc++")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -stdlib=libc++ -g -Wall")
 
 
-set(MACOS_COMPILE_DEFS MAC_OS)
+set(MACOS_COMPILE_DEFS)
 set(DEFAULT_COMPILE_DEFS_DEBUG   ${MACOS_COMPILE_DEFS} _DEBUG) # Debug build
 set(DEFAULT_COMPILE_DEFS_RELEASE ${MACOS_COMPILE_DEFS} NDEBUG) # Release build
 

diff --git a/source/examples/common/Context.cpp b/source/examples/common/Context.cpp
@@ -64,7 +64,7 @@ glbinding::Version Context::maxSupportedVersion()
 
     glfwWindowHint(GLFW_VISIBLE, false);
 
-#ifdef MAC_OS
+#ifdef __APPLE__
     /*
     * Using OS X the following hints must be set for proper context initialization
     * (cf. http://stackoverflow.com/questions/19969937/getting-a-glsl-330-context-on-osx-10-9-mavericks)
@@ -114,7 +114,7 @@ GLFWwindow * Context::create(
     glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, version.m_major);
     glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, version.m_minor);
 
-#ifdef MAC_OS
+#ifdef __APPLE__
 
     glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, true);
     glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);

diff --git a/source/examples/common/ContextFormat.cpp b/source/examples/common/ContextFormat.cpp
@@ -48,7 +48,7 @@ glbinding::Version ContextFormat::validateVersion(
     const glbinding::Version & requestedVersion
 ,   const glbinding::Version & supportedMaximumVersion)
 {
-#ifdef MAC_OS
+#ifdef __APPLE__
     return glbinding::Version(3, 2);
 #endif
 

diff --git a/source/examples/common/WindowEventHandler.cpp b/source/examples/common/WindowEventHandler.cpp
@@ -107,7 +107,7 @@ void WindowEventHandler::initialize(Window &)
     init();
     DebugMessage::enable();
 
-#ifdef MAC_OS
+#ifdef __APPLE__
     Shader::clearGlobalReplacements();
     Shader::globalReplace("#version 130", "#version 150");
     Shader::globalReplace("#version 140", "#version 150");

diff --git a/source/examples/qt-example/main.cpp b/source/examples/qt-example/main.cpp
@@ -81,7 +81,7 @@ class Window : public WindowQt, AbstractCoordinateProvider
             << "OpenGL Vendor:   " << glbinding::ContextInfo::vendor() << std::endl
             << "OpenGL Renderer: " << glbinding::ContextInfo::renderer() << std::endl << std::endl;
 
-#ifdef MAC_OS
+#ifdef __APPLE__
         Shader::clearGlobalReplacements();
         Shader::globalReplace("#version 130", "#version 150");
         Shader::globalReplace("#version 140", "#version 150");
@@ -262,7 +262,7 @@ int main(int argc, char * argv[])
     QApplication app(argc, argv);
 
     QSurfaceFormat format;
-#ifdef MAC_OS
+#ifdef __APPLE__
     format.setVersion(3, 2);
     format.setProfile(QSurfaceFormat::CoreProfile);
 #else