From 169e3981fdf037b179f1c7296548892ba7837dae Mon Sep 17 00:00:00 2001 From: omar Date: Mon, 11 Feb 2019 19:09:54 +0100 Subject: [PATCH] Examples: OpenGL2: Added #define GL_SILENCE_DEPRECATION to cope with newer XCode warnings. --- docs/CHANGELOG.txt | 1 + examples/example_glfw_opengl2/main.cpp | 3 +++ examples/imgui_impl_opengl2.cpp | 1 + 3 files changed, 5 insertions(+) diff --git a/docs/CHANGELOG.txt b/docs/CHANGELOG.txt index c8dbff1c..91436fae 100644 --- a/docs/CHANGELOG.txt +++ b/docs/CHANGELOG.txt @@ -81,6 +81,7 @@ Other Changes: - Examples: Win32: Added support for XInput games (if ImGuiConfigFlags_NavEnableGamepad is enabled). - Examples: Win32: Added support for mouse buttons 4 and 5 via WM_XBUTTON* messages. (#2264) - Examples: DirectX9: Explicitly disable fog (D3DRS_FOGENABLE) before drawing in case user state has it set. (#2288, #2230) +- Examples: OpenGL2: Added #define GL_SILENCE_DEPRECATION to cope with newer XCode warnings. - Examples: OpenGL3: Using GLSL 4.10 shaders for any GLSL version over 410 (e.g. 430, 450). (#2329) [@BrutPitt] diff --git a/examples/example_glfw_opengl2/main.cpp b/examples/example_glfw_opengl2/main.cpp index eae7ed78..08463713 100644 --- a/examples/example_glfw_opengl2/main.cpp +++ b/examples/example_glfw_opengl2/main.cpp @@ -10,6 +10,9 @@ #include "imgui_impl_glfw.h" #include "imgui_impl_opengl2.h" #include +#ifdef __APPLE__ +#define GL_SILENCE_DEPRECATION +#endif #include // [Win32] Our example includes a copy of glfw3.lib pre-compiled with VS2010 to maximize ease of testing and compatibility with old VS compilers. diff --git a/examples/imgui_impl_opengl2.cpp b/examples/imgui_impl_opengl2.cpp index 99ca9690..5acccc08 100644 --- a/examples/imgui_impl_opengl2.cpp +++ b/examples/imgui_impl_opengl2.cpp @@ -44,6 +44,7 @@ #define WINGDIAPI __declspec(dllimport) // Some Windows OpenGL headers need this #endif #if defined(__APPLE__) +#define GL_SILENCE_DEPRECATION #include #else #include