Make Luanti buildable for iOS (iPhoneSimulator).

luanti-org · Nov 18, 2024 · 55e95dd · 55e95dd
1 parent 11837d4
commit 55e95dd
Show file tree

Hide file tree

Showing 16 changed files with 97 additions and 16 deletions.
diff --git a/cmake/Modules/FindZstd.cmake b/cmake/Modules/FindZstd.cmake
@@ -1,5 +1,8 @@
 mark_as_advanced(ZSTD_LIBRARY ZSTD_INCLUDE_DIR)
 
+message(STATUS "ZSTD_LIBRARY: ${ZSTD_LIBRARY}")
+message(STATUS "ZSTD_INCLUDE_DIR: ${ZSTD_INCLUDE_DIR}")
+
 find_path(ZSTD_INCLUDE_DIR NAMES zstd.h)
 
 find_library(ZSTD_LIBRARY NAMES zstd)

diff --git a/irr/README.md b/irr/README.md
@@ -32,6 +32,7 @@ We aim to support these platforms:
 * Windows via MinGW
 * Linux (GL or GLES)
 * macOS
+* iOS (GLES)
 * Android
 
 This doesn't mean other platforms don't work or won't be supported, if you find something that doesn't work contributions are welcome.
@@ -51,7 +52,7 @@ Driver (rows) vs Device (columns)
 
 Notes:
 
-* [1] `CIrrDeviceSDL`: supports Android, Linux, macOS, Windows
+* [1] `CIrrDeviceSDL`: supports Android, Linux, macOS, iOS, Windows
 * [2] `CIrrDeviceLinux`: supports Linux
 * [3] `CIrrDeviceOSX`: supports macOS
 * [4] `CIrrDeviceWin32`: supports Windows

diff --git a/irr/src/CMakeLists.txt b/irr/src/CMakeLists.txt
@@ -134,7 +134,7 @@ else()
 	option(ENABLE_OPENGL "Enable OpenGL" TRUE)
 endif()
 
-if(APPLE)
+if(APPLE AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "iOS")
 	set(ENABLE_GLES2 FALSE)
 	set(ENABLE_WEBGL1 FALSE)
 else()
@@ -271,7 +271,7 @@ endif()
 
 if(ANDROID)
 	enable_language(C)
-elseif(APPLE)
+elseif(APPLE AND NOT ${CMAKE_SYSTEM_NAME} STREQUAL "iOS")
 	find_library(COCOA_LIB Cocoa REQUIRED)
 	find_library(IOKIT_LIB IOKit REQUIRED)
 
@@ -356,14 +356,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()
 
