From eb6710691bf0c41b7692bc0e94a1740f5119c298 Mon Sep 17 00:00:00 2001 From: KiritoDv Date: Sat, 23 Sep 2023 22:41:04 -0600 Subject: [PATCH] Fixed windows compilation --- CMakeLists.txt | 16 ++++++++-------- bin/segment2.c | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index dfebe184..2861b567 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,8 +13,6 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment ve # Set the C++ standard and enable the MSVC parallel build option set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use") set(CMAKE_C_STANDARD 11 CACHE STRING "The C standard to use") -add_compile_options($<$:/MP>) -add_compile_options($<$:/MT>) #add_compile_options(-fsanitize=address) #add_link_options(-fsanitize=address) @@ -320,14 +318,15 @@ if(MSVC) target_compile_options(${PROJECT_NAME} PRIVATE $<$: /w; - /Od + /Od; + /MTd > $<$: /Oi; /Gy; - /W3 + /W3; + /MT > - /sdl-; /permissive-; /MP; ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT}; @@ -337,16 +336,17 @@ if(MSVC) elseif("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "Win32") target_compile_options(${PROJECT_NAME} PRIVATE $<$: - /RTCs + /RTCs; + /MTd > $<$: /O2; /Oi; - /Gy + /Gy; + /MT > /permissive-; /MP; - /sdl-; /w; ${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT}; ${DEFAULT_CXX_EXCEPTION_HANDLING} diff --git a/bin/segment2.c b/bin/segment2.c index 08b3ad67..4ef6706c 100644 --- a/bin/segment2.c +++ b/bin/segment2.c @@ -941,8 +941,8 @@ const Texture *const main_hud_lut[] = { }; // Main small font print table 0x02008338-0x02008737 -const Texture *const main_font_lut_eu[] = { #ifdef VERSION_EU // EU Font Table +const Texture *const main_font_lut_eu[] = { texture_font_char_eu_0, texture_font_char_eu_1, texture_font_char_eu_2, texture_font_char_eu_3, texture_font_char_eu_4, texture_font_char_eu_5, texture_font_char_eu_6, texture_font_char_eu_7, texture_font_char_eu_8, texture_font_char_eu_9, texture_font_char_eu_A, texture_font_char_eu_B, @@ -1009,8 +1009,8 @@ const Texture *const main_font_lut_eu[] = { texture_font_char_eu_interpunct, texture_font_char_eu_star_hollow, 0x0, 0x0, -#endif }; +#endif const Texture *const main_font_lut_us[] = { // US Font Table