From cb6d43cbae1efc9dd8ff2496028e989a3476800b Mon Sep 17 00:00:00 2001 From: hogliux Date: Thu, 9 Feb 2017 12:46:43 +0000 Subject: [PATCH] Added preliminary support for static libraries on Android --- .../Source/Project Saving/jucer_ProjectExport_Android.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_Android.h b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_Android.h index e22af5be8c..8f8f6f75a2 100644 --- a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_Android.h +++ b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_Android.h @@ -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)