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

Fixed Android build settings of all .jucer files to use new default values instead of hard-coded old values (gradle version etc.)

Browse source
This commit is contained in:
Timur Doumler 2016-04-19 15:20:13 +01:00
parent b94d2810e7
commit f5c19ef612
6 changed files with 29 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

19
examples/Demo/JuceDemo.jucer
View file

@ -162,11 +162,9 @@
</MODULEPATHS> </MODULEPATHS>
</VS2015> </VS2015>
<ANDROID targetFolder="Builds/Android" androidActivityClass="com.juce.jucedemo.JuceDemo" <ANDROID targetFolder="Builds/Android" androidActivityClass="com.juce.jucedemo.JuceDemo"
androidSDKPath="" androidNDKPath="" androidMinimumSDK="23" androidInternetNeeded="1" androidSDKPath="" androidNDKPath="" androidInternetNeeded="1"
androidKeyStore="${user.home}/.android/debug.keystore" androidKeyStorePass="android"
androidKeyAlias="androiddebugkey" androidKeyAliasPass="android"
androidMicNeeded="1" bigIcon="xycKOk" androidCpp11="1" smallIcon="BvyE0d" androidMicNeeded="1" bigIcon="xycKOk" androidCpp11="1" smallIcon="BvyE0d"
androidVersionCode="1" androidBluetoothNeeded="0" androidTheme="@android:style/Theme.NoTitleBar" androidBluetoothNeeded="0" androidTheme="@android:style/Theme.NoTitleBar"
androidScreenOrientation="unspecified"> androidScreenOrientation="unspecified">
<CONFIGURATIONS> <CONFIGURATIONS>
<CONFIGURATION name="Debug" androidArchitectures="armeabi x86" isDebug="1" optimisation="1" <CONFIGURATION name="Debug" androidArchitectures="armeabi x86" isDebug="1" optimisation="1"
@ -192,14 +190,11 @@
<MODULEPATH id="juce_box2d" path="../../modules"/> <MODULEPATH id="juce_box2d" path="../../modules"/>
</MODULEPATHS> </MODULEPATHS>
</ANDROID> </ANDROID>
<ANDROIDSTUDIO androidVersionCode="1" androidActivityClass="com.yourcompany.jucedemo.JuceDemo" <ANDROIDSTUDIO androidActivityClass="com.yourcompany.jucedemo.JuceDemo" androidInternetNeeded="1"
androidMinimumSDK="23" androidInternetNeeded="1" androidKeyStore="${user.home}/.android/debug.keystore" androidCpp11="1" targetFolder="Builds/AndroidStudio" androidSDKPath=""
androidKeyStorePass="android" androidKeyAlias="androiddebugkey" androidNDKPath="" androidBluetoothNeeded="1" bigIcon="BvyE0d"
androidKeyAliasPass="android" androidCpp11="1" targetFolder="Builds/AndroidStudio" androidScreenOrientation="unspecified" androidMicNeeded="1" gradleToolchain="clang"
androidSDKPath="" androidNDKPath="" androidBluetoothNeeded="1" gradleToolchainVersion="3.6" buildToolsVersion="23.0.1" androidTheme="@android:style/Theme.NoTitleBar">
bigIcon="BvyE0d" androidScreenOrientation="unspecified" androidMicNeeded="1"
gradleVersion="2.10" gradleWrapperVersion="0.6.0-beta5" gradleToolchain="clang"
gradleToolchainVersion="3.6" buildToolsVersion="23.0.1">
<CONFIGURATIONS> <CONFIGURATIONS>
<CONFIGURATION name="Debug" androidArchitectures="armeabi x86" isDebug="1" optimisation="1" <CONFIGURATION name="Debug" androidArchitectures="armeabi x86" isDebug="1" optimisation="1"
targetName="JuceDemo"/> targetName="JuceDemo"/>

11
examples/MidiTest/MidiTest.jucer
View file

