Force macOS onto SDL

minetest · Jan 16, 2024 · efb5f5a · efb5f5a
1 parent 52bba9d
commit efb5f5a
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -166,7 +166,7 @@ jobs:
       - name: Install deps
         run: |
           brew update
-          brew install cmake libpng jpeg
+          brew install cmake libpng jpeg sdl2
 
       - name: Build
         run: |

diff --git a/source/Irrlicht/CMakeLists.txt b/source/Irrlicht/CMakeLists.txt
@@ -1,4 +1,4 @@
-if(NOT ANDROID AND NOT APPLE)
+if(NOT ANDROID)
 	set(DEFAULT_SDL2 ON)
 endif()
 
@@ -88,7 +88,10 @@ if(WIN32)
 	set(DEVICE "WINDOWS")
 elseif(APPLE)
 	add_definitions(-D_IRR_OSX_PLATFORM_)
-	set(DEVICE "OSX")
+	if(NOT USE_SDL2)
+		message(FATAL_ERROR "SDL2 is required on macOS")
+	endif()
+	set(DEVICE "SDL")
 elseif(ANDROID)
 	add_definitions(-D_IRR_ANDROID_PLATFORM_)
 	if(USE_SDL2)
@@ -191,7 +194,6 @@ if(ENABLE_OPENGL)
 		add_definitions(-D_IRR_COMPILE_WITH_GLX_MANAGER_)
 	elseif(DEVICE STREQUAL "OSX")
 		add_definitions(-D_IRR_COMPILE_WITH_NSOGL_MANAGER_)
-		# FIXME broken due to missing glext.h now!
 	endif()
 endif()
 

diff --git a/source/Irrlicht/COpenGLCommon.h b/source/Irrlicht/COpenGLCommon.h
@@ -13,16 +13,14 @@
 	#include <GL/gl.h>
 		#include <GL/glext.h>
 	#include <GL/wglext.h>
-#elif defined(_IRR_COMPILE_WITH_OSX_DEVICE_)
-		#define GL_GLEXT_LEGACY 1
-	#include <OpenGL/gl.h>
-		#include <GL/glext.h>
 #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_)
 		#define GL_GLEXT_LEGACY 1
 	#include <SDL_video.h>
 	#include <SDL_opengl.h>
 		// The SDL2 header doesn't cut it for extensions
 		#include <GL/glext.h>
+#elif defined(_IRR_COMPILE_WITH_OSX_DEVICE_)
+	#error Not supposed to get here
 #else
 		#define GL_GLEXT_LEGACY 1
 		#define GLX_GLXEXT_LEGACY 1