4 files changed, 15 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index f0010345..50092e1c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,6 +15,7 @@ target_sources(cru_platform_base INTERFACE
 	${CRU_PLATFORM_BASE_INCLUDE_DIR}/debug.hpp
 	${CRU_PLATFORM_BASE_INCLUDE_DIR}/exception.hpp
 	${CRU_PLATFORM_BASE_INCLUDE_DIR}/graphic_base.hpp
+	${CRU_PLATFORM_BASE_INCLUDE_DIR}/heap_debug.hpp
 	${CRU_PLATFORM_BASE_INCLUDE_DIR}/matrix.hpp
 	${CRU_PLATFORM_BASE_INCLUDE_DIR}/native_resource.hpp
 	${CRU_PLATFORM_BASE_INCLUDE_DIR}/string_util.hpp
diff --git a/src/main.cpp b/src/main.cpp
index f9c0e56b..9336dda7 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -1,3 +1,4 @@
+#include "cru/platform/heap_debug.hpp"
 #include "cru/platform/native/native_window.hpp"
 #include "cru/platform/native/ui_applicaition.hpp"
 #include "cru/ui/controls/button.hpp"
@@ -12,16 +13,11 @@ using cru::ui::Window;
 using cru::ui::controls::Button;
 using cru::ui::controls::FlexLayout;
 using cru::ui::controls::TextBlock;
-/*
-int APIENTRY wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
-                      LPWSTR lpCmdLine, int nCmdShow) {
 
-*/
 
 int main() {
-
 #ifdef CRU_DEBUG
-  _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
+  cru::platform::SetupHeapDebug();
 #endif
 
   std::unique_ptr<UiApplication> application(UiApplication::CreateInstance());
diff --git a/src/win/CMakeLists.txt b/src/win/CMakeLists.txt
index 0076b3b2..d7d4ba96 100644
--- a/src/win/CMakeLists.txt
+++ b/src/win/CMakeLists.txt
@@ -3,6 +3,7 @@ set(CRU_WIN_BASE_INCLUDE_DIR ${CRU_INCLUDE_DIR}/cru/win/)
 add_library(cru_win_base STATIC
 	debug.cpp
 	exception.cpp
+	heap_debug.cpp
 	string_util.cpp
 )
 target_sources(cru_win_base PUBLIC
diff --git a/src/win/heap_debug.cpp b/src/win/heap_debug.cpp
new file mode 100644
index 00000000..33ebae7c
--- /dev/null
+++ b/src/win/heap_debug.cpp
@@ -0,0 +1,11 @@
+#include "cru/win/win_pre_config.hpp"
+
+#include "cru/platform/heap_debug.hpp"
+
+#include <crtdbg.h>
+
+namespace cru::platform {
+void SetupHeapDebug() {
+  _CrtSetDbgFlag(_CRTDBG_ALLOC_MEM_DF | _CRTDBG_LEAK_CHECK_DF);
+}
+}