|
|
@@ -91,11 +91,22 @@ protected: |
|
|
MSVCBuildConfiguration (Project& project, const ValueTree& settings)
|
|
|
MSVCBuildConfiguration (Project& project, const ValueTree& settings)
|
|
|
: BuildConfiguration (project, settings)
|
|
|
: BuildConfiguration (project, settings)
|
|
|
{
|
|
|
{
|
|
|
|
|
|
if (getWarningLevel() == 0)
|
|
|
|
|
|
getWarningLevelValue() = 4;
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
Value getWarningLevelValue() const { return getValue (Ids::winWarningLevel); }
|
|
|
|
|
|
int getWarningLevel() const { return getWarningLevelValue().getValue(); }
|
|
|
|
|
|
|
|
|
void createPropertyEditors (PropertyListBuilder& props)
|
|
|
void createPropertyEditors (PropertyListBuilder& props)
|
|
|
{
|
|
|
{
|
|
|
createBasicPropertyEditors (props);
|
|
|
createBasicPropertyEditors (props);
|
|
|
|
|
|
|
|
|
|
|
|
const char* const warningLevelNames[] = { "Low", "Medium", "High", nullptr };
|
|
|
|
|
|
const int warningLevels[] = { 2, 3, 4, 0 };
|
|
|
|
|
|
|
|
|
|
|
|
props.add (new ChoicePropertyComponent (getWarningLevelValue(), "Warning Level",
|
|
|
|
|
|
StringArray (warningLevelNames), Array<var> (warningLevels)));
|
|
|
}
|
|
|
}
|
|
|
};
|
|
|
};
|
|
|
|
|
|
|
|
|
@@ -104,6 +115,11 @@ protected: |
|
|
return new MSVCBuildConfiguration (project, settings);
|
|
|
return new MSVCBuildConfiguration (project, settings);
|
|
|
}
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static int getWarningLevel (const BuildConfiguration& config)
|
|
|
|
|
|
{
|
|
|
|
|
|
return dynamic_cast <const MSVCBuildConfiguration&> (config).getWarningLevel();
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
//==============================================================================
|
|
|
//==============================================================================
|
|
|
String getIntermediatesPath (const BuildConfiguration& config) const
|
|
|
String getIntermediatesPath (const BuildConfiguration& config) const
|
|
|
{
|
|
|
{
|
|
|
@@ -601,7 +617,7 @@ protected: |
|
|
compiler->setAttribute ("AssemblerListingLocation", FileHelpers::windowsStylePath (intermediatesPath + "/"));
|
|
|
compiler->setAttribute ("AssemblerListingLocation", FileHelpers::windowsStylePath (intermediatesPath + "/"));
|
|
|
compiler->setAttribute ("ObjectFile", FileHelpers::windowsStylePath (intermediatesPath + "/"));
|
|
|
compiler->setAttribute ("ObjectFile", FileHelpers::windowsStylePath (intermediatesPath + "/"));
|
|
|
compiler->setAttribute ("ProgramDataBaseFileName", FileHelpers::windowsStylePath (intermediatesPath + "/"));
|
|
|
compiler->setAttribute ("ProgramDataBaseFileName", FileHelpers::windowsStylePath (intermediatesPath + "/"));
|
|
|
compiler->setAttribute ("WarningLevel", "4");
|
|
|
|
|
|
|
|
|
compiler->setAttribute ("WarningLevel", String (getWarningLevel (config)));
|
|
|
compiler->setAttribute ("SuppressStartupBanner", "true");
|
|
|
compiler->setAttribute ("SuppressStartupBanner", "true");
|
|
|
|
|
|
|
|
|
const String extraFlags (replacePreprocessorTokens (config, getExtraCompilerFlags().toString()).trim());
|
|
|
const String extraFlags (replacePreprocessorTokens (config, getExtraCompilerFlags().toString()).trim());
|
|
|
@@ -1264,7 +1280,7 @@ protected: |
|
|
cl->createNewChildElement ("AssemblerListingLocation")->addTextElement (FileHelpers::windowsStylePath (intermediatesPath + "/"));
|
|
|
cl->createNewChildElement ("AssemblerListingLocation")->addTextElement (FileHelpers::windowsStylePath (intermediatesPath + "/"));
|
|
|
cl->createNewChildElement ("ObjectFileName")->addTextElement (FileHelpers::windowsStylePath (intermediatesPath + "/"));
|
|
|
cl->createNewChildElement ("ObjectFileName")->addTextElement (FileHelpers::windowsStylePath (intermediatesPath + "/"));
|
|
|
cl->createNewChildElement ("ProgramDataBaseFileName")->addTextElement (FileHelpers::windowsStylePath (intermediatesPath + "/"));
|
|
|
cl->createNewChildElement ("ProgramDataBaseFileName")->addTextElement (FileHelpers::windowsStylePath (intermediatesPath + "/"));
|
|
|
cl->createNewChildElement ("WarningLevel")->addTextElement ("Level4");
|
|
|
|
|
|
|
|
|
cl->createNewChildElement ("WarningLevel")->addTextElement ("Level" + String (getWarningLevel (*config)));
|
|
|
cl->createNewChildElement ("SuppressStartupBanner")->addTextElement ("true");
|
|
|
cl->createNewChildElement ("SuppressStartupBanner")->addTextElement ("true");
|
|
|
cl->createNewChildElement ("MultiProcessorCompilation")->addTextElement ("true");
|
|
|
cl->createNewChildElement ("MultiProcessorCompilation")->addTextElement ("true");
|
|
|
|
|
|
|
|
|
|