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

Removed old Android exporters from examples and updated .gitignore to reflect new Android build folder structure

Browse source
This commit is contained in:
hogliux 2017-02-01 16:27:41 +00:00
parent 2da1bc5f41
commit 28dccb31bb
7 changed files with 26 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.gitignore vendored
View file

@ -43,15 +43,15 @@ profile
**/VisualStudio2015/Debug **/VisualStudio2015/Debug
**/VisualStudio2015/Release **/VisualStudio2015/Release
**/VisualStudio2015/x64 **/VisualStudio2015/x64
**/Android/bin
**/Android/libs
**/Android/gen
**/Android/obj
**/CodeBlocks/bin **/CodeBlocks/bin
**/CodeBlocks/obj **/CodeBlocks/obj
**/CodeBlocks/*.depend **/CodeBlocks/*.depend
**/CodeBlocks/*.layout **/CodeBlocks/*.layout
**/Builds/AndroidStudio **/Builds/Android/.gradle
**/Builds/Android/app/build
**/Builds/Android/app/.externalNativeBuild
**/Builds/Android/lib/build
**/Builds/Android/lib/.externalNativeBuild
**/doxygen/doc **/doxygen/doc
**/doxygen/build **/doxygen/build
extras/Projucer/JUCECompileEngine.dylib extras/Projucer/JUCECompileEngine.dylib

37
examples/Demo/JuceDemo.jucer
View file

@ -164,45 +164,16 @@
<MODULEPATH id="juce_audio_basics" path="../../modules"/> <MODULEPATH id="juce_audio_basics" path="../../modules"/>
</MODULEPATHS> </MODULEPATHS>
</VS2015> </VS2015>
<ANDROID targetFolder="Builds/Android" androidActivityClass="com.juce.jucedemo.JuceDemo"
androidSDKPath="" androidNDKPath="" androidInternetNeeded="1"
androidMicNeeded="1" bigIcon="xycKOk" androidCpp11="1" smallIcon="BvyE0d"
androidBluetoothNeeded="0" androidTheme="@android:style/Theme.NoTitleBar"
androidScreenOrientation="unspecified">
<CONFIGURATIONS>
<CONFIGURATION name="Debug" androidArchitectures="armeabi x86" isDebug="1" optimisation="1"
targetName="JuceDemo"/>
<CONFIGURATION name="Release" androidArchitectures="armeabi armeabi-v7a x86"
isDebug="0" optimisation="3" targetName="JuceDemo"/>
</CONFIGURATIONS>
<MODULEPATHS>
<MODULEPATH id="juce_video" path="../../modules"/>
<MODULEPATH id="juce_opengl" path="../../modules"/>
<MODULEPATH id="juce_gui_extra" path="../../modules"/>
<MODULEPATH id="juce_gui_basics" path="../../modules"/>
<MODULEPATH id="juce_graphics" path="../../modules"/>
<MODULEPATH id="juce_events" path="../../modules"/>
<MODULEPATH id="juce_data_structures" path="../../modules"/>
<MODULEPATH id="juce_cryptography" path="../../modules"/>
<MODULEPATH id="juce_core" path="../../modules"/>
<MODULEPATH id="juce_audio_utils" path="../../modules"/>
<MODULEPATH id="juce_audio_processors" path="../../modules"/>
<MODULEPATH id="juce_audio_formats" path="../../modules"/>
<MODULEPATH id="juce_audio_devices" path="../../modules"/>
<MODULEPATH id="juce_audio_basics" path="../../modules"/>
<MODULEPATH id="juce_box2d" path="../../modules"/>
</MODULEPATHS>
</ANDROID>
<ANDROIDSTUDIO androidActivityClass="com.yourcompany.jucedemo.JuceDemo" androidInternetNeeded="1" <ANDROIDSTUDIO androidActivityClass="com.yourcompany.jucedemo.JuceDemo" androidInternetNeeded="1"
androidCpp11="1" targetFolder="Builds/AndroidStudio" androidSDKPath="" androidCpp11="1" targetFolder="Builds/Android" androidSDKPath=""
androidNDKPath="" androidBluetoothNeeded="1" bigIcon="BvyE0d" androidNDKPath="" androidBluetoothNeeded="0" bigIcon="BvyE0d"
androidScreenOrientation="unspecified" androidMicNeeded="1" gradleToolchain="clang" androidScreenOrientation="unspecified" androidMicNeeded="1" gradleToolchain="clang"
gradleToolchainVersion="3.6" androidTheme="@android:style/Theme.NoTitleBar"> gradleToolchainVersion="3.6" androidTheme="@android:style/Theme.NoTitleBar">
<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"/>
<CONFIGURATION name="Release" androidArchitectures="armeabi armeabi-v7a x86" <CONFIGURATION name="Release" androidArchitectures="" isDebug="0" optimisation="3"
isDebug="0" optimisation="3" targetName="JuceDemo"/> targetName="JuceDemo"/>
</CONFIGURATIONS> </CONFIGURATIONS>
<MODULEPATHS> <MODULEPATHS>
<MODULEPATH id="juce_video" path="../../modules"/> <MODULEPATH id="juce_video" path="../../modules"/>

