Import Irrlicht

.github/workflows/build.yml

@@ -227,11 +227,6 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Checkout IrrlichtMt
-        run: |
-          $ref = @(Get-Content misc\irrlichtmt_tag.txt)
-          git clone https://github.com/minetest/irrlicht lib\irrlichtmt --depth 1 -b $ref[0]
-
       - name: Restore from cache and run vcpkg
         uses: lukka/run-vcpkg@v7
         with:

.github/workflows/macos.yml

@@ -39,7 +39,6 @@ jobs:
       - name: Build
         run: |
           git clone -b $MINETEST_GAME_BRANCH $MINETEST_GAME_REPO games/$MINETEST_GAME_NAME
-          git clone https://github.com/minetest/irrlicht lib/irrlichtmt --depth 1 -b $(cat misc/irrlichtmt_tag.txt)
           mkdir build
           cd build
           cmake .. \

.gitignore

@@ -121,8 +121,5 @@ compile_commands.json
 *.sln
 .vs/
 
-# Optional user provided library folder
-lib/irrlichtmt
-
 # Generated mod storage database
 client/mod_storage.sqlite

CMakeLists.txt

@@ -75,75 +75,20 @@ endif()
 
 
 set(IRRLICHTMT_BUILD_DIR "" CACHE PATH "Path to IrrlichtMt build directory.")
-if(ANDROID)
-	# currently manually provided
-elseif(NOT "${IRRLICHTMT_BUILD_DIR}" STREQUAL "")
-	find_package(IrrlichtMt QUIET
-		PATHS "${IRRLICHTMT_BUILD_DIR}"
-		NO_DEFAULT_PATH
-	)
+message(STATUS "Using user-provided IrrlichtMt at subdirectory 'lib/irrlichtmt'")
+if(BUILD_CLIENT)
+	# tell IrrlichtMt to create a static library
+	set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared library" FORCE)
+	add_subdirectory(lib/irrlichtmt EXCLUDE_FROM_ALL)
+	unset(BUILD_SHARED_LIBS CACHE)
 
