mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-23 01:44:22 +00:00
Code Activity

Added preliminary support for static libraries on Android

Browse source
This commit is contained in:
hogliux 2017-02-09 12:46:43 +00:00
parent a2635253f2
commit cb6d43cbae
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
extras/Projucer/Source/Project Saving/jucer_ProjectExport_Android.h
View file

@ -401,7 +401,7 @@ private:
mo << "add_library( ${BINARY_NAME}" << newLine;
mo << newLine;
mo << " SHARED" << newLine;
mo << " " << (getProject().getProjectType().isStaticLibrary() ? "STATIC" : "SHARED") << newLine;
mo << newLine;
addCompileUnits (mo, excludeFromBuild);
mo << ")" << newLine << newLine;
@ -508,6 +508,10 @@ private:
mo << " externalNativeBuild {" << newLine;
mo << " cmake {" << newLine;
if (getProject().getProjectType().isStaticLibrary())
mo << " targets \"" << getNativeModuleBinaryName (cfg) << "\"" << newLine;
mo << " arguments \"-DJUCE_BUILD_CONFIGFURATION=" << cfg.getProductFlavourCMakeIdentifier() << "\"" << newLine;
mo << " cFlags \"-O" << cfg.getGCCOptimisationFlag() << "\"" << newLine;
mo << " cppFlags \"-O" << cfg.getGCCOptimisationFlag() << "\"" << newLine;
@ -561,6 +565,7 @@ private:
mo << " externalNativeBuild {" << newLine;
mo << " cmake {" << newLine;
mo << " arguments " << cmakeDefs.joinIntoString (", ") << newLine;
if (cFlags.size() > 0)