neru/HexUnlocked
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

build: misc cmakelist fixes
Build / build (push) Failing after 4m55s
Details

Browse Source
This commit is contained in:
neru
2026-06-20 07:03:01 -03:00
parent 037260acd5
commit d390304577
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+4 -6
View File
@@ -11,14 +11,13 @@ add_compile_definitions(WIN32_LEAN_AND_MEAN NOMINMAX)
project(hex-unlocked LANGUAGES CXX) project(hex-unlocked LANGUAGES CXX)
set_property(GLOBAL PROPERTY USE_FOLDERS ON) set_property(GLOBAL PROPERTY USE_FOLDERS ON)
if(MSVC) enable_language(RC)
if(CMAKE_GENERATOR MATCHES "Visual Studio")
add_compile_options(/EHsc /utf-8 /Zc:char8_t) add_compile_options(/EHsc /utf-8 /Zc:char8_t)
if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
add_compile_definitions(_AMD64_)
endif()
else() else()
add_compile_options(-m64) add_compile_options(-m64)
enable_language(RC) add_link_options(-static -static-libgcc -static-libstdc++)
endif() endif()
# ------------------------------ # ------------------------------
@@ -38,7 +37,6 @@ endif()
# msvc stuff # msvc stuff
# ------------------------------ # ------------------------------
if(CMAKE_GENERATOR MATCHES "Visual Studio") if(CMAKE_GENERATOR MATCHES "Visual Studio")
string(APPEND CMAKE_CXX_FLAGS " /EHsc /DWIN32_LEAN_AND_MEAN /utf-8 /Zc:char8_t")
if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64")
string(APPEND CMAKE_CXX_FLAGS " /D_AMD64_") string(APPEND CMAKE_CXX_FLAGS " /D_AMD64_")
elseif(CMAKE_GENERATOR_PLATFORM STREQUAL "Win32") elseif(CMAKE_GENERATOR_PLATFORM STREQUAL "Win32")