Adjust build config for Irrlicht changes (again)

Author: sfan5

.gitlab-ci.yml

@@ -9,7 +9,7 @@ stages:
   - deploy
 
 variables:
-  IRRLICHT_TAG: "1.9.0mt0"
+  IRRLICHT_TAG: "1.9.0mt1"
   MINETEST_GAME_REPO: "https://github.com/minetest/minetest_game.git"
   CONTAINER_IMAGE: registry.gitlab.com/$CI_PROJECT_PATH
 

README.md

@@ -259,9 +259,9 @@ Library specific options:
     GETTEXT_INCLUDE_DIR             - Only when building with gettext; directory that contains iconv.h
     GETTEXT_LIBRARY                 - Only when building with gettext on Windows; path to libintl.dll.a
     GETTEXT_MSGFMT                  - Only when building with gettext; path to msgfmt/msgfmt.exe
-    IRRLICHT_DLL                    - Only on Windows; path to Irrlicht.dll
+    IRRLICHT_DLL                    - Only on Windows; path to IrrlichtMt.dll
     IRRLICHT_INCLUDE_DIR            - Directory that contains IrrCompileConfig.h
-    IRRLICHT_LIBRARY                - Path to libIrrlicht.a/libIrrlicht.so/libIrrlicht.dll.a/Irrlicht.lib
+    IRRLICHT_LIBRARY                - Path to libIrrlichtMt.a/libIrrlichtMt.so/libIrrlichtMt.dll.a/IrrlichtMt.lib
     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

cmake/Modules/FindIrrlicht.cmake

@@ -3,24 +3,31 @@ mark_as_advanced(IRRLICHT_LIBRARY IRRLICHT_INCLUDE_DIR IRRLICHT_DLL)
 
 # Find include directory and libraries
 
-if(TRUE)
+# find our fork first, then upstream (TODO: remove this?)
+foreach(libname IN ITEMS IrrlichtMt Irrlicht)
+	string(TOLOWER "${libname}" libname2)
+
 	find_path(IRRLICHT_INCLUDE_DIR NAMES irrlicht.h
-		DOC "Path to the directory with Irrlicht includes"
+		DOC "Path to the directory with IrrlichtMt includes"
 		PATHS
-		/usr/local/include/irrlicht
-		/usr/include/irrlicht
-		/system/develop/headers/irrlicht #Haiku
-		PATH_SUFFIXES "include/irrlicht"
+		/usr/local/include/${libname2}
+		/usr/include/${libname2}
+		/system/develop/headers/${libname2} #Haiku
+		PATH_SUFFIXES "include/${libname2}"
 	)
 
-	find_library(IRRLICHT_LIBRARY NAMES libIrrlicht Irrlicht
-		DOC "Path to the Irrlicht library file"
+	find_library(IRRLICHT_LIBRARY NAMES lib${libname} ${libname}
+		DOC "Path to the IrrlichtMt library file"
 		PATHS
 		/usr/local/lib
 		/usr/lib
 		/system/develop/lib # Haiku
 	)
-endif()
+
+	if(IRRLICHT_INCLUDE_DIR OR IRRLICHT_LIBRARY)
+		break()
+	endif()
+endforeach()
 
 # Users will likely need to edit these
 mark_as_advanced(CLEAR IRRLICHT_LIBRARY IRRLICHT_INCLUDE_DIR)
@@ -29,8 +36,8 @@ mark_as_advanced(CLEAR IRRLICHT_LIBRARY IRRLICHT_INCLUDE_DIR)
 if(WIN32)
 	# If VCPKG_APPLOCAL_DEPS is ON, dll's are automatically handled by VCPKG
 	if(NOT VCPKG_APPLOCAL_DEPS)
-		find_file(IRRLICHT_DLL NAMES Irrlicht.dll
-			DOC "Path of the Irrlicht dll (for installation)"
+		find_file(IRRLICHT_DLL NAMES IrrlichtMt.dll
+			DOC "Path of the IrrlichtMt dll (for installation)"
 		)
 	endif()
 endif(WIN32)

util/buildbot/buildwin32.sh

@@ -31,7 +31,7 @@ if [ -z "$toolchain_file" ]; then
 fi
 echo "Using $toolchain_file"
 
-irrlicht_version=1.9.0mt0
+irrlicht_version=1.9.0mt1
 ogg_version=1.3.2
 vorbis_version=1.3.5
 curl_version=7.65.3
@@ -122,8 +122,8 @@ cmake .. \
 	-DENABLE_FREETYPE=1 \
 	-DENABLE_LEVELDB=1 \
 	\
-	-DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht/include/irrlicht \
-	-DIRRLICHT_LIBRARY=$libdir/irrlicht/lib/libIrrlicht.dll.a \
+	-DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht/include/irrlichtmt \
+	-DIRRLICHT_LIBRARY=$libdir/irrlicht/lib/libIrrlichtMt.dll.a \
 	-DIRRLICHT_DLL="$irr_dlls" \
 	\
 	-DZLIB_INCLUDE_DIR=$libdir/zlib/include \

util/buildbot/buildwin64.sh

@@ -20,7 +20,7 @@ packagedir=$builddir/packages
 libdir=$builddir/libs
 
 toolchain_file=$dir/toolchain_x86_64-w64-mingw32.cmake
-irrlicht_version=1.9.0mt0
+irrlicht_version=1.9.0mt1
 ogg_version=1.3.2
 vorbis_version=1.3.5
 curl_version=7.65.3
@@ -112,8 +112,8 @@ cmake .. \
 	-DENABLE_FREETYPE=1 \
 	-DENABLE_LEVELDB=1 \
 	\
-	-DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht/include/irrlicht \
-	-DIRRLICHT_LIBRARY=$libdir/irrlicht/lib/libIrrlicht.dll.a \
+	-DIRRLICHT_INCLUDE_DIR=$libdir/irrlicht/include/irrlichtmt \
+	-DIRRLICHT_LIBRARY=$libdir/irrlicht/lib/libIrrlichtMt.dll.a \
 	-DIRRLICHT_DLL="$irr_dlls" \
 	\
 	-DZLIB_INCLUDE_DIR=$libdir/zlib/include \

util/ci/common.sh

@@ -12,7 +12,7 @@ install_linux_deps() {
 		shift
 		pkgs+=(libirrlicht-dev)
 	else
-		wget "https://github.com/minetest/irrlicht/releases/download/1.9.0mt0/ubuntu-bionic.tar.gz"
+		wget "https://github.com/minetest/irrlicht/releases/download/1.9.0mt1/ubuntu-bionic.tar.gz"
 		sudo tar -xaf ubuntu-bionic.tar.gz -C /usr/local
 	fi