@ -99,13 +99,10 @@
<MODULEPATH id="juce_audio_basics" path="../../modules"/> <MODULEPATH id="juce_audio_basics" path="../../modules"/>
</MODULEPATHS> </MODULEPATHS>
</XCODE_IPHONE> </XCODE_IPHONE>
<ANDROIDSTUDIO androidVersionCode="1" androidActivityClass="com.yourcompany.miditest.MidiTest" <ANDROIDSTUDIO androidActivityClass="com.yourcompany.miditest.MidiTest" androidInternetNeeded="0"
androidMinimumSDK="23" androidInternetNeeded="0" androidBluetoothNeeded="1" androidBluetoothNeeded="1" androidCpp11="1" androidScreenOrientation="unspecified"
androidKeyStore="${user.home}/.android/debug.keystore" androidKeyStorePass="android" targetFolder="Builds/AndroidStudio" androidSDKPath="" androidNDKPath=""
androidKeyAlias="androiddebugkey" androidKeyAliasPass="android" androidMicNeeded="1" gradleToolchain="clang" gradleToolchainVersion="3.6"
androidCpp11="1" androidScreenOrientation="unspecified" targetFolder="Builds/AndroidStudio"
androidSDKPath="" androidNDKPath="" androidMicNeeded="1" gradleVersion="2.10"
gradleWrapperVersion="0.6.0-beta5" gradleToolchain="clang" gradleToolchainVersion="3.6"
buildToolsVersion="23.0.1"> buildToolsVersion="23.0.1">
<CONFIGURATIONS> <CONFIGURATIONS>
<CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1" <CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1"

11
examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer
View file

@ -112,13 +112,10 @@
<MODULEPATH id="juce_audio_basics" path="../../modules"/> <MODULEPATH id="juce_audio_basics" path="../../modules"/>
</MODULEPATHS> </MODULEPATHS>
</LINUX_MAKE> </LINUX_MAKE>
<ANDROIDSTUDIO androidVersionCode="1" androidActivityClass="com.juce.networkgraphicsdemo.JUCENetworkGraphicsDemo" <ANDROIDSTUDIO androidActivityClass="com.juce.networkgraphicsdemo.JUCENetworkGraphicsDemo"
androidMinimumSDK="10" androidInternetNeeded="1" androidBluetoothNeeded="1" androidInternetNeeded="1" androidBluetoothNeeded="1" androidCpp11="1"
androidKeyStore="${user.home}/.android/debug.keystore" androidKeyStorePass="android" targetFolder="Builds/AndroidStudio" androidSDKPath="" androidNDKPath=""
androidKeyAlias="androiddebugkey" androidKeyAliasPass="android" bigIcon="Ww6bQw" androidScreenOrientation="unspecified" gradleToolchain="clang"
androidCpp11="1" targetFolder="Builds/AndroidStudio" androidSDKPath=""
androidNDKPath="" bigIcon="Ww6bQw" androidScreenOrientation="unspecified"
gradleVersion="2.10" gradleWrapperVersion="0.6.0-beta5" gradleToolchain="clang"
gradleToolchainVersion="3.6" buildToolsVersion="23.0.1"> gradleToolchainVersion="3.6" buildToolsVersion="23.0.1">
<CONFIGURATIONS> <CONFIGURATIONS>
<CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1" <CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1"

12
examples/OSCReceiver/OSCReceiver.jucer
View file

@ -82,13 +82,11 @@
<MODULEPATH id="juce_core" path="../../modules"/> <MODULEPATH id="juce_core" path="../../modules"/>
</MODULEPATHS> </MODULEPATHS>
</XCODE_IPHONE> </XCODE_IPHONE>
<ANDROIDSTUDIO androidVersionCode="1" androidActivityClass="com.yourcompany.oscreceiver.OSCReceiver" <ANDROIDSTUDIO androidActivityClass="com.yourcompany.oscreceiver.OSCReceiver"
androidMinimumSDK="10" androidInternetNeeded="1" androidBluetoothNeeded="1" androidInternetNeeded="1" androidBluetoothNeeded="1" androidCpp11="1"
androidKeyStore="${user.home}/.android/debug.keystore" androidKeyStorePass="android" targetFolder="Builds/AndroidStudio" androidScreenOrientation="unspecified"
androidKeyAlias="androiddebugkey" androidKeyAliasPass="android" gradleToolchain="clang" gradleToolchainVersion="3.6" buildToolsVersion="23.0.1"
androidCpp11="1" targetFolder="Builds/AndroidStudio" androidScreenOrientation="unspecified" androidSDKPath="" androidNDKPath="">
gradleVersion="2.10" gradleWrapperVersion="0.6.0-beta5" gradleToolchain="clang"
gradleToolchainVersion="3.6" buildToolsVersion="23.0.1">
<CONFIGURATIONS> <CONFIGURATIONS>
<CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1" <CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1"
optimisation="1" targetName="OSCReceiver"/> optimisation="1" targetName="OSCReceiver"/>

