From 75666cfdee5a63d0c88eda3d5089f4967ba64c27 Mon Sep 17 00:00:00 2001 From: hogliux Date: Tue, 16 May 2017 13:47:34 +0100 Subject: [PATCH] Android: re-saved Android projects to reflect changes to the Projucer's Android exporter in the previous commit --- examples/Demo/Builds/Android/app/CMakeLists.txt | 4 ++++ examples/MidiTest/Builds/Android/app/CMakeLists.txt | 4 ++++ .../NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt | 4 ++++ examples/OSCReceiver/Builds/Android/app/CMakeLists.txt | 4 ++++ examples/OSCSender/Builds/Android/app/CMakeLists.txt | 4 ++++ examples/audio plugin demo/Builds/Android/app/CMakeLists.txt | 4 ++++ extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt | 4 ++++ 7 files changed, 28 insertions(+) diff --git a/examples/Demo/Builds/Android/app/CMakeLists.txt b/examples/Demo/Builds/Android/app/CMakeLists.txt index 3bb752fa02..23f76756d5 100644 --- a/examples/Demo/Builds/Android/app/CMakeLists.txt +++ b/examples/Demo/Builds/Android/app/CMakeLists.txt @@ -5,11 +5,14 @@ cmake_minimum_required(VERSION 3.4.1) SET(BINARY_NAME "juce_jni") +add_library("cpufeatures" STATIC "${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c") + add_definitions("-DJUCE_ANDROID=1" "-DJUCE_ANDROID_API_VERSION=10" "-DJUCE_ANDROID_ACTIVITY_CLASSNAME=com_yourcompany_jucedemo_JuceDemo" "-DJUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/yourcompany/jucedemo/JuceDemo\"" "-DJUCE_UNIT_TESTS=1") include_directories( AFTER "../../../JuceLibraryCode" "../../../../../modules" + "${ANDROID_NDK}/sources/android/cpufeatures" ) IF(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") @@ -2709,4 +2712,5 @@ target_link_libraries( ${BINARY_NAME} ${android} ${glesv2} ${egl} + "cpufeatures" ) diff --git a/examples/MidiTest/Builds/Android/app/CMakeLists.txt b/examples/MidiTest/Builds/Android/app/CMakeLists.txt index 4144b5b9e0..b078cf485c 100644 --- a/examples/MidiTest/Builds/Android/app/CMakeLists.txt +++ b/examples/MidiTest/Builds/Android/app/CMakeLists.txt @@ -5,11 +5,14 @@ cmake_minimum_required(VERSION 3.4.1) SET(BINARY_NAME "juce_jni") +add_library("cpufeatures" STATIC "${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c") + add_definitions("-DJUCE_ANDROID=1" "-DJUCE_ANDROID_API_VERSION=23" "-DJUCE_ANDROID_ACTIVITY_CLASSNAME=com_yourcompany_miditest_MidiTest" "-DJUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/yourcompany/miditest/MidiTest\"" "-DJUCE_ANDROID_GL_ES_VERSION_3_0=1") include_directories( AFTER "../../../JuceLibraryCode" "../../../../../modules" + "${ANDROID_NDK}/sources/android/cpufeatures" ) IF(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") @@ -2317,4 +2320,5 @@ target_link_libraries( ${BINARY_NAME} ${android} ${glesv3} ${egl} + "cpufeatures" ) diff --git a/examples/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt b/examples/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt index 4f1bc5ee48..106eb799e5 100644 --- a/examples/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt +++ b/examples/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt @@ -5,11 +5,14 @@ cmake_minimum_required(VERSION 3.4.1) SET(BINARY_NAME "juce_jni") +add_library("cpufeatures" STATIC "${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c") + add_definitions("-DJUCE_ANDROID=1" "-DJUCE_ANDROID_API_VERSION=10" "-DJUCE_ANDROID_ACTIVITY_CLASSNAME=com_juce_networkgraphicsdemo_JUCENetworkGraphicsDemo" "-DJUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/juce/networkgraphicsdemo/JUCENetworkGraphicsDemo\"") include_directories( AFTER "../../../JuceLibraryCode" "../../../../../modules" + "${ANDROID_NDK}/sources/android/cpufeatures" ) IF(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") @@ -2468,4 +2471,5 @@ target_link_libraries( ${BINARY_NAME} ${android} ${glesv2} ${egl} + "cpufeatures" ) diff --git a/examples/OSCReceiver/Builds/Android/app/CMakeLists.txt b/examples/OSCReceiver/Builds/Android/app/CMakeLists.txt index 527c8bcdfb..b150902431 100644 --- a/examples/OSCReceiver/Builds/Android/app/CMakeLists.txt +++ b/examples/OSCReceiver/Builds/Android/app/CMakeLists.txt @@ -5,11 +5,14 @@ cmake_minimum_required(VERSION 3.4.1) SET(BINARY_NAME "juce_jni") +add_library("cpufeatures" STATIC "${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c") + add_definitions("-DJUCE_ANDROID=1" "-DJUCE_ANDROID_API_VERSION=10" "-DJUCE_ANDROID_ACTIVITY_CLASSNAME=com_yourcompany_oscreceiver_OSCReceiver" "-DJUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/yourcompany/oscreceiver/OSCReceiver\"") include_directories( AFTER "../../../JuceLibraryCode" "../../../../../modules" + "${ANDROID_NDK}/sources/android/cpufeatures" ) IF(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") @@ -1683,4 +1686,5 @@ target_link_libraries( ${BINARY_NAME} ${android} ${glesv2} ${egl} + "cpufeatures" ) diff --git a/examples/OSCSender/Builds/Android/app/CMakeLists.txt b/examples/OSCSender/Builds/Android/app/CMakeLists.txt index d62b3072ce..ae310ebc98 100644 --- a/examples/OSCSender/Builds/Android/app/CMakeLists.txt +++ b/examples/OSCSender/Builds/Android/app/CMakeLists.txt @@ -5,11 +5,14 @@ cmake_minimum_required(VERSION 3.4.1) SET(BINARY_NAME "juce_jni") +add_library("cpufeatures" STATIC "${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c") + add_definitions("-DJUCE_ANDROID=1" "-DJUCE_ANDROID_API_VERSION=10" "-DJUCE_ANDROID_ACTIVITY_CLASSNAME=com_yourcompany_oscsender_OSCSender" "-DJUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/yourcompany/oscsender/OSCSender\"") include_directories( AFTER "../../../JuceLibraryCode" "../../../../../modules" + "${ANDROID_NDK}/sources/android/cpufeatures" ) IF(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") @@ -1539,4 +1542,5 @@ target_link_libraries( ${BINARY_NAME} ${android} ${glesv2} ${egl} + "cpufeatures" ) diff --git a/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt b/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt index fcead2caab..d89a540305 100644 --- a/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt +++ b/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt @@ -5,11 +5,14 @@ cmake_minimum_required(VERSION 3.4.1) SET(BINARY_NAME "juce_jni") +add_library("cpufeatures" STATIC "${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c") + add_definitions("-DJUCE_ANDROID=1" "-DJUCE_ANDROID_API_VERSION=23" "-DJUCE_ANDROID_ACTIVITY_CLASSNAME=com_juce_jucedemoplugin_JuceDemoPlugin" "-DJUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/juce/jucedemoplugin/JuceDemoPlugin\"" "-DJUCE_ANDROID_GL_ES_VERSION_3_0=1") include_directories( AFTER "../../../JuceLibraryCode" "../../../../../modules" + "${ANDROID_NDK}/sources/android/cpufeatures" ) IF(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") @@ -2521,4 +2524,5 @@ target_link_libraries( ${BINARY_NAME} ${android} ${glesv3} ${egl} + "cpufeatures" ) diff --git a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt index fa6e8ccbe5..15674917c4 100644 --- a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt +++ b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt @@ -5,11 +5,14 @@ cmake_minimum_required(VERSION 3.4.1) SET(BINARY_NAME "juce_jni") +add_library("cpufeatures" STATIC "${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c") + add_definitions("-DJUCE_ANDROID=1" "-DJUCE_ANDROID_API_VERSION=23" "-DJUCE_ANDROID_ACTIVITY_CLASSNAME=com_juce_audioperformancetest_AudioPerformanceTest" "-DJUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/juce/audioperformancetest/AudioPerformanceTest\"" "-DJUCE_ANDROID_GL_ES_VERSION_3_0=1") include_directories( AFTER "../../../JuceLibraryCode" "../../../../../modules" + "${ANDROID_NDK}/sources/android/cpufeatures" ) IF(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG") @@ -2316,4 +2319,5 @@ target_link_libraries( ${BINARY_NAME} ${android} ${glesv3} ${egl} + "cpufeatures" )