Enable SDL to work on macOS

minetest · Jan 16, 2024 · 5e24bba · 5e24bba
1 parent ee2467d
commit 5e24bba
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -177,6 +177,20 @@ jobs:
         run: |
           ./bin/OSX/AutomatedTest null
 
+  macos-sdl:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Install deps
+        run: |
+          brew update
+          brew install cmake libpng jpeg sdl2
+
+      - name: Build
+        run: |
+          cmake . -DCMAKE_FIND_FRAMEWORK=LAST -DBUILD_EXAMPLES=1 -DUSE_SDL2=1
+          make -j3
+
   msvc:
     name: VS 2019 ${{ matrix.config.arch }} ${{ matrix.sdl.label }}
     runs-on: windows-2019

diff --git a/source/Irrlicht/COpenGLCommon.h b/source/Irrlicht/COpenGLCommon.h
@@ -17,14 +17,6 @@
 		#include <GL/glext.h>
 	#endif
 	#include <GL/wglext.h>
-#elif defined(_IRR_COMPILE_WITH_OSX_DEVICE_)
-	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-		#define GL_GLEXT_LEGACY 1
-	#endif
-	#include <OpenGL/gl.h>
-	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-		#include <GL/glext.h>
-	#endif
 #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_)
 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
 		#define GL_GLEXT_LEGACY 1
@@ -34,8 +26,15 @@
 	#include <SDL_video.h>
 	#include <SDL_opengl.h>
 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
-		// The SDL2 header doesn't cut it for extensions
-		#include <GL/glext.h>
+		#include <SDL_opengl_glext.h>
+	#endif
+#elif defined(_IRR_COMPILE_WITH_OSX_DEVICE_)
+	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+		#define GL_GLEXT_LEGACY 1
+	#endif
+	#include <OpenGL/gl.h>
+	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+		#error glext.h missing on OSX
 	#endif
 #else
 	#if defined(_IRR_OPENGL_USE_EXTPOINTER_)