[no squash] Irrlicht import

.github/workflows/android.yml

@@ -8,6 +8,8 @@ on:
       - 'lib/**.cpp'
       - 'src/**.[ch]'
       - 'src/**.cpp'
+      - 'irr/**.[ch]'
+      - 'irr/**.cpp'
       - '**/CMakeLists.txt'
       - 'cmake/Modules/**'
       - 'android/**'

.github/workflows/cpp_lint.yml

@@ -8,6 +8,8 @@ on:
       - 'lib/**.cpp'
       - 'src/**.[ch]'
       - 'src/**.cpp'
+      - 'irr/**.[ch]'
+      - 'irr/**.cpp'
       - '**/CMakeLists.txt'
       - 'cmake/Modules/**'
       - 'util/ci/**'

.github/workflows/linux.yml

@@ -8,10 +8,11 @@ on:
       - 'lib/**.cpp'
       - 'src/**.[ch]'
       - 'src/**.cpp'
+      - 'irr/**.[ch]'
+      - 'irr/**.cpp'
       - '**/CMakeLists.txt'
       - 'cmake/Modules/**'
       - 'util/ci/**'
-      - 'misc/irrlichtmt_tag.txt'
       - 'Dockerfile'
       - '.dockerignore'
       - '.github/workflows/linux.yml'
@@ -24,7 +25,6 @@ on:
       - '**/CMakeLists.txt'
       - 'cmake/Modules/**'
       - 'util/ci/**'
-      - 'misc/irrlichtmt_tag.txt'
       - 'Dockerfile'
       - '.dockerignore'
       - '.github/workflows/linux.yml'

.github/workflows/lua.yml

@@ -14,24 +14,24 @@ on:
       - '.github/workflows/**.yml'
 
 jobs:
-  # Note that the integration tests are also run build.yml, but only when C++ code is changed.
+  # Note that the integration tests are also run in build.yml, but only when C++ code is changed.
   integration_tests:
     name: "Compile and run multiplayer tests"
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
     - name: Install deps
       run: |
         source ./util/ci/common.sh
-        install_linux_deps clang-10 gdb libluajit-5.1-dev
+        install_linux_deps clang gdb libluajit-5.1-dev
 
     - name: Build
       run: |
         ./util/ci/build.sh
       env:
-        CC: clang-10
-        CXX: clang++-10
-        CMAKE_FLAGS: "-DENABLE_GETTEXT=0 -DBUILD_SERVER=0"
+        CC: clang
+        CXX: clang++
+        CMAKE_FLAGS: "-DENABLE_GETTEXT=0 -DBUILD_SERVER=0 -DBUILD_UNITTESTS=0"
 
     - name: Integration test + devtest
       run: |

.github/workflows/macos.yml

@@ -8,6 +8,8 @@ on:
       - 'lib/**.cpp'
       - 'src/**.[ch]'
       - 'src/**.cpp'
+      - 'irr/**.[ch]'
+      - 'irr/**.cpp'
       - '**/CMakeLists.txt'
       - 'cmake/Modules/**'
       - '.github/workflows/macos.yml'
@@ -33,7 +35,6 @@ jobs:
 
       - name: Build
         run: |
-          git clone https://github.com/minetest/irrlicht lib/irrlichtmt --depth 1 -b $(cat misc/irrlichtmt_tag.txt)
           mkdir build
           cd build
           cmake .. \

.github/workflows/windows.yml

@@ -8,10 +8,11 @@ on:
       - 'lib/**.cpp'
       - 'src/**.[ch]'
       - 'src/**.cpp'
+      - 'irr/**.[ch]'
+      - 'irr/**.cpp'
       - '**/CMakeLists.txt'
       - 'cmake/Modules/**'
       - 'util/buildbot/**'
-      - 'misc/irrlichtmt_tag.txt'
       - 'misc/*.manifest'
       - '.github/workflows/windows.yml'
   pull_request:
@@ -23,7 +24,6 @@ on:
       - '**/CMakeLists.txt'
       - 'cmake/Modules/**'
       - 'util/buildbot/**'
-      - 'misc/irrlichtmt_tag.txt'
       - 'misc/*.manifest'
       - '.github/workflows/windows.yml'
 
@@ -97,11 +97,6 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - 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:

.gitignore

@@ -118,7 +118,7 @@ compile_commands.json
 *.sln
 .vs/
 
-# Optional user provided library folder
+# Old irrlichtmt. Still ignored to make bisecting easier.
 lib/irrlichtmt
 
 # Generated mod storage database

CMakeLists.txt

@@ -91,27 +91,12 @@ if(ANDROID)
 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
-	)
-
-	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(TRUE)
+	message(STATUS "Using imported IrrlichtMt at subdirectory 'irr'")
 	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)
+		add_subdirectory(irr EXCLUDE_FROM_ALL)
 		unset(BUILD_SHARED_LIBS CACHE)
 
 		if(NOT TARGET IrrlichtMt)
