Add macOS support

Fixed OpenGL incompatibility, fixed setting window icon on macOS (results in exception), fixed INSTALL_RPATH in CMakeList
SmartCGMS · Nov 25, 2024 · ae51d11 · ae51d11
1 parent 2d11223
commit ae51d11
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -64,7 +64,7 @@ target_link_libraries(zero_mate
 if(NOT WIN32)
     set_target_properties(zero_mate 
         PROPERTIES
-            INSTALL_RPATH "$ORIGIN"
+            INSTALL_RPATH "."
             BUILD_WITH_INSTALL_RPATH TRUE
     )
 endif()

diff --git a/src/gui/gui.cpp b/src/gui/gui.cpp
@@ -219,9 +219,17 @@ namespace zero_mate::gui
             return 1;
         }
 
-        // Set up GLFW window hints.
-        glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
-        glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
+        #if defined(__APPLE__)
+            // GL 3.2 + GLSL 150
+            glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
+            glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2);
+            glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);  // 3.2+ only
+            glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);            // Required on Mac
+        #else
+            // Set up GLFW window hints.
+            glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
+            glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 0);
+        #endif
 
         // Create a GLFW window.
         GLFWwindow* window = glfwCreateWindow(Window_Width, Window_Height, Window_Title, nullptr, nullptr);
@@ -270,7 +278,11 @@ namespace zero_mate::gui
 
         // Init ImGUI GLFW with OpenGL implementation.
         ImGui_ImplGlfw_InitForOpenGL(window, true);
-        ImGui_ImplOpenGL3_Init("#version 130");
+        #if defined(__APPLE__)
+            ImGui_ImplOpenGL3_Init("#version 150");
+        #else
+            ImGui_ImplOpenGL3_Init("#version 130");
+        #endif
 
         // Attempt to load a custom font and icons.
         if (std::filesystem::exists(config::Font_Path) && std::filesystem::exists(config::Icons_Path))
@@ -311,7 +323,9 @@ namespace zero_mate::gui
         // Make sure the logo was loaded successfully.
         if (images[0].pixels != nullptr)
         {
-            glfwSetWindowIcon(window, 1, images);
+        #if !defined(__APPLE__)
+            glfwSetWindowIcon(window, 1, images)
+        #endif
         }
 
         // Free the junk of allocated memory.