debug icu

cmake/CompilerFlags.cmake

@@ -50,7 +50,6 @@ endif()
 if(DEBUG)
   register_compiler_flags(
     DESCRIPTION "Disable optimization"
-    /O0 ${WIN32}
     -O0 ${UNIX}
   )
 elseif(ENABLE_SMOL)

cmake/targets/BuildBun.cmake

@@ -883,13 +883,23 @@ set_target_properties(${bun} PROPERTIES LINK_DEPENDS ${BUN_SYMBOLS_PATH})
 include(SetupWebKit)
 
 if(WIN32)
-  target_link_libraries(${bun} PRIVATE
-    ${WEBKIT_LIB_PATH}/WTF.lib
-    ${WEBKIT_LIB_PATH}/JavaScriptCore.lib
-    ${WEBKIT_LIB_PATH}/sicudt.lib
-    ${WEBKIT_LIB_PATH}/sicuin.lib
-    ${WEBKIT_LIB_PATH}/sicuuc.lib
-  )
+  if(DEBUG)
+    target_link_libraries(${bun} PRIVATE
+      ${WEBKIT_LIB_PATH}/WTF.lib
+      ${WEBKIT_LIB_PATH}/JavaScriptCore.lib
+      ${WEBKIT_LIB_PATH}/sicudtd.lib
+      ${WEBKIT_LIB_PATH}/sicuind.lib
+      ${WEBKIT_LIB_PATH}/sicuucd.lib
+    )
+  else()
+    target_link_libraries(${bun} PRIVATE
+      ${WEBKIT_LIB_PATH}/WTF.lib
+      ${WEBKIT_LIB_PATH}/JavaScriptCore.lib
+      ${WEBKIT_LIB_PATH}/sicudt.lib
+      ${WEBKIT_LIB_PATH}/sicuin.lib
+      ${WEBKIT_LIB_PATH}/sicuuc.lib
+    )
+  endif()
 else()
   target_link_libraries(${bun} PRIVATE
     ${WEBKIT_LIB_PATH}/libWTF.a

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()

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
     .
 )