diff --git a/build-native.cmd b/build-native.cmd
index 5c4001a..3ee67f9 100644
--- a/build-native.cmd
+++ b/build-native.cmd
@@ -5,15 +5,16 @@ set CIMGUI_ROOT=%~dp0cimgui
 set BUILD_CONFIG=Debug
 set BUILD_ARCH=x64
 set BUILD_CMAKE_GENERATOR_PLATFORM=x64
+set MSVC_RUNTIME="MultiThreadedDebug"
 
 :ArgLoop
 if [%1] == [] goto Build
-if /i [%1] == [Release] (set BUILD_CONFIG=Release&& shift & goto ArgLoop)
-if /i [%1] == [Debug] (set BUILD_CONFIG=Debug&& shift & goto ArgLoop)
-if /i [%1] == [x64] (set BUILD_ARCH=x64&& shift & goto ArgLoop)
-if /i [%1] == [ARM64] (set BUILD_ARCH=ARM64&& set BUILD_CMAKE_GENERATOR_PLATFORM=ARM64 && shift & goto ArgLoop)
-if /i [%1] == [ARM] (set BUILD_ARCH=ARM&& set BUILD_CMAKE_GENERATOR_PLATFORM=ARM && shift & goto ArgLoop)
-if /i [%1] == [x86] (set BUILD_ARCH=x86&& set BUILD_CMAKE_GENERATOR_PLATFORM=Win32 && shift & goto ArgLoop)
+if /i [%1] == [Release] (set BUILD_CONFIG=Release && set MSVC_RUNTIME=MultiThreaded && shift & goto ArgLoop)
+if /i [%1] == [Debug] (set BUILD_CONFIG=Debug && set MSVC_RUNTIME=MultiThreadedDebug && shift & goto ArgLoop)
+if /i [%1] == [x64] (set BUILD_ARCH=x64 && shift & goto ArgLoop)
+if /i [%1] == [ARM64] (set BUILD_ARCH=ARM64 && set BUILD_CMAKE_GENERATOR_PLATFORM=ARM64 && shift & goto ArgLoop)
+if /i [%1] == [ARM] (set BUILD_ARCH=ARM && set BUILD_CMAKE_GENERATOR_PLATFORM=ARM && shift & goto ArgLoop)
+if /i [%1] == [x86] (set BUILD_ARCH=x86 && set BUILD_CMAKE_GENERATOR_PLATFORM=Win32 && shift & goto ArgLoop)
 shift
 goto ArgLoop
 
@@ -24,7 +25,7 @@ If NOT exist ".\build\%BUILD_ARCH%" (
   mkdir build\%BUILD_ARCH%
 )
 pushd build\%BUILD_ARCH%
-cmake -DCMAKE_GENERATOR_PLATFORM=%BUILD_CMAKE_GENERATOR_PLATFORM% ..\..
+cmake -DCMAKE_GENERATOR_PLATFORM=%BUILD_CMAKE_GENERATOR_PLATFORM% -DCMAKE_MSVC_RUNTIME_LIBRARY=%MSVC_RUNTIME% ..\..
 
 echo Calling cmake --build . --config %BUILD_CONFIG%
 cmake --build . --config %BUILD_CONFIG%
diff --git a/cimgui b/cimgui
index 5140ea5..4ca6b29 160000
--- a/cimgui
+++ b/cimgui
@@ -1 +1 @@
-Subproject commit 5140ea5c81670200a258e233b2bf77aec42afb4a
+Subproject commit 4ca6b29166fae53f0f7dd5c89f1c673aa085ff89