12
examples/OSCSender/OSCSender.jucer
View file

@ -74,14 +74,10 @@
<MODULEPATH id="juce_core" path="../../modules"/> <MODULEPATH id="juce_core" path="../../modules"/>
</MODULEPATHS> </MODULEPATHS>
</XCODE_IPHONE> </XCODE_IPHONE>
<ANDROIDSTUDIO androidVersionCode="1" androidActivityClass="com.yourcompany.oscsender.OSCSender" <ANDROIDSTUDIO androidActivityClass="com.yourcompany.oscsender.OSCSender" androidInternetNeeded="1"
androidMinimumSDK="10" androidInternetNeeded="1" androidBluetoothNeeded="1" androidBluetoothNeeded="1" androidCpp11="1" targetFolder="Builds/AndroidStudio"
androidKeyStore="${user.home}/.android/debug.keystore" androidKeyStorePass="android" androidSDKPath="" androidNDKPath="" androidScreenOrientation="unspecified"
androidKeyAlias="androiddebugkey" androidKeyAliasPass="android" gradleToolchain="clang" gradleToolchainVersion="3.6" buildToolsVersion="23.0.1">
androidCpp11="1" targetFolder="Builds/AndroidStudio" androidSDKPath=""
androidNDKPath="" androidScreenOrientation="unspecified" gradleVersion="2.10"
gradleWrapperVersion="0.6.0-beta5" gradleToolchain="clang" gradleToolchainVersion="3.6"
buildToolsVersion="23.0.1">
<CONFIGURATIONS> <CONFIGURATIONS>
<CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1" <CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1"
optimisation="1" targetName="OSCSender"/> optimisation="1" targetName="OSCSender"/>

13
extras/AudioPerformanceTest/AudioPerformanceTest.jucer
View file

@ -94,15 +94,12 @@
<MODULEPATH id="juce_audio_utils" path="../../modules"/> <MODULEPATH id="juce_audio_utils" path="../../modules"/>
</MODULEPATHS> </MODULEPATHS>
</LINUX_MAKE> </LINUX_MAKE>
<ANDROIDSTUDIO androidVersionCode="1" androidActivityClass="com.juce.audioperformancetest.AudioPerformanceTest" <ANDROIDSTUDIO androidActivityClass="com.juce.audioperformancetest.AudioPerformanceTest"
androidMinimumSDK="23" androidInternetNeeded="1" androidBluetoothNeeded="1" androidInternetNeeded="1" androidBluetoothNeeded="1" androidCpp11="1"
androidKeyStore="${user.home}/.android/debug.keystore" androidKeyStorePass="android" androidScreenOrientation="unspecified" targetFolder="Builds/AndroidStudio"
androidKeyAlias="androiddebugkey" androidKeyAliasPass="android"
androidCpp11="1" androidScreenOrientation="unspecified" targetFolder="Builds/AndroidStudio"
androidSDKPath="" androidNDKPath="" extraCompilerFlags="-mfpu=neon -mfloat-abi=hard -ffast-math -funroll-loops --param max-unroll-times=8 -mhard-float -D_NDK_MATH_NO_SOFTFP=1 -DJUCE_DISABLE_ASSERTIONS=1" androidSDKPath="" androidNDKPath="" extraCompilerFlags="-mfpu=neon -mfloat-abi=hard -ffast-math -funroll-loops --param max-unroll-times=8 -mhard-float -D_NDK_MATH_NO_SOFTFP=1 -DJUCE_DISABLE_ASSERTIONS=1"
extraDefs="" extraLinkerFlags="" externalLibraries="" gradleVersion="2.10" extraDefs="" extraLinkerFlags="" externalLibraries="" gradleToolchain="clang"
gradleWrapperVersion="0.6.0-beta5" gradleToolchain="clang" gradleToolchainVersion="3.6" gradleToolchainVersion="3.6" buildToolsVersion="23.0.1">
buildToolsVersion="23.0.1">
<CONFIGURATIONS> <CONFIGURATIONS>
<CONFIGURATION name="Debug" androidArchitectures="arm64-v8a" isDebug="1" optimisation="1" <CONFIGURATION name="Debug" androidArchitectures="arm64-v8a" isDebug="1" optimisation="1"
targetName="AudioPerformanceTest"/> targetName="AudioPerformanceTest"/>