@@ -497,7 +497,6 @@ target_link_libraries(IrrlichtMt PRIVATE
 	${ZLIB_LIBRARY}
 	${JPEG_LIBRARY}
 	${PNG_LIBRARY}
-	"$<$<BOOL:${USE_SDL2}>:SDL2::SDL2>"
 
 	"$<$<BOOL:${OPENGL_DIRECT_LINK}>:${OPENGL_LIBRARIES}>"
 	${EGL_LIBRARY}
@@ -512,6 +511,26 @@ target_link_libraries(IrrlichtMt PRIVATE
 	"$<$<BOOL:${USE_X11}>:${X11_Xi_LIB}>"
 )
 
+if(${CMAKE_SYSTEM_NAME} STREQUAL "iOS")
+	target_link_libraries(IrrlichtMt PRIVATE
+		"-framework UIKit"
+		"-framework Foundation"
+		"-framework CoreGraphics"
+		"-framework QuartzCore"
+		"-framework OpenGLES"
+		"-framework AudioToolbox"
+		"-framework AVFoundation"
+		"-framework CoreAudio"
+		"-framework CoreMotion"
+		SDL2::SDL2-static
+		SDL2::SDL2main
+	)
+else()
+	target_link_libraries(IrrlichtMt PRIVATE
+		"$<$<BOOL:${USE_SDL2}>:SDL2::SDL2>"
+	)
+endif()
+
 if(WIN32)
 	target_compile_definitions(IrrlichtMt INTERFACE _IRR_WINDOWS_API_) # used in _IRR_DEBUG_BREAK_IF definition in a public header
 endif()

diff --git a/irr/src/OpenGL/Common.h b/irr/src/OpenGL/Common.h
@@ -10,6 +10,11 @@
 #if defined(_IRR_COMPILE_WITH_SDL_DEVICE_)
 #include <SDL_video.h>
 #include <SDL_opengl.h>
+#ifdef __IPHONEOS__
+//#include <OpenGLES/ES3/gl.h>
+//#include <OpenGLES/ES3/glext.h>
+#include "vendor/gl.h"
+#endif
 #else
 #include "vendor/gl.h"
 #endif

diff --git a/irr/src/OpenGL/Driver.cpp b/irr/src/OpenGL/Driver.cpp
@@ -171,8 +171,8 @@ COpenGL3DriverBase::COpenGL3DriverBase(const SIrrlichtCreationParameters &params
 	ContextManager->activateContext(ExposedData, false);
 	GL.LoadAllProcedures(ContextManager);
 	if (EnableErrorTest) {
-		GL.Enable(GL_DEBUG_OUTPUT);
-		GL.DebugMessageCallback(debugCb, this);
+		//GL.Enable(GL_DEBUG_OUTPUT);
+		//GL.DebugMessageCallback(debugCb, this);
 	}
 	initQuadsIndices();
 }

diff --git a/irr/src/OpenGL3/Driver.cpp → irr/src/OpenGL3/DriverGL3.cpp b/irr/src/OpenGL3/Driver.cpp → 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 "mt_opengl.h"
 

diff --git a/irr/src/OpenGL3/Driver.h → irr/src/OpenGL3/DriverGL3.h b/irr/src/OpenGL3/Driver.h → irr/src/OpenGL3/DriverGL3.h
diff --git a/irr/src/OpenGLES2/Driver.cpp → irr/src/OpenGLES2/DriverGLES2.cpp b/irr/src/OpenGLES2/Driver.cpp → 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 <cassert>
 #include <CColorConverter.h>
 

diff --git a/irr/src/OpenGLES2/Driver.h → irr/src/OpenGLES2/DriverGLES2.h b/irr/src/OpenGLES2/Driver.h → irr/src/OpenGLES2/DriverGLES2.h
diff --git a/lib/sha256/sha256.c b/lib/sha256/sha256.c
@@ -111,15 +111,15 @@
 #endif
 #endif
 
-#if defined(__APPLE__) && !defined(HAVE_ENDIAN_H)
+#if defined(__APPLE__)
 #include <libkern/OSByteOrder.h>
 #define be16toh(x) OSSwapBigToHostInt16((x))
 #define htobe16(x) OSSwapHostToBigInt16((x))
 #define le32toh(x) OSSwapLittleToHostInt32((x))
 #define be32toh(x) OSSwapBigToHostInt32((x))
 #define htole32(x) OSSwapHostToLittleInt32(x)
 #define htobe32(x) OSSwapHostToBigInt32(x)
-#endif /* __APPLE__ && !HAVE_ENDIAN_H */
+#endif /* __APPLE__ */
 
 #if defined(_WIN32) && !defined(HAVE_ENDIAN_H)
 #include <winsock2.h>

diff --git a/misc/ios/Info.plist.in b/misc/ios/Info.plist.in
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>luanti</string>
+	<key>CFBundleIconFile</key>
+	<string>luanti-icon.icns</string>
+	<key>CFBundleName</key>
+	<string>@PROJECT_NAME_CAPITALIZED@</string>
+	<key>CFBundleDisplayName</key>
+	<string>@PROJECT_NAME_CAPITALIZED@</string>
+	<key>CFBundleIdentifier</key>
+	<string>org.luanti.luanti</string>
+	<key>CFBundleVersion</key>
+	<string>@VERSION_STRING@</string>
+	<key>CFBundleShortVersionString</key>
+	<string>@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@</string>
+	<key>LSApplicationCategoryType</key>
+	<string>public.app-category.games</string>
+	<key>NSHighResolutionCapable</key>
+	<false/>
+	<key>UIApplicationSupportsIndirectInputEvents</key>
+	<true/>
+</dict>
+</plist>
diff --git a/misc/ios/entitlements/release.entitlements b/misc/ios/entitlements/release.entitlements
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+</dict>
+</plist>
diff --git a/misc/macos/Info.plist.in b/misc/macos/Info.plist.in
@@ -16,6 +16,8 @@
 	<string>org.luanti.luanti</string>
 	<key>CFBundleVersion</key>
 	<string>@VERSION_STRING@</string>
+	<key>CFBundleShortVersionString</key>
+	<string>@VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_PATCH@</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.games</string>
 	<key>NSHighResolutionCapable</key>

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -600,10 +600,17 @@ endif()
 
 if(APPLE)
 	# Configure the Info.plist file
-	configure_file(
-		"${CMAKE_SOURCE_DIR}/misc/macos/Info.plist.in"
-		"${CMAKE_BINARY_DIR}/Info.plist"
-	)
+	if(NOT ${CMAKE_SYSTEM_NAME} STREQUAL "iOS")
+		configure_file(
+			"${CMAKE_SOURCE_DIR}/misc/macos/Info.plist.in"
+			"${CMAKE_BINARY_DIR}/Info.plist"
+		)
+	else()
+		configure_file(
+			"${CMAKE_SOURCE_DIR}/misc/ios/Info.plist.in"
+			"${CMAKE_BINARY_DIR}/Info.plist"
+		)
+	endif()
 endif()
 
 if(BUILD_CLIENT)
@@ -678,6 +685,8 @@ if(BUILD_CLIENT)
 		# on Android, Luanti depends on SDL2 directly
 		# on other platforms, only IrrlichtMt depends on SDL2
 		"$<$<PLATFORM_ID:Android>:${SDL2_LIBRARIES}>"
+		#"$<$<PLATFORM_ID:iOS>:-framework UIKit -framework Foundation -framework CoreGraphics -framework QuartzCore -framework OpenGLES -framework AudioToolbox -framework AVFoundation -framework CoreAudio -framework CoreMotion -framework Security>"
+		"$<$<PLATFORM_ID:iOS>:-framework Security -framework CoreHaptics -framework CoreBluetooth -framework GameController -framework Metal -framework Foundation>"
 	)
 	target_compile_definitions(${PROJECT_NAME} PRIVATE "MT_BUILDTARGET=1")
 	if(NOT USE_LUAJIT)

diff --git a/src/main.cpp b/src/main.cpp
@@ -45,6 +45,10 @@ extern "C" {
 #endif
 }
 
+#if TARGET_OS_IPHONE
+#include <SDL2/SDL.h>
+#endif
+
 #if !defined(__cpp_rtti) || !defined(__cpp_exceptions)
 #error Luanti cannot be built without exceptions or RTTI
 #endif

diff --git a/src/util/serialize.h b/src/util/serialize.h
@@ -38,6 +38,10 @@
 #elif !defined(BYTE_ORDER) && defined(__BYTE_ORDER)
 	#define BYTE_ORDER __BYTE_ORDER
 #endif
+#ifndef TARGET_OS_IPHONE
+
+#endif
+#undef HAVE_ENDIAN_H
 
 #define FIXEDPOINT_FACTOR 1000.0f