From 3c0327df3acf5411b2760ca8c61586ce54de3d0c Mon Sep 17 00:00:00 2001 From: Dylan Conway Date: Thu, 12 Sep 2024 21:24:10 -0700 Subject: [PATCH] debug libraries --- cmake/CompilerFlags.cmake | 1 - cmake/targets/BuildMimalloc.cmake | 6 +++++- cmake/targets/BuildZlib.cmake | 13 +++++++++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/cmake/CompilerFlags.cmake b/cmake/CompilerFlags.cmake index 14e634f692..9ac64f4c0b 100644 --- a/cmake/CompilerFlags.cmake +++ b/cmake/CompilerFlags.cmake @@ -50,7 +50,6 @@ endif() if(DEBUG) register_compiler_flags( DESCRIPTION "Disable optimization" - /O0 ${WIN32} -O0 ${UNIX} ) elseif(ENABLE_SMOL) diff --git a/cmake/targets/BuildMimalloc.cmake b/cmake/targets/BuildMimalloc.cmake index 48d3fe5224..2161e20603 100644 --- a/cmake/targets/BuildMimalloc.cmake +++ b/cmake/targets/BuildMimalloc.cmake @@ -28,7 +28,11 @@ if(ENABLE_VALGRIND) endif() if(WIN32) - set(MIMALLOC_LIBRARY mimalloc-static) + if(DEBUG) + set(MIMALLOC_LIBRARY mimalloc-static-debug) + else() + set(MIMALLOC_LIBRARY mimalloc-static) + endif() elseif(DEBUG) set(MIMALLOC_LIBRARY mimalloc-debug) else() diff --git a/cmake/targets/BuildZlib.cmake b/cmake/targets/BuildZlib.cmake index cc98acde74..1940bb2e33 100644 --- a/cmake/targets/BuildZlib.cmake +++ b/cmake/targets/BuildZlib.cmake @@ -13,6 +13,16 @@ if(APPLE) set(ZLIB_CMAKE_CXX_FLAGS "-fno-define-target-os-macros") endif() +if(WIN32) + if(DEBUG) + set(ZLIB_LIBRARY "zlibd") + else() + set(ZLIB_LIBRARY "zlib") + endif() +else() + set(ZLIB_LIBRARY "z") +endif() + register_cmake_command( TARGET zlib @@ -24,8 +34,7 @@ register_cmake_command( "-DCMAKE_C_FLAGS=${ZLIB_CMAKE_C_FLAGS}" "-DCMAKE_CXX_FLAGS=${ZLIB_CMAKE_CXX_FLAGS}" LIBRARIES - zlib WIN32 - z UNIX + ${ZLIB_LIBRARY} INCLUDES . )