|
|
|
@@ -450,7 +450,7 @@ private: |
|
|
|
&& cfgHeaderPaths.size() == 0 && cfgLibraryPaths.size() == 0)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
mo << (first ? "IF" : "ELSEIF") << "(JUCE_BUILD_CONFIGFURATION MATCHES \"" << cfg.getProductFlavourCMakeIdentifier() <<"\")" << newLine;
|
|
|
|
mo << (first ? "IF" : "ELSEIF") << "(JUCE_BUILD_CONFIGURATION MATCHES \"" << cfg.getProductFlavourCMakeIdentifier() <<"\")" << newLine;
|
|
|
|
|
|
|
|
if (isLibrary())
|
|
|
|
mo << " SET(BINARY_NAME \"" << getNativeModuleBinaryName (cfg) << "\")" << newLine;
|
|
|
|
@@ -487,9 +487,9 @@ private: |
|
|
|
{
|
|
|
|
if (const auto* cfg = dynamic_cast<const AndroidBuildConfiguration*> (config.get()))
|
|
|
|
{
|
|
|
|
mo << "ELSE(JUCE_BUILD_CONFIGFURATION MATCHES \"" << cfg->getProductFlavourCMakeIdentifier() <<"\")" << newLine;
|
|
|
|
mo << "ELSE(JUCE_BUILD_CONFIGURATION MATCHES \"" << cfg->getProductFlavourCMakeIdentifier() <<"\")" << newLine;
|
|
|
|
mo << " MESSAGE( FATAL_ERROR \"No matching build-configuration found.\" )" << newLine;
|
|
|
|
mo << "ENDIF(JUCE_BUILD_CONFIGFURATION MATCHES \"" << cfg->getProductFlavourCMakeIdentifier() <<"\")" << newLine << newLine;
|
|
|
|
mo << "ENDIF(JUCE_BUILD_CONFIGURATION MATCHES \"" << cfg->getProductFlavourCMakeIdentifier() <<"\")" << newLine << newLine;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
@@ -629,7 +629,7 @@ private: |
|
|
|
if (getProject().getProjectType().isStaticLibrary())
|
|
|
|
mo << " targets \"" << getNativeModuleBinaryName (cfg) << "\"" << newLine;
|
|
|
|
|
|
|
|
mo << " arguments \"-DJUCE_BUILD_CONFIGFURATION=" << cfg.getProductFlavourCMakeIdentifier() << "\""
|
|
|
|
mo << " arguments \"-DJUCE_BUILD_CONFIGURATION=" << cfg.getProductFlavourCMakeIdentifier() << "\""
|
|
|
|
<< ", \"-DCMAKE_CXX_FLAGS_" << (cfg.isDebug() ? "DEBUG" : "RELEASE")
|
|
|
|
<< "=-O" << cfg.getGCCOptimisationFlag() << "\""
|
|
|
|
<< ", \"-DCMAKE_C_FLAGS_" << (cfg.isDebug() ? "DEBUG" : "RELEASE")
|
|
|
|
|