From 42d94b7f449ec845f4531ac9de02cd6e127d9019 Mon Sep 17 00:00:00 2001 From: neru Date: Fri, 19 Jun 2026 11:39:39 -0300 Subject: [PATCH] build: mingw fixes, again --- CMakeLists.txt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d59af9b..037cf25 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,12 +5,16 @@ include(FetchContent) cmake_minimum_required(VERSION 3.25.0) set(CMAKE_CXX_STANDARD 20) + +add_compile_definitions(WIN32_LEAN_AND_MEAN NOMINMAX) + if(MSVC) - set(CMAKE_CXX_FLAGS "/EHsc /D_AMD64_ /DWIN32_LEAN_AND_MEAN /DVC_EXTRA_LEAN") - set(CMAKE_CXX_FLAGS_RELEASE "/O2 /DNDEBUG") + add_compile_options(/EHsc /utf-8 /Zc:char8_t) + if("${CMAKE_VS_PLATFORM_NAME}" STREQUAL "x64") + add_compile_definitions(_AMD64_) + endif() else() - set(CMAKE_CXX_FLAGS "-D_AMD64_ -DWIN32_LEAN_AND_MEAN -DVC_EXTRA_LEAN") - set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") + add_compile_options(-m64) endif() project(hex-unlocked LANGUAGES CXX) @@ -135,7 +139,7 @@ endif() file(GLOB_RECURSE UNLOCKER_SOURCES CONFIGURE_DEPENDS "src/unlocker/*.cpp" "src/unlocker/*.h") add_executable(hex-unlocked ${UNLOCKER_SOURCES}) -target_link_libraries(hex-unlocked PRIVATE hex-warned seallib glaze::glaze tinymitm wininet ixwebsocket) +target_link_libraries(hex-unlocked PRIVATE hex-warned seallib glaze::glaze tinymitm wininet ixwebsocket crypt32) # rnd exe name string(RANDOM LENGTH 12 ALPHABET "abcdefghijklmnopqrstuvwxyz0123456789" RANDOM_EXE_NAME)