@@ -120,44 +105,7 @@ elseif(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/lib/irrlichtmt")
 	else()
 		add_library(IrrlichtMt::IrrlichtMt INTERFACE IMPORTED)
 		set_target_properties(IrrlichtMt::IrrlichtMt PROPERTIES
-			INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/lib/irrlichtmt/include")
-	endif()
-else()
-	find_package(IrrlichtMt QUIET)
-	if(NOT TARGET IrrlichtMt::IrrlichtMt)
-		string(CONCAT explanation_msg
-			"You must install IrrlichMt as described in docs/compiling/\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.0mt15)
-	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")
+			INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_SOURCE_DIR}/irr/include")
 	endif()
 endif()
 

Dockerfile

@@ -1,7 +1,6 @@
 ARG DOCKER_IMAGE=alpine:3.19
 FROM $DOCKER_IMAGE AS dev
 
-ENV IRRLICHT_VERSION master
 ENV SPATIALINDEX_VERSION master
 ENV LUAJIT_VERSION v2.1
 
@@ -30,9 +29,7 @@ RUN git clone --recursive https://github.com/jupp0r/prometheus-cpp && \
 	git clone --recursive https://luajit.org/git/luajit.git -b ${LUAJIT_VERSION} && \
 		cd luajit && \
 		make amalg && make install && \
-	cd /usr/src/ && \
-	git clone --depth=1 https://github.com/minetest/irrlicht -b ${IRRLICHT_VERSION} && \
-		cp -r irrlicht/include /usr/include/irrlichtmt
+	cd /usr/src/
 
 FROM dev as builder
 
@@ -48,6 +45,7 @@ COPY lib /usr/src/minetest/lib
 COPY misc /usr/src/minetest/misc
 COPY po /usr/src/minetest/po
 COPY src /usr/src/minetest/src
+COPY irr /usr/src/minetest/irr
 COPY textures /usr/src/minetest/textures
 
 WORKDIR /usr/src/minetest

android/app/build.gradle

@@ -75,7 +75,7 @@ task prepareAssets() {
 			from "${projRoot}/client/shaders" into "${assetsFolder}/client/shaders"
 		}
 		copy {
-			from "../native/deps/armeabi-v7a/Irrlicht/Shaders" into "${assetsFolder}/client/shaders/Irrlicht"
+			from "${projRoot}/irr/media/Shaders" into "${assetsFolder}/client/shaders/Irrlicht"
 		}
 		copy {
 			from "${projRoot}/fonts" include "*.ttf" into "${assetsFolder}/fonts"

android/native/build.gradle

@@ -52,7 +52,7 @@ if (new File(depsDir, 'armeabi-v7a').exists()) {
 	task downloadDeps(type: Download) {
 		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,31 +1,27 @@
 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)
 set(FREETYPE_INCLUDE_DIR_freetype2 ${FREETYPE_INCLUDE_DIR_ft2build}/freetype)
+set(FREETYPE_INCLUDE_DIR_ft2build ${DEPS}/Freetype/include/freetype2)
 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_LIBRARY ${DEPS}/PNG/libpng.a)
+set(PNG_PNG_INCLUDE_DIR ${DEPS}/PNG/include)
 set(SQLITE3_INCLUDE_DIR ${DEPS}/SQLite/include)
 set(SQLITE3_LIBRARY ${DEPS}/SQLite/libsqlite3.a)
 set(VORBIS_INCLUDE_DIR ${DEPS}/Vorbis/include)
-set(VORBISFILE_LIBRARY ${DEPS}/Vorbis/libvorbisfile.a)
 set(VORBIS_LIBRARY ${DEPS}/Vorbis/libvorbis.a)
+set(VORBISFILE_LIBRARY ${DEPS}/Vorbis/libvorbisfile.a)
 set(ZSTD_INCLUDE_DIR ${DEPS}/Zstd/include)
 set(ZSTD_LIBRARY ${DEPS}/Zstd/libzstd.a)

doc/compiling/README.md

@@ -55,8 +55,6 @@ Library specific options:
     GETTEXT_LIBRARY                 - Optional/platform-dependent with gettext; path to libintl.so/libintl.dll.a
     GETTEXT_MSGFMT                  - Only when building with gettext; path to msgfmt/msgfmt.exe
     ICONV_LIBRARY                   - Optional/platform-dependent; path to libiconv.so/libiconv.dylib
-    IRRLICHT_DLL                    - Only on Windows; path to IrrlichtMt.dll
-    IRRLICHT_INCLUDE_DIR            - Directory that contains IrrCompileConfig.h (usable for server build only)
     LEVELDB_INCLUDE_DIR             - Only when building with LevelDB; directory that contains db.h
     LEVELDB_LIBRARY                 - Only when building with LevelDB; path to libleveldb.a/libleveldb.so/libleveldb.dll.a
     LEVELDB_DLL                     - Only when building with LevelDB on Windows; path to libleveldb.dll