Make SDL2 default on macOS (#16039)

.github/workflows/macos.yml

@@ -45,7 +45,7 @@ jobs:
           mkdir build
           cd build
           cmake .. \
-            -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 \
+            -DCMAKE_OSX_DEPLOYMENT_TARGET=13 \
             -DCMAKE_FIND_FRAMEWORK=LAST \
             -DCMAKE_INSTALL_PREFIX=../build/macos/ \
             -DRUN_IN_PLACE=FALSE -DENABLE_GETTEXT=TRUE \

doc/compiling/README.md

@@ -23,6 +23,7 @@ General options and their default values:
     PRECOMPILE_HEADERS=FALSE   - Precompile some headers (experimental; requires CMake 3.16 or later)
     PRECOMPILED_HEADERS_PATH=  - Path to a file listing all headers to precompile (default points to src/precompiled_headers.txt)
     USE_SDL2=TRUE              - Build with SDL2; Enables IrrlichtMt device SDL2
+    USE_SDL2_STATIC=TRUE       - Links with SDL2::SDL2-static instead of SDL2::SDL2
     ENABLE_CURL=ON             - Build with cURL; Enables use of online mod repo, public serverlist and remote media fetching via http
     ENABLE_CURSES=ON           - Build with (n)curses; Enables a server side terminal (command line option: --terminal)
     ENABLE_GETTEXT=ON          - Build with Gettext; Allows using translations

irr/src/CMakeLists.txt

@@ -1,11 +1,9 @@
-# When enabling SDL2 by default on macOS, don't forget to change
-# "NSHighResolutionCapable" to true in "Info.plist".
-if(NOT APPLE)
-	set(DEFAULT_SDL2 ON)
-endif()
+set(DEFAULT_SDL2 ON)
 
 option(USE_SDL2 "Use the SDL2 backend" ${DEFAULT_SDL2})
 
+option(USE_SDL2_STATIC "Link with SDL2 static libraries" FALSE)
+
 # Compiler flags
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -228,7 +226,11 @@ endif()
 if(ENABLE_OPENGL)
 	find_package(OpenGL REQUIRED)
 endif()
+set(USE_SDL2_SHARED FALSE)
 if(USE_SDL2)
+	if(NOT USE_SDL2_STATIC)
+		set(USE_SDL2_SHARED TRUE)
+	endif()
 	if(NOT ANDROID)
 		find_package(SDL2 REQUIRED)
 	else()
@@ -364,14 +366,14 @@ endif()
 if(ENABLE_OPENGL3)
 	set(IRRDRVROBJ
 		${IRRDRVROBJ}
-		OpenGL3/Driver.cpp
+		OpenGL3/DriverGL3.cpp
 	)
 endif()
 
 if(ENABLE_GLES2)
 	set(IRRDRVROBJ
 		${IRRDRVROBJ}
-		OpenGLES2/Driver.cpp
+		OpenGLES2/DriverGLES2.cpp
 	)
 endif()
 
@@ -505,7 +507,8 @@ target_link_libraries(IrrlichtMt PRIVATE
 	${ZLIB_LIBRARY}
 	${JPEG_LIBRARY}
 	${PNG_LIBRARY}
-	"$<$<BOOL:${USE_SDL2}>:SDL2::SDL2>"
+	"$<$<BOOL:${USE_SDL2_SHARED}>:SDL2::SDL2>"
+	"$<$<BOOL:${USE_SDL2_STATIC}>:SDL2::SDL2-static>"
 
 	"$<$<BOOL:${OPENGL_DIRECT_LINK}>:${OPENGL_LIBRARIES}>"
 	${EGL_LIBRARY}

irr/src/OpenGL3/DriverGL3.cpp

@@ -2,7 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in Irrlicht.h
 
-#include "Driver.h"
+#include "DriverGL3.h"
 #include <cassert>
 #include <stdexcept>
 #include "mt_opengl.h"

irr/src/OpenGLES2/DriverGLES2.cpp

@@ -2,7 +2,7 @@
 // This file is part of the "Irrlicht Engine".
 // For conditions of distribution and use, see copyright notice in Irrlicht.h
 
-#include "Driver.h"
+#include "DriverGLES2.h"
 #include <stdexcept>
 #include <cassert>
 #include "mt_opengl.h"

misc/macos/Info.plist.in

@@ -21,6 +21,6 @@
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.games</string>
 	<key>NSHighResolutionCapable</key>
-	<false/>
+	<true/>
 </dict>
 </plist>

src/client/item_visuals_manager.h

@@ -7,6 +7,7 @@
 #include <string>
 #include <map>
 #include <thread>
+#include <unordered_map>
 #include "wieldmesh.h" // ItemMesh
 #include "util/basic_macros.h"
 

src/server/blockmodifier.h

@@ -8,6 +8,7 @@
 #include <vector>
 #include <map>
 #include <unordered_set>
+#include <unordered_map>
 
 #include "irr_v3d.h"
 #include "mapnode.h"

util/ci/build_xcode.sh

@@ -3,8 +3,10 @@
 cmake .. \
 	-DCMAKE_FIND_FRAMEWORK=LAST \
 	-DRUN_IN_PLACE=FALSE -DENABLE_GETTEXT=TRUE \
+	-DUSE_SDL2_STATIC=TRUE \
+	-DSDL2_INCLUDE_DIRS=/opt/homebrew/include/SDL2 \
 	-DFREETYPE_LIBRARY=/opt/homebrew/lib/libfreetype.a \
-	-DGETTEXT_INCLUDE_DIR=/path/to/include/dir \
+	-DGETTEXT_INCLUDE_DIR=/opt/homebrew/include \
 	-DGETTEXT_LIBRARY=/opt/homebrew/lib/libintl.a \
 	-DLUA_LIBRARY=/opt/homebrew/lib/libluajit-5.1.a \
 	-DOGG_LIBRARY=/opt/homebrew/lib/libogg.a \

util/ci/common.sh

@@ -29,7 +29,7 @@ install_linux_deps() {
 install_macos_deps() {
 	local pkgs=(
 		cmake gettext freetype gmp jpeg-turbo jsoncpp leveldb
-		libogg libpng libvorbis luajit zstd
+		libogg libpng libvorbis luajit zstd sdl2
 	)
 	export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
 	export HOMEBREW_NO_INSTALL_CLEANUP=1