xxx

Yubico · Sep 1, 2023 · fc583e7 · fc583e7
1 parent 2705342
commit fc583e7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/windows/build.ps1 b/windows/build.ps1
@@ -183,6 +183,7 @@ try {
 	    -DBUILD_SHARED_LIBS="${SHARED}" `
 	    -DCMAKE_C_FLAGS_DEBUG="${CFLAGS_DEBUG}" `
 	    -DCMAKE_C_FLAGS_RELEASE="${CFLAGS_RELEASE}" `
+	    -DCMAKE_MSVC_RUNTIME_LIBRARY="${CMAKE_MSVC_RUNTIME_LIBRARY}"
 	    -DCMAKE_INSTALL_PREFIX="${PREFIX}" "${CMAKE_SYSTEM_VERSION}"; `
 	    ExitOnError
 	& $CMake --build . --config ${Config} --verbose; ExitOnError

diff --git a/windows/const.ps1 b/windows/const.ps1
@@ -30,13 +30,19 @@ New-Variable -Name 'OUTPUT' -Value "$PSScriptRoot\..\output" -Option Constant
 New-Variable -Name 'STAGE' -Value "${BUILD}\${Arch}\${Type}" -Option Constant
 New-Variable -Name 'PREFIX' -Value "${OUTPUT}\${Arch}\${Type}" -Option Constant
 
+New-Varible '_RUNTIME_DYNAMIC' -Value '$<$<BOOL:${BUILD_SHARED_LIBS}>:DLL>' -Option Constant
+New-Variable '_RUNTIME_CONFIG' -Value '<$<$CONFIG:Debug>:Debug>' -Option Constant
+New-Variable 'CMAKE_MSVC_RUNTIME_LIBRARY' -Value "MultiThreaded${_RUNTIME_CONFIG}${_RUNTIME_DYNAMIC}" -Option Constant
+
 # Build flags.
 if ("${Type}" -eq "dynamic") {
 	New-Variable -Name 'RUNTIME' -Value '/MD' -Option Constant
 	New-Variable -Name 'SHARED' -Value 'ON' -Option Constant
+	New-Variable -Name 'CMAKE_RUNTIME' -Value 'MultiThreaded<$<$CONFIG:Debug>:Debug>DLL'
 } else {
 	New-Variable -Name 'RUNTIME' -Value '/MT' -Option Constant
 	New-Variable -Name 'SHARED' -Value 'OFF' -Option Constant
+	New-Variable -Name 'CMAKE_RUNTIME' -Value 'MultiThreaded<$<$CONFIG:Debug>:Debug>'
 }
 New-Variable -Name 'CFLAGS_DEBUG' -Value "${RUNTIME}d /Zi /guard:cf /sdl" `
     -Option Constant