Fix the debug build

ParadoxGameConverters · Dec 15, 2024 · ce79a40 · ce79a40
1 parent 16b2834
commit ce79a40
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.16)
+cmake_minimum_required(VERSION 3.25)
 set(VERBOSE true)
 
 project(Vic3ToHoi4)
@@ -353,8 +353,13 @@ if (PLATFORM STREQUAL "Windows")
 	configure_file("external/Fronter/Fronter/Resources/libcrypto-1_1-x64.dll" "${FRONTER_OUTPUT_DIRECTORY}" COPYONLY)
 	configure_file("external/Fronter/Fronter/Resources/libssl-1_1-x64.dll" "${FRONTER_OUTPUT_DIRECTORY}" COPYONLY)
 	configure_file("external/Fronter/external/curl/bin/libcurl-x64.dll" "${FRONTER_OUTPUT_DIRECTORY}" COPYONLY)
+if (CMAKE_BUILD_TYPE STREQUAL "Release")
 	configure_file("external/Fronter/external/wxWidgets/3.2.1/lib/vc14x_x64_dll/wxbase32u_vc14x_x64.dll" "${FRONTER_OUTPUT_DIRECTORY}" COPYONLY)
 	configure_file("external/Fronter/external/wxWidgets/3.2.1/lib/vc14x_x64_dll/wxmsw32u_core_vc14x_x64.dll" "${FRONTER_OUTPUT_DIRECTORY}" COPYONLY)
+elseif (CMAKE_BUILD_TYPE STREQUAL "Debug")
+	configure_file("external/Fronter/external/wxWidgets/3.2.1/lib/vc14x_x64_dll/wxbase32ud_vc14x_x64.dll" "${FRONTER_OUTPUT_DIRECTORY}" COPYONLY)
+	configure_file("external/Fronter/external/wxWidgets/3.2.1/lib/vc14x_x64_dll/wxmsw32ud_core_vc14x_x64.dll" "${FRONTER_OUTPUT_DIRECTORY}" COPYONLY)
+endif (PLATFORM STREQUAL "Release")
 	file(GLOB FRONTER_CONFIG "data/fronter/*")
 	file(COPY ${FRONTER_CONFIG} DESTINATION "${FRONTER_OUTPUT_DIRECTORY}/Configuration/")
 	file(GLOB LOCALIZATIONS "external/Fronter/Fronter/Resources/*.yml")

diff --git a/external/Fronter b/external/Fronter
diff --git a/external/commonItems b/external/commonItems
diff --git a/src/configuration/configuration.h b/src/configuration/configuration.h
@@ -114,11 +114,11 @@ struct Configuration
    }
 };
 
-constexpr Configuration defaultConfig = {};
-constexpr Configuration debugConfig = {.debug = true};
+const Configuration defaultConfig = {};
+const Configuration debugConfig = {.debug = true};
 
 
 }  // namespace configuration
 
 
-#endif  // SRC_CONFIGURATION_CONFIGURATION_H
+#endif  // SRC_CONFIGURATION_CONFIGURATION_H
+1 −1		Localization/LocalizationDatabase.cpp
+1 −1		external/googletest