9
examples/MidiTest/MidiTest.jucer
View file

@ -101,13 +101,14 @@
</XCODE_IPHONE> </XCODE_IPHONE>
<ANDROIDSTUDIO androidActivityClass="com.yourcompany.miditest.MidiTest" androidInternetNeeded="0" <ANDROIDSTUDIO androidActivityClass="com.yourcompany.miditest.MidiTest" androidInternetNeeded="0"
androidBluetoothNeeded="1" androidCpp11="1" androidScreenOrientation="unspecified" androidBluetoothNeeded="1" androidCpp11="1" androidScreenOrientation="unspecified"
targetFolder="Builds/AndroidStudio" androidSDKPath="" androidNDKPath="" targetFolder="Builds/Android" androidSDKPath="" androidNDKPath=""
androidMicNeeded="1" gradleToolchain="clang" gradleToolchainVersion="3.6"> androidMicNeeded="1" gradleToolchain="clang" gradleToolchainVersion="3.6"
androidMinimumSDK="23">
<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="MidiTest"/> optimisation="1" targetName="MidiTest"/>
<CONFIGURATION name="Release" androidArchitectures="armeabi armeabi-v7a x86" <CONFIGURATION name="Release" androidArchitectures="" isDebug="0" optimisation="3"
isDebug="0" optimisation="3" targetName="MidiTest"/> targetName="MidiTest"/>
</CONFIGURATIONS> </CONFIGURATIONS>
<MODULEPATHS> <MODULEPATHS>
<MODULEPATH id="juce_gui_extra" path="../../modules"/> <MODULEPATH id="juce_gui_extra" path="../../modules"/>

6
examples/NetworkGraphicsDemo/NetworkGraphicsDemo.jucer
View file

@ -114,14 +114,14 @@
</LINUX_MAKE> </LINUX_MAKE>
<ANDROIDSTUDIO androidActivityClass="com.juce.networkgraphicsdemo.JUCENetworkGraphicsDemo" <ANDROIDSTUDIO androidActivityClass="com.juce.networkgraphicsdemo.JUCENetworkGraphicsDemo"
androidInternetNeeded="1" androidBluetoothNeeded="1" androidCpp11="1" androidInternetNeeded="1" androidBluetoothNeeded="1" androidCpp11="1"
targetFolder="Builds/AndroidStudio" androidSDKPath="" androidNDKPath="" targetFolder="Builds/Android" androidSDKPath="" androidNDKPath=""
bigIcon="Ww6bQw" androidScreenOrientation="unspecified" gradleToolchain="clang" bigIcon="Ww6bQw" androidScreenOrientation="unspecified" gradleToolchain="clang"
gradleToolchainVersion="3.6"> gradleToolchainVersion="3.6">
<CONFIGURATIONS> <CONFIGURATIONS>
<CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1" <CONFIGURATION name="Debug" androidArchitectures="armeabi armeabi-v7a x86" isDebug="1"
optimisation="6" targetName="JUCE Network Graphics Demo" defines="JUCE_DEBUG=0"/> optimisation="6" targetName="JUCE Network Graphics Demo" defines="JUCE_DEBUG=0"/>
<CONFIGURATION name="Release" androidArchitectures="armeabi armeabi-v7a x86" <CONFIGURATION name="Release" androidArchitectures="" isDebug="0" optimisation="3"
isDebug="0" optimisation="3" targetName="JUCE Network Graphics Demo"/> targetName="JUCE Network Graphics Demo"/>
</CONFIGURATIONS> </CONFIGURATIONS>
<MODULEPATHS> <MODULEPATHS>
<MODULEPATH id="juce_osc" path="../../modules"/> <MODULEPATH id="juce_osc" path="../../modules"/>

