From 29abbb79fb97332c8b4b105f20cfeaacfd32f0b2 Mon Sep 17 00:00:00 2001 From: shweet Date: Sun, 11 Jan 2026 17:25:42 -0500 Subject: [PATCH] cmakelists fix --- CMakeLists.txt | 41 ++++++++++++++++++++++++++++------------- compile_commands.json | 2 +- 2 files changed, 29 insertions(+), 14 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5ed7f3d..7320827 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -125,21 +125,26 @@ target_include_directories( src/resource src/util) +if(NOT CMAKE_BUILD_TYPE) + set(CMAKE_BUILD_TYPE "Release") +endif() + +if(CMAKE_BUILD_TYPE STREQUAL "Debug") + target_compile_definitions(${PROJECT_NAME} PRIVATE DEBUG) +endif() + if(WIN32) - enable_language(RC) - target_sources(${PROJECT_NAME} PRIVATE anm2ed.rc) - - target_compile_options(${PROJECT_NAME} PRIVATE /EHsc) - target_link_options(${PROJECT_NAME} PRIVATE /STACK:0xffffff) - - target_link_options( - ${PROJECT_NAME} - PRIVATE "$<$,$>:/SUBSYSTEM:WINDOWS>" - "$<$,$>>:-mwindows>") + # Keep Release as a GUI app (no console window). + if(CMAKE_BUILD_TYPE STREQUAL "Release") + if(MSVC) + target_link_options(${PROJECT_NAME} PRIVATE /SUBSYSTEM:WINDOWS) + else() + target_link_options(${PROJECT_NAME} PRIVATE -mwindows) + endif() + endif() else() target_compile_options(${PROJECT_NAME} PRIVATE -Wall -Wextra -pedantic) if(CMAKE_BUILD_TYPE STREQUAL "Debug") - target_compile_definitions(${PROJECT_NAME} PRIVATE DEBUG) target_compile_options(${PROJECT_NAME} PRIVATE -O0 -pg) else() set(CMAKE_BUILD_TYPE "Release") @@ -148,10 +153,20 @@ else() target_link_libraries(${PROJECT_NAME} PRIVATE m) endif() +if(WIN32) + enable_language(RC) + target_sources(${PROJECT_NAME} PRIVATE anm2ed.rc) +endif() + if(MSVC) target_compile_options(${PROJECT_NAME} PRIVATE "$<$:/std:c++latest>") - target_compile_options(${PROJECT_NAME} PRIVATE "$<$:/Zi>") - target_link_options(${PROJECT_NAME} PRIVATE "$<$:/DEBUG>") + target_compile_options(${PROJECT_NAME} PRIVATE /EHsc) + target_link_options(${PROJECT_NAME} PRIVATE /STACK:0xffffff) + + if(CMAKE_BUILD_TYPE STREQUAL "Debug") + target_compile_options(${PROJECT_NAME} PRIVATE /Zi) + target_link_options(${PROJECT_NAME} PRIVATE /DEBUG) + endif() endif() if(WIN32) diff --git a/compile_commands.json b/compile_commands.json index 5e95284..5098ae4 120000 --- a/compile_commands.json +++ b/compile_commands.json @@ -1 +1 @@ -/home/anon/sda/Personal/Repos/anm2ed/build/compile_commands.json \ No newline at end of file +/home/anon/sda/Personal/Repos/anm2ed/build-cmake-nogen/compile_commands.json \ No newline at end of file