| @@ -22,11 +22,6 @@ IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | |||||
| add_definitions("-DDEBUG=1" "-D_DEBUG=1") | add_definitions("-DDEBUG=1" "-D_DEBUG=1") | ||||
| ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") | ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") | ||||
| add_definitions("-DNDEBUG=1") | 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") | ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ||||
| MESSAGE( FATAL_ERROR "No matching build-configuration found." ) | MESSAGE( FATAL_ERROR "No matching build-configuration found." ) | ||||
| ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ||||
| @@ -22,11 +22,6 @@ IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | |||||
| add_definitions("-DDEBUG=1" "-D_DEBUG=1") | add_definitions("-DDEBUG=1" "-D_DEBUG=1") | ||||
| ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") | ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") | ||||
| add_definitions("-DNDEBUG=1") | 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") | ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ||||
| MESSAGE( FATAL_ERROR "No matching build-configuration found." ) | MESSAGE( FATAL_ERROR "No matching build-configuration found." ) | ||||
| ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ||||
| @@ -22,11 +22,6 @@ IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | |||||
| add_definitions("-DDEBUG=1" "-D_DEBUG=1") | add_definitions("-DDEBUG=1" "-D_DEBUG=1") | ||||
| ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") | ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") | ||||
| add_definitions("-DNDEBUG=1") | 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") | ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ||||
| MESSAGE( FATAL_ERROR "No matching build-configuration found." ) | MESSAGE( FATAL_ERROR "No matching build-configuration found." ) | ||||
| ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ||||
| @@ -22,11 +22,6 @@ IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | |||||
| add_definitions("-DDEBUG=1" "-D_DEBUG=1") | add_definitions("-DDEBUG=1" "-D_DEBUG=1") | ||||
| ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") | ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") | ||||
| add_definitions("-DNDEBUG=1") | 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") | ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ||||
| MESSAGE( FATAL_ERROR "No matching build-configuration found." ) | MESSAGE( FATAL_ERROR "No matching build-configuration found." ) | ||||
| ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ||||
| @@ -22,11 +22,6 @@ IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | |||||
| add_definitions("-DJUCE_DEBUG=0" "-DDEBUG=1" "-D_DEBUG=1") | add_definitions("-DJUCE_DEBUG=0" "-DDEBUG=1" "-D_DEBUG=1") | ||||
| ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") | ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") | ||||
| add_definitions("-DNDEBUG=1") | 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") | ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ||||
| MESSAGE( FATAL_ERROR "No matching build-configuration found." ) | MESSAGE( FATAL_ERROR "No matching build-configuration found." ) | ||||
| ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ||||
| @@ -22,11 +22,6 @@ IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | |||||
| add_definitions("-DDEBUG=1" "-D_DEBUG=1") | add_definitions("-DDEBUG=1" "-D_DEBUG=1") | ||||
| ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") | ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") | ||||
| add_definitions("-DNDEBUG=1") | 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") | ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ||||
| MESSAGE( FATAL_ERROR "No matching build-configuration found." ) | MESSAGE( FATAL_ERROR "No matching build-configuration found." ) | ||||
| ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ||||
| @@ -22,11 +22,6 @@ IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | |||||
| add_definitions("-DDEBUG=1" "-D_DEBUG=1") | add_definitions("-DDEBUG=1" "-D_DEBUG=1") | ||||
| ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") | ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") | ||||
| add_definitions("-DNDEBUG=1") | 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") | ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ||||
| MESSAGE( FATAL_ERROR "No matching build-configuration found." ) | MESSAGE( FATAL_ERROR "No matching build-configuration found." ) | ||||
| ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ||||
| @@ -22,11 +22,6 @@ IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | |||||
| add_definitions("-DDEBUG=1" "-D_DEBUG=1") | add_definitions("-DDEBUG=1" "-D_DEBUG=1") | ||||
| ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") | ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") | ||||
| add_definitions("-DNDEBUG=1") | 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") | ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ||||
| MESSAGE( FATAL_ERROR "No matching build-configuration found." ) | MESSAGE( FATAL_ERROR "No matching build-configuration found." ) | ||||
| ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ||||
| @@ -22,11 +22,6 @@ IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | |||||
| add_definitions("-DDEBUG=1" "-D_DEBUG=1") | add_definitions("-DDEBUG=1" "-D_DEBUG=1") | ||||
| ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") | ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") | ||||
| add_definitions("-DNDEBUG=1") | 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") | ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ||||
| MESSAGE( FATAL_ERROR "No matching build-configuration found." ) | MESSAGE( FATAL_ERROR "No matching build-configuration found." ) | ||||
| ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ||||
| @@ -22,11 +22,6 @@ IF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | |||||
| add_definitions("-DDEBUG=1" "-D_DEBUG=1") | add_definitions("-DDEBUG=1" "-D_DEBUG=1") | ||||
| ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") | ELSEIF(JUCE_BUILD_CONFIGURATION MATCHES "RELEASE") | ||||
| add_definitions("-DNDEBUG=1") | 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") | ELSE(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ||||
| MESSAGE( FATAL_ERROR "No matching build-configuration found." ) | MESSAGE( FATAL_ERROR "No matching build-configuration found." ) | ||||
| ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ENDIF(JUCE_BUILD_CONFIGURATION MATCHES "DEBUG") | ||||
| @@ -313,6 +313,7 @@ protected: | |||||
| androidAdditionalRawValueResources (config, Ids::androidAdditionalRawValueResources, nullptr, {}), | androidAdditionalRawValueResources (config, Ids::androidAdditionalRawValueResources, nullptr, {}), | ||||
| androidCustomStringXmlElements (config, Ids::androidCustomStringXmlElements, nullptr, {}) | androidCustomStringXmlElements (config, Ids::androidCustomStringXmlElements, nullptr, {}) | ||||
| { | { | ||||
| linkTimeOptimisationValue.setDefault (false); | |||||
| optimisationLevelValue.setDefault (isDebug() ? gccO0 : gccO3); | optimisationLevelValue.setDefault (isDebug() ? gccO0 : gccO3); | ||||
| } | } | ||||