8
examples/OSCReceiver/OSCReceiver.jucer
View file

@ -83,15 +83,15 @@
</MODULEPATHS> </MODULEPATHS>
</XCODE_IPHONE> </XCODE_IPHONE>
<ANDROIDSTUDIO androidActivityClass="com.yourcompany.oscreceiver.OSCReceiver" <ANDROIDSTUDIO androidActivityClass="com.yourcompany.oscreceiver.OSCReceiver"
androidInternetNeeded="1" androidBluetoothNeeded="1" androidCpp11="1" androidInternetNeeded="1" androidBluetoothNeeded="0" androidCpp11="1"
targetFolder="Builds/AndroidStudio" androidScreenOrientation="unspecified" targetFolder="Builds/Android" androidScreenOrientation="unspecified"
gradleToolchain="clang" gradleToolchainVersion="3.6" androidSDKPath="" gradleToolchain="clang" gradleToolchainVersion="3.6" androidSDKPath=""
androidNDKPath=""> androidNDKPath="">
<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"/>
<CONFIGURATION name="Release" androidArchitectures="armeabi armeabi-v7a x86" <CONFIGURATION name="Release" androidArchitectures="" isDebug="0" optimisation="3"
isDebug="0" optimisation="3" targetName="OSCReceiver"/> targetName="OSCReceiver"/>
</CONFIGURATIONS> </CONFIGURATIONS>
<MODULEPATHS> <MODULEPATHS>
<MODULEPATH id="juce_osc" path="../../modules"/> <MODULEPATH id="juce_osc" path="../../modules"/>

6
examples/OSCSender/OSCSender.jucer
View file

@ -75,14 +75,14 @@
</MODULEPATHS> </MODULEPATHS>
</XCODE_IPHONE> </XCODE_IPHONE>
<ANDROIDSTUDIO androidActivityClass="com.yourcompany.oscsender.OSCSender" androidInternetNeeded="1" <ANDROIDSTUDIO androidActivityClass="com.yourcompany.oscsender.OSCSender" androidInternetNeeded="1"
androidBluetoothNeeded="1" androidCpp11="1" targetFolder="Builds/AndroidStudio" androidBluetoothNeeded="0" androidCpp11="1" targetFolder="Builds/Android"
androidSDKPath="" androidNDKPath="" androidScreenOrientation="unspecified" androidSDKPath="" androidNDKPath="" androidScreenOrientation="unspecified"
gradleToolchain="clang" gradleToolchainVersion="3.6"> gradleToolchain="clang" gradleToolchainVersion="3.6">
<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"/>
<CONFIGURATION name="Release" androidArchitectures="armeabi armeabi-v7a x86" <CONFIGURATION name="Release" androidArchitectures="" isDebug="0" optimisation="3"
isDebug="0" optimisation="3" targetName="OSCSender"/> targetName="OSCSender"/>
</CONFIGURATIONS> </CONFIGURATIONS>
<MODULEPATHS> <MODULEPATHS>
<MODULEPATH id="juce_osc" path="../../modules"/> <MODULEPATH id="juce_osc" path="../../modules"/>

4
extras/AudioPerformanceTest/AudioPerformanceTest.jucer
View file

@ -96,10 +96,10 @@
</LINUX_MAKE> </LINUX_MAKE>
<ANDROIDSTUDIO androidActivityClass="com.juce.audioperformancetest.AudioPerformanceTest" <ANDROIDSTUDIO androidActivityClass="com.juce.audioperformancetest.AudioPerformanceTest"
androidInternetNeeded="1" androidBluetoothNeeded="1" androidCpp11="1" androidInternetNeeded="1" androidBluetoothNeeded="1" androidCpp11="1"
androidScreenOrientation="unspecified" targetFolder="Builds/AndroidStudio" androidScreenOrientation="unspecified" targetFolder="Builds/Android"
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="" gradleToolchain="clang" extraDefs="" extraLinkerFlags="" externalLibraries="" gradleToolchain="clang"
gradleToolchainVersion="3.6" buildToolsVersion="23.0.1"> gradleToolchainVersion="3.6" androidMinimumSDK="23">
<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"/>