Merge tag '1.5.4'

Author: FriskTheFallenHuman

neo/CMakeLists.txt

@@ -301,11 +301,11 @@ if( D3_COMPILER_IS_GCC_OR_CLANG )
 		add_definitions(-DMACOS_X=1)
 
 		if( cpu STREQUAL "x86_64" )
-			add_compile_options( -arch x86_64 -mmacosx-version-min=10.9 )
-			set( ldflags "${ldflags} -arch x86_64 -mmacosx-version-min=10.9" )
+			add_compile_options( -arch x86_64 -mmacosx-version-min=10.7 )
+			set( ldflags "${ldflags} -arch x86_64 -mmacosx-version-min=10.7" )
 		elseif( cpu STREQUAL "arm64" )
-			add_compile_options( -arch arm64 -mmacosx-version-min=11.0 )
-			set( ldflags "${ldflags} -arch arm64 -mmacosx-version-min=11.0" )
+			add_compile_options( -arch arm64 -mmacosx-version-min=10.7 )
+			set( ldflags "${ldflags} -arch arm64 -mmacosx-version-min=10.7" )
 		elseif( cpu STREQUAL "x86" )
 			CHECK_CXX_COMPILER_FLAG( "-arch i386" cxx_has_arch_i386 )
 			if( cxx_has_arch_i386 )

neo/framework/Licensee.h

@@ -35,12 +35,12 @@ If you have questions concerning this license or the applicable additional terms
 */
 
 #define GAME_NAME						"dhewm 3"		// appears in errors
-#define ENGINE_VERSION					"dhewm3 1.5.4rc3"	// printed in console, used for window title
+#define ENGINE_VERSION					"dhewm3 1.5.4"	// printed in console, used for window title
 
 #ifdef ID_REPRODUCIBLE_BUILD
 	// for reproducible builds we hardcode values that would otherwise come from __DATE__ and __TIME__
 	// NOTE: remember to update esp. the date for (pre-) releases and RCs and the like
-	#define ID__DATE__  "Jul 29 2024"
+	#define ID__DATE__  "Aug 03 2024"
 	#define ID__TIME__  "13:37:42"
 
 #else // not reproducible build, use __DATE__ and __TIME__ macros