Merge branch 'macos'

.gitea/workflows/demo.yaml

@@ -1,19 +0,0 @@
-name: Gitea Actions Demo
-run-name: ${{ gitea.actor }} is testing out Gitea Actions 
-on: [push]
-
-jobs:
-  Explore-Gitea-Actions:
-    runs-on: ubuntu-latest
-    steps:
-      - run: echo "The job was automatically triggered by a ${{ gitea.event_name }} event."
-      - run: echo "This job is now running on a ${{ runner.os }} server hosted by Gitea!"
-      - run: echo "The name of your branch is ${{ gitea.ref }} and your repository is ${{ gitea.repository }}."
-      - name: Check out repository code
-        uses: actions/checkout@v4
-      - run: echo "The ${{ gitea.repository }} repository has been cloned to the runner."
-      - run: echo "The workflow is now ready to test your code on the runner."
-      - name: List files in the repository
-        run: |
-          ls ${{ gitea.workspace }}
-      - run: echo "This job's status is ${{ job.status }}."

Makefile

@@ -24,7 +24,7 @@ UNAME_S := $(shell uname -s)
 LINUX_GL_LIBS = -lGL
 
 CXXFLAGS = -std=c++20 -I$(IMGUI_DIR) -I$(IMGUI_DIR)/backends
-CXXFLAGS += -DIMGUI_DEFINE_MATH_OPERATORS -Ofast
+CXXFLAGS += -DIMGUI_DEFINE_MATH_OPERATORS -O3 -DGL_SILENCE_DEPRECATION
 LIBS = -lexiv2
 
 ##---------------------------------------------------------------------

lib/backends/tex_inspect_opengl.cpp

@@ -77,11 +77,16 @@ using namespace gl;
 #elif defined(IMGUI_IMPL_OPENGL_LOADER_EPOXY)
 #include <epoxy/gl.h>
 #else
+#if defined(__APPLE__)
+#include <OpenGL/gl.h>
+#include <OpenGL/gl3.h>
+#else
 #include <SDL2/SDL_opengl.h>
 #include <SDL2/SDL_opengles2.h>
 #include <SDL2/SDL_opengles2_gl2.h>
 #endif
 #endif
+#endif
 
 // Desktop GL 3.2+ has glDrawElementsBaseVertex() which GL ES and WebGL don't have.
 #if !defined(IMGUI_IMPL_OPENGL_ES2) && !defined(IMGUI_IMPL_OPENGL_ES3) && defined(GL_VERSION_3_2)