diff --git a/examples/AnalyticsCollection/Builds/Android/app/CMakeLists.txt b/examples/AnalyticsCollection/Builds/Android/app/CMakeLists.txt index afb05efbd6..73223ac16f 100644 --- a/examples/AnalyticsCollection/Builds/Android/app/CMakeLists.txt +++ b/examples/AnalyticsCollection/Builds/Android/app/CMakeLists.txt @@ -22,11 +22,6 @@ IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_definitions("-DDEBUG=1" "-D_DEBUG=1") ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") add_definitions("-DNDEBUG=1") - if(NOT (ANDROID_ABI STREQUAL "mips" OR ANDROID_ABI STREQUAL "mips64")) - SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -flto") - SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -flto") - SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -flto") - ENDIF(NOT (ANDROID_ABI STREQUAL "mips" OR ANDROID_ABI STREQUAL "mips64")) ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") MESSAGE( FATAL_ERROR "No matching build-configuration found." ) ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") diff --git a/examples/Demo/Builds/Android/app/CMakeLists.txt b/examples/Demo/Builds/Android/app/CMakeLists.txt index d434c59f04..c45f33b7e4 100644 --- a/examples/Demo/Builds/Android/app/CMakeLists.txt +++ b/examples/Demo/Builds/Android/app/CMakeLists.txt @@ -22,11 +22,6 @@ IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_definitions("-DDEBUG=1" "-D_DEBUG=1") ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") add_definitions("-DNDEBUG=1") - if(NOT (ANDROID_ABI STREQUAL "mips" OR ANDROID_ABI STREQUAL "mips64")) - SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -flto") - SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -flto") - SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -flto") - ENDIF(NOT (ANDROID_ABI STREQUAL "mips" OR ANDROID_ABI STREQUAL "mips64")) ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") MESSAGE( FATAL_ERROR "No matching build-configuration found." ) ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") diff --git a/examples/InAppPurchase/Builds/Android/app/CMakeLists.txt b/examples/InAppPurchase/Builds/Android/app/CMakeLists.txt index f65b1ecd57..e9e0d741db 100644 --- a/examples/InAppPurchase/Builds/Android/app/CMakeLists.txt +++ b/examples/InAppPurchase/Builds/Android/app/CMakeLists.txt @@ -22,11 +22,6 @@ IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_definitions("-DDEBUG=1" "-D_DEBUG=1") ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") add_definitions("-DNDEBUG=1") - if(NOT (ANDROID_ABI STREQUAL "mips" OR ANDROID_ABI STREQUAL "mips64")) - SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -flto") - SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -flto") - SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -flto") - ENDIF(NOT (ANDROID_ABI STREQUAL "mips" OR ANDROID_ABI STREQUAL "mips64")) ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") MESSAGE( FATAL_ERROR "No matching build-configuration found." ) ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") diff --git a/examples/MidiTest/Builds/Android/app/CMakeLists.txt b/examples/MidiTest/Builds/Android/app/CMakeLists.txt index b61d9ef8ca..fbef685cfe 100644 --- a/examples/MidiTest/Builds/Android/app/CMakeLists.txt +++ b/examples/MidiTest/Builds/Android/app/CMakeLists.txt @@ -22,11 +22,6 @@ IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_definitions("-DDEBUG=1" "-D_DEBUG=1") ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") add_definitions("-DNDEBUG=1") - if(NOT (ANDROID_ABI STREQUAL "mips" OR ANDROID_ABI STREQUAL "mips64")) - SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -flto") - SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -flto") - SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -flto") - ENDIF(NOT (ANDROID_ABI STREQUAL "mips" OR ANDROID_ABI STREQUAL "mips64")) ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") MESSAGE( FATAL_ERROR "No matching build-configuration found." ) ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") diff --git a/examples/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt b/examples/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt index e25eced4b0..03ae4a0d9d 100644 --- a/examples/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt +++ b/examples/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt @@ -22,11 +22,6 @@ IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_definitions("-DJUCE_DEBUG=0" "-DDEBUG=1" "-D_DEBUG=1") ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") add_definitions("-DNDEBUG=1") - if(NOT (ANDROID_ABI STREQUAL "mips" OR ANDROID_ABI STREQUAL "mips64")) - SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -flto") - SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -flto") - SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -flto") - ENDIF(NOT (ANDROID_ABI STREQUAL "mips" OR ANDROID_ABI STREQUAL "mips64")) ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") MESSAGE( FATAL_ERROR "No matching build-configuration found." ) ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") diff --git a/examples/OSCReceiver/Builds/Android/app/CMakeLists.txt b/examples/OSCReceiver/Builds/Android/app/CMakeLists.txt index 94104f4ff7..2febc211b5 100644 --- a/examples/OSCReceiver/Builds/Android/app/CMakeLists.txt +++ b/examples/OSCReceiver/Builds/Android/app/CMakeLists.txt @@ -22,11 +22,6 @@ IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_definitions("-DDEBUG=1" "-D_DEBUG=1") ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") add_definitions("-DNDEBUG=1") - if(NOT (ANDROID_ABI STREQUAL "mips" OR ANDROID_ABI STREQUAL "mips64")) - SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -flto") - SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -flto") - SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -flto") - ENDIF(NOT (ANDROID_ABI STREQUAL "mips" OR ANDROID_ABI STREQUAL "mips64")) ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") MESSAGE( FATAL_ERROR "No matching build-configuration found." ) ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") diff --git a/examples/OSCSender/Builds/Android/app/CMakeLists.txt b/examples/OSCSender/Builds/Android/app/CMakeLists.txt index 749bec36d9..cbb5882349 100644 --- a/examples/OSCSender/Builds/Android/app/CMakeLists.txt +++ b/examples/OSCSender/Builds/Android/app/CMakeLists.txt @@ -22,11 +22,6 @@ IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_definitions("-DDEBUG=1" "-D_DEBUG=1") ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") add_definitions("-DNDEBUG=1") - if(NOT (ANDROID_ABI STREQUAL "mips" OR ANDROID_ABI STREQUAL "mips64")) - SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -flto") - SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -flto") - SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -flto") - ENDIF(NOT (ANDROID_ABI STREQUAL "mips" OR ANDROID_ABI STREQUAL "mips64")) ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") MESSAGE( FATAL_ERROR "No matching build-configuration found." ) ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") diff --git a/examples/PushNotificationsDemo/Builds/Android/app/CMakeLists.txt b/examples/PushNotificationsDemo/Builds/Android/app/CMakeLists.txt index 400f32f0fc..33924197af 100644 --- a/examples/PushNotificationsDemo/Builds/Android/app/CMakeLists.txt +++ b/examples/PushNotificationsDemo/Builds/Android/app/CMakeLists.txt @@ -22,11 +22,6 @@ IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_definitions("-DDEBUG=1" "-D_DEBUG=1") ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") add_definitions("-DNDEBUG=1") - if(NOT (ANDROID_ABI STREQUAL "mips" OR ANDROID_ABI STREQUAL "mips64")) - SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -flto") - SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -flto") - SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -flto") - ENDIF(NOT (ANDROID_ABI STREQUAL "mips" OR ANDROID_ABI STREQUAL "mips64")) ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") MESSAGE( FATAL_ERROR "No matching build-configuration found." ) ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") diff --git a/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt b/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt index 00bae3b8a2..bf3ad13405 100644 --- a/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt +++ b/examples/audio plugin demo/Builds/Android/app/CMakeLists.txt @@ -22,11 +22,6 @@ IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_definitions("-DDEBUG=1" "-D_DEBUG=1") ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") add_definitions("-DNDEBUG=1") - if(NOT (ANDROID_ABI STREQUAL "mips" OR ANDROID_ABI STREQUAL "mips64")) - SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -flto") - SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -flto") - SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -flto") - ENDIF(NOT (ANDROID_ABI STREQUAL "mips" OR ANDROID_ABI STREQUAL "mips64")) ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") MESSAGE( FATAL_ERROR "No matching build-configuration found." ) ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") diff --git a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt index e5898888d9..cabd88ac30 100644 --- a/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt +++ b/extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt @@ -22,11 +22,6 @@ IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") add_definitions("-DDEBUG=1" "-D_DEBUG=1") ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") add_definitions("-DNDEBUG=1") - if(NOT (ANDROID_ABI STREQUAL "mips" OR ANDROID_ABI STREQUAL "mips64")) - SET(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -flto") - SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -flto") - SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -flto") - ENDIF(NOT (ANDROID_ABI STREQUAL "mips" OR ANDROID_ABI STREQUAL "mips64")) ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") MESSAGE( FATAL_ERROR "No matching build-configuration found." ) ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") diff --git a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h index 72b42e34b4..0bba90cc0c 100644 --- a/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h +++ b/extras/Projucer/Source/ProjectSaving/jucer_ProjectExport_Android.h @@ -313,6 +313,7 @@ protected: androidAdditionalRawValueResources (config, Ids::androidAdditionalRawValueResources, nullptr, {}), androidCustomStringXmlElements (config, Ids::androidCustomStringXmlElements, nullptr, {}) { + linkTimeOptimisationValue.setDefault (false); optimisationLevelValue.setDefault (isDebug() ? gccO0 : gccO3); }