diff --git a/imgui/src/gl3w/gl3w.c b/imgui/src/gl3w/gl3w.c index 8651bef..dc445cf 100644 --- a/imgui/src/gl3w/gl3w.c +++ b/imgui/src/gl3w/gl3w.c @@ -26,7 +26,7 @@ * OTHER DEALINGS IN THE SOFTWARE. */ -#if defined(DM_PLATFORM_WINDOWS) || defined(DM_PLATFORM_LINUX) +#if defined(DM_PLATFORM_WINDOWS) || defined(DM_PLATFORM_LINUX) || defined(DM_PLATFORM_OSX) #include #include diff --git a/imgui/src/imgui/imconfig.h b/imgui/src/imgui/imconfig.h index aa2cd37..04bf614 100644 --- a/imgui/src/imgui/imconfig.h +++ b/imgui/src/imgui/imconfig.h @@ -15,18 +15,26 @@ #pragma once #if defined(DM_PLATFORM_HTML5) -#define IMGUI_IMPL_OPENGL_ES2 -#undef GL_ES_VERSION_2_0 + #define IMGUI_IMPL_OPENGL_ES2 + #undef GL_ES_VERSION_2_0 + #elif defined(DM_PLATFORM_WINDOWS) -#define IMGUI_IMPL_OPENGL_LOADER_GL3W + #define IMGUI_IMPL_OPENGL_LOADER_GL3W + #elif defined(DM_PLATFORM_LINUX) -#define IMGUI_IMPL_OPENGL_LOADER_GL3W + #define IMGUI_IMPL_OPENGL_LOADER_GL3W + +#elif defined(DM_PLATFORM_OSX) + #define IMGUI_IMPL_OPENGL_LOADER_GL3W + #elif defined(DM_PLATFORM_ANDROID) -#define IMGUI_IMPL_OPENGL_ES2 + #define IMGUI_IMPL_OPENGL_ES2 + #elif defined(DM_PLATFORM_IOS) -// autodetect in imgui_impl_opengl3.h + // autodetect in imgui_impl_opengl3.h + #else -#define IMGUI_IMPL_OPENGL_LOADER_CUSTOM "dummy_loader.h" + #define IMGUI_IMPL_OPENGL_LOADER_CUSTOM "dummy_loader.h" #endif