From 5095bea44a95742f358dd5a21198ea8157d1bf1f Mon Sep 17 00:00:00 2001 From: ed Date: Tue, 9 Jan 2018 09:47:04 +0000 Subject: [PATCH] Projucer: Use dynamic runtime linking by default on Windows --- .../Source/ProjectSaving/jucer_ProjectExport_MSVC.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_MSVC.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_MSVC.h index 269d247786..f1d8f26336 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_MSVC.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_MSVC.h @@ -542,7 +542,7 @@ public: cl->createNewChildElement ("AdditionalIncludeDirectories")->addTextElement (includePaths.joinIntoString (";")); cl->createNewChildElement ("PreprocessorDefinitions")->addTextElement (getPreprocessorDefs (config, ";") + ";%(PreprocessorDefinitions)"); - const bool runtimeDLL = shouldUseRuntimeDLL (config); + const bool runtimeDLL = config.isUsingRuntimeLibDLL(); cl->createNewChildElement ("RuntimeLibrary")->addTextElement (runtimeDLL ? (isDebug ? "MultiThreadedDebugDLL" : "MultiThreadedDLL") : (isDebug ? "MultiThreadedDebug" : "MultiThreaded")); cl->createNewChildElement ("RuntimeTypeInfo")->addTextElement ("true"); @@ -1264,12 +1264,6 @@ public: return {}; } - bool shouldUseRuntimeDLL (const MSVCBuildConfiguration& config) const - { - return (config.config [Ids::useRuntimeLibDLL].isVoid() ? (getOwner().hasTarget (AAXPlugIn) || getOwner().hasTarget (RTASPlugIn)) - : config.isUsingRuntimeLibDLL()); - } - File getVCProjFile() const { return getOwner().getProjectFile (getProjectFileSuffix(), getName()); } File getVCProjFiltersFile() const { return getOwner().getProjectFile (getFiltersFileSuffix(), getName()); }