Browse Source

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

tags/2021-05-28
Timur Doumler 9 years ago
parent
commit
f5c19ef612
6 changed files with 29 additions and 49 deletions
  1. +7
    -12
      examples/Demo/JuceDemo.jucer
  2. +4
    -7
      examples/MidiTest/MidiTest.jucer
  3. +4
    -7
      examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer
  4. +5
    -7
      examples/OSCReceiver/OSCReceiver.jucer
  5. +4
    -8
      examples/OSCSender/OSCSender.jucer
  6. +5
    -8
      extras/AudioPerformanceTest/AudioPerformanceTest.jucer

+ 7
- 12
examples/Demo/JuceDemo.jucer View File

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


+ 4
- 7
examples/MidiTest/MidiTest.jucer View File

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


+ 4
- 7
examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer View File

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


+ 5
- 7
examples/OSCReceiver/OSCReceiver.jucer View File

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


+ 4
- 8
examples/OSCSender/OSCSender.jucer View File

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


+ 5
- 8
extras/AudioPerformanceTest/AudioPerformanceTest.jucer View File

@@ -94,15 +94,12 @@
<MODULEPATH id="juce_audio_utils" path="../../modules"/>
</MODULEPATHS>
</LINUX_MAKE>
<ANDROIDSTUDIO androidVersionCode="1" androidActivityClass="com.juce.audioperformancetest.AudioPerformanceTest"
androidMinimumSDK="23" androidInternetNeeded="1" androidBluetoothNeeded="1"
androidKeyStore="${user.home}/.android/debug.keystore" androidKeyStorePass="android"
androidKeyAlias="androiddebugkey" androidKeyAliasPass="android"
androidCpp11="1" androidScreenOrientation="unspecified" targetFolder="Builds/AndroidStudio"
<ANDROIDSTUDIO androidActivityClass="com.juce.audioperformancetest.AudioPerformanceTest"
androidInternetNeeded="1" androidBluetoothNeeded="1" 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"
extraDefs="" extraLinkerFlags="" externalLibraries="" gradleVersion="2.10"
gradleWrapperVersion="0.6.0-beta5" gradleToolchain="clang" gradleToolchainVersion="3.6"
buildToolsVersion="23.0.1">
extraDefs="" extraLinkerFlags="" externalLibraries="" gradleToolchain="clang"
gradleToolchainVersion="3.6" buildToolsVersion="23.0.1">
<CONFIGURATIONS>
<CONFIGURATION name="Debug" androidArchitectures="arm64-v8a" isDebug="1" optimisation="1"
targetName="AudioPerformanceTest"/>


Loading…
Cancel
Save