From d3212482fe6e158db71999ae84de754f908ab8fd Mon Sep 17 00:00:00 2001 From: Matt Haynie Date: Thu, 23 Apr 2020 13:58:45 -0700 Subject: [PATCH] Fix multiple macro definitions of GLFW_INCLUDE_NONE (#3157) --- examples/imgui_impl_opengl3.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/examples/imgui_impl_opengl3.cpp b/examples/imgui_impl_opengl3.cpp index bf8225d0..c60df73d 100644 --- a/examples/imgui_impl_opengl3.cpp +++ b/examples/imgui_impl_opengl3.cpp @@ -121,12 +121,16 @@ #elif defined(IMGUI_IMPL_OPENGL_LOADER_GLAD) #include // Needs to be initialized with gladLoadGL() in user's code. #elif defined(IMGUI_IMPL_OPENGL_LOADER_GLBINDING2) +#ifndef GLFW_INCLUDE_NONE #define GLFW_INCLUDE_NONE // GLFW including OpenGL headers causes ambiguity or multiple definition errors. +#endif #include // Needs to be initialized with glbinding::Binding::initialize() in user's code. #include using namespace gl; #elif defined(IMGUI_IMPL_OPENGL_LOADER_GLBINDING3) +#ifndef GLFW_INCLUDE_NONE #define GLFW_INCLUDE_NONE // GLFW including OpenGL headers causes ambiguity or multiple definition errors. +#endif #include // Needs to be initialized with glbinding::initialize() in user's code. #include using namespace gl;