-	if(NOT TARGET IrrlichtMt::IrrlichtMt)
-		# find_package() searches certain subdirectories. ${PATH}/cmake is not
-		# the only one, but it is the one where IrrlichtMt is supposed to export
-		# IrrlichtMtConfig.cmake
-		message(FATAL_ERROR "Could not find IrrlichtMtConfig.cmake in ${IRRLICHTMT_BUILD_DIR}/cmake.")
-	endif()
-elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lib/irrlichtmt")
-	message(STATUS "Using user-provided IrrlichtMt at subdirectory 'lib/irrlichtmt'")
-	if(BUILD_CLIENT)
-		# tell IrrlichtMt to create a static library
-		set(BUILD_SHARED_LIBS OFF CACHE BOOL "Build shared library" FORCE)
-		add_subdirectory(lib/irrlichtmt EXCLUDE_FROM_ALL)
-		unset(BUILD_SHARED_LIBS CACHE)
-
-		if(NOT TARGET IrrlichtMt)
-			message(FATAL_ERROR "IrrlichtMt project is missing a CMake target?!")
-		endif()
-	else()
-		add_library(IrrlichtMt::IrrlichtMt INTERFACE IMPORTED)
-		set_target_properties(IrrlichtMt::IrrlichtMt PROPERTIES
-			INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/lib/irrlichtmt/include")
+	if(NOT TARGET IrrlichtMt)
+		message(FATAL_ERROR "IrrlichtMt project is missing a CMake target?!")
 	endif()
 else()
-	find_package(IrrlichtMt QUIET)
-	if(NOT TARGET IrrlichtMt::IrrlichtMt)
-		string(CONCAT explanation_msg
-			"The Minetest team has forked Irrlicht to make their own customizations. "
-			"It can be found here: https://github.com/minetest/irrlicht\n"
-			"For example use: git clone --depth=1 https://github.com/minetest/irrlicht lib/irrlichtmt\n")
-		if(BUILD_CLIENT)
-			message(FATAL_ERROR "IrrlichtMt is required to build the client, but it was not found.\n${explanation_msg}")
-		endif()
-
-		include(MinetestFindIrrlichtHeaders)
-		if(NOT IRRLICHT_INCLUDE_DIR)
-			message(FATAL_ERROR "IrrlichtMt headers are required to build the server, but none found.\n${explanation_msg}")
-		endif()
-		message(STATUS "Found IrrlichtMt headers: ${IRRLICHT_INCLUDE_DIR}")
-		add_library(IrrlichtMt::IrrlichtMt INTERFACE IMPORTED)
-		# Note that we can't use target_include_directories() since that doesn't work for IMPORTED targets before CMake 3.11
-		set_target_properties(IrrlichtMt::IrrlichtMt PROPERTIES
-			INTERFACE_INCLUDE_DIRECTORIES "${IRRLICHT_INCLUDE_DIR}")
-	endif()
-endif()
-
-if(ANDROID)
-	# skipped for now
-elseif(BUILD_CLIENT AND TARGET IrrlichtMt::IrrlichtMt)
-	# retrieve version somehow
-	if(NOT IrrlichtMt_VERSION)
-		get_target_property(IrrlichtMt_VERSION IrrlichtMt VERSION)
-	endif()
-	message(STATUS "Found IrrlichtMt ${IrrlichtMt_VERSION}")
-
-	set(TARGET_VER_S 1.9.0mt12)
-	string(REPLACE "mt" "." TARGET_VER ${TARGET_VER_S})
-	if(IrrlichtMt_VERSION VERSION_LESS ${TARGET_VER})
-		message(FATAL_ERROR "At least IrrlichtMt ${TARGET_VER_S} is required to build")
-	elseif(NOT DEVELOPMENT_BUILD AND IrrlichtMt_VERSION VERSION_GREATER ${TARGET_VER})
-		message(FATAL_ERROR "IrrlichtMt ${TARGET_VER_S} is required to build")
-	endif()
+	add_library(IrrlichtMt::IrrlichtMt INTERFACE IMPORTED)
+	set_target_properties(IrrlichtMt::IrrlichtMt PROPERTIES
+		INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/lib/irrlichtmt/include")
 endif()
 
 if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")

android/native/build.gradle

@@ -47,7 +47,7 @@ task downloadDeps(type: Download) {
 	def depsDir = new File(buildDir.parent, 'deps')
 	def depsZip = new File(buildDir, 'deps.zip')
 
-	src 'https://github.com/minetest/minetest_android_deps/releases/download/latest/deps.zip'
+	src 'https://github.com/minetest/minetest_android_deps/releases/download/latest/deps-lite.zip'
 	dest depsZip
 	overwrite false
 

cmake/Modules/MinetestAndroidLibs.cmake

@@ -1,13 +1,5 @@
 set(DEPS "${CMAKE_SOURCE_DIR}/android/native/deps/${ANDROID_ABI}")
 
-add_library(IrrlichtMt::IrrlichtMt STATIC IMPORTED)
-set_target_properties(IrrlichtMt::IrrlichtMt PROPERTIES
-	INTERFACE_INCLUDE_DIRECTORIES ${DEPS}/Irrlicht/include)
-set_target_properties(IrrlichtMt::IrrlichtMt PROPERTIES
-	IMPORTED_LOCATION ${DEPS}/Irrlicht/libIrrlichtMt.a)
-set_target_properties(IrrlichtMt::IrrlichtMt PROPERTIES
-	INTERFACE_LINK_LIBRARIES "EGL;GLESv1_CM;GLESv2;${DEPS}/Irrlicht/libpng.a;${DEPS}/Irrlicht/libjpeg.a")
-
 set(CURL_INCLUDE_DIR ${DEPS}/Curl/include)
 set(CURL_LIBRARY ${DEPS}/Curl/libcurl.a;${DEPS}/Curl/libmbedcrypto.a;${DEPS}/Curl/libmbedtls.a;${DEPS}/Curl/libmbedx509.a)
 set(FREETYPE_INCLUDE_DIR_ft2build ${DEPS}/Freetype/include/freetype2)
@@ -16,12 +8,16 @@ set(FREETYPE_LIBRARY ${DEPS}/Freetype/libfreetype.a)
 set(GETTEXT_INCLUDE_DIR ${DEPS}/Gettext/include;${DEPS}/Iconv/include)
 set(GETTEXT_LIBRARY ${DEPS}/Gettext/libintl.a)
 set(ICONV_LIBRARY ${DEPS}/Iconv/libiconv.a;${DEPS}/Iconv/libcharset.a)
+set(JPEG_INCLUDE_DIR ${DEPS}/JPEG/include)
+set(JPEG_LIBRARY ${DEPS}/JPEG/libjpeg.a)
 set(LUA_INCLUDE_DIR ${DEPS}/LuaJIT/include)
 set(LUA_LIBRARY ${DEPS}/LuaJIT/libluajit.a)
 set(OGG_INCLUDE_DIR ${DEPS}/Vorbis/include)
 set(OGG_LIBRARY ${DEPS}/Vorbis/libogg.a)
 set(OPENAL_INCLUDE_DIR ${DEPS}/OpenAL-Soft/include)
 set(OPENAL_LIBRARY ${DEPS}/OpenAL-Soft/libopenal.a;OpenSLES)
+set(PNG_PNG_INCLUDE_DIR ${DEPS}/PNG/include)
+set(PNG_LIBRARY ${DEPS}/PNG/libpng.a)
 set(SQLITE3_INCLUDE_DIR ${DEPS}/SQLite/include)
 set(SQLITE3_LIBRARY ${DEPS}/SQLite/libsqlite3.a)
 set(VORBIS_INCLUDE_DIR ${DEPS}/Vorbis/include)

lib/irrlichtmt/.editorconfig

@@ -0,0 +1,10 @@
+root = true
+
+[*]
+charset = utf-8
+
+[*.{cpp,h,txt,cmake,fsh,vsh}]
+indent_size = 4
+indent_style = tab
+insert_final_newline = true
+trim_trailing_whitespace = true