Fixed windows compilation

This commit is contained in:
KiritoDv
2023-09-23 22:41:04 -06:00
parent 90607b162e
commit eb6710691b
2 changed files with 10 additions and 10 deletions
+8 -8
View File
@@ -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($<$<CXX_COMPILER_ID:MSVC>:/MP>)
add_compile_options($<$<CXX_COMPILER_ID:MSVC>:/MT>)
#add_compile_options(-fsanitize=address)
#add_link_options(-fsanitize=address)
@@ -320,14 +318,15 @@ if(MSVC)
target_compile_options(${PROJECT_NAME} PRIVATE
$<$<CONFIG:Debug>:
/w;
/Od
/Od;
/MTd
>
$<$<CONFIG:Release>:
/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
$<$<CONFIG:Debug>:
/RTCs
/RTCs;
/MTd
>
$<$<CONFIG:Release>:
/O2;
/Oi;
/Gy
/Gy;
/MT
>
/permissive-;
/MP;
/sdl-;
/w;
${DEFAULT_CXX_DEBUG_INFORMATION_FORMAT};
${DEFAULT_CXX_EXCEPTION_HANDLING}
+2 -2
View File
@@ -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