diff --git a/modules/vstudio/vs2010_vcxproj.lua b/modules/vstudio/vs2010_vcxproj.lua index 8c64149e..aa0372df 100644 --- a/modules/vstudio/vs2010_vcxproj.lua +++ b/modules/vstudio/vs2010_vcxproj.lua @@ -2199,6 +2199,8 @@ local runtimes = { StaticDebug = "MultiThreadedDebug", StaticRelease = "MultiThreaded", + StaticDLLDebug = "MultiThreadedDebugDLL", + StaticDLLRelease = "MultiThreadedDLL" } local runtime = runtimes[config.getruntime(cfg)] if runtime then diff --git a/src/base/config.lua b/src/base/config.lua index ed9044d0..12fa9910 100755 --- a/src/base/config.lua +++ b/src/base/config.lua @@ -327,6 +327,10 @@ function config.getruntime(cfg) local linkage = iif(cfg.flags.StaticRuntime, "Static", "Shared") + + if cfg.clr == "On" and cfg.flags.StaticRuntime then + linkage = linkage .. "DLL" + end if not cfg.runtime then return linkage .. iif(config.isDebugBuild(cfg), "Debug", "Release") else