commit 81f70e5b7c0267cf142ece59f7c11325ee55348d
author Andrew Willmott <awillmott+git@gmail.com> Tue Apr 02 12:47:14 2019 +0100
committer omar <ocornut@users.noreply.github.com> Wed Apr 03 07:19:31 2019 -0700
tree 9d44d592e9d56050e4fc57e0626ba74bbff36fa5
parent a402f5b9a95e39aa287765409569ab255a22796c

Fixups for OSX

examples/example_freeglut_opengl2/main.cpp

diff --git a/examples/example_freeglut_opengl2/main.cpp b/examples/example_freeglut_opengl2/main.cpp
index c52dfe2..f62c36d 100644
--- a/examples/example_freeglut_opengl2/main.cpp
+++ b/examples/example_freeglut_opengl2/main.cpp
@@ -7,7 +7,11 @@
 #include "imgui.h"
 #include "../imgui_impl_freeglut.h"
 #include "../imgui_impl_opengl2.h"
-#include <GL/freeglut.h>
+#ifdef __APPLE__
+    #include <GLUT/glut.h>
+#else
+    #include <GL/freeglut.h>
+#endif
 
 #ifdef _MSC_VER
 #pragma warning (disable: 4505) // unreferenced local function has been removed
@@ -87,7 +91,9 @@
 {
     // Create GLUT window
     glutInit(&argc, argv);
+#ifndef __APPLE__
     glutSetOption(GLUT_ACTION_ON_WINDOW_CLOSE, GLUT_ACTION_GLUTMAINLOOP_RETURNS);
+#endif
     glutInitDisplayMode(GLUT_RGBA | GLUT_DOUBLE | GLUT_MULTISAMPLE);
     glutInitWindowSize(1280, 720);
     glutCreateWindow("Dear ImGui FreeGLUT+OpenGL2 Example");

examples/imgui_impl_freeglut.cpp

diff --git a/examples/imgui_impl_freeglut.cpp b/examples/imgui_impl_freeglut.cpp
index 32671a6..61cab50 100644
--- a/examples/imgui_impl_freeglut.cpp
+++ b/examples/imgui_impl_freeglut.cpp
@@ -21,7 +21,11 @@
 
 #include "imgui.h"
 #include "imgui_impl_freeglut.h"
-#include <GL/freeglut.h>
+#ifdef __APPLE__
+    #include <GLUT/glut.h>
+#else
+    #include <GL/freeglut.h>
+#endif
 
 #ifdef _MSC_VER
 #pragma warning (disable: 4505) // unreferenced local function has been removed (stb stuff)
@@ -68,7 +72,9 @@
     glutMotionFunc(ImGui_ImplFreeGLUT_MotionFunc);
     glutPassiveMotionFunc(ImGui_ImplFreeGLUT_MotionFunc);
     glutMouseFunc(ImGui_ImplFreeGLUT_MouseFunc);
+#ifndef __APPLE__
     glutMouseWheelFunc(ImGui_ImplFreeGLUT_MouseWheelFunc);
+#endif
     glutKeyboardFunc(ImGui_ImplFreeGLUT_KeyboardFunc);
     glutKeyboardUpFunc(ImGui_ImplFreeGLUT_KeyboardUpFunc);
     glutSpecialFunc(ImGui_ImplFreeGLUT_SpecialFunc);