Browse Source

Re-saved all projects

tags/2021-05-28
hogliux 6 years ago
parent
commit
1cf973ff32
18 changed files with 43 additions and 30 deletions
  1. +5
    -1
      examples/DemoRunner/Builds/Android/app/CMakeLists.txt
  2. +6
    -6
      examples/DemoRunner/Builds/Android/app/build.gradle
  3. BIN
      examples/DemoRunner/Builds/Android/app/src/main/res/drawable-hdpi/icon.png
  4. BIN
      examples/DemoRunner/Builds/Android/app/src/main/res/drawable-ldpi/icon.png
  5. BIN
      examples/DemoRunner/Builds/Android/app/src/main/res/drawable-mdpi/icon.png
  6. BIN
      examples/DemoRunner/Builds/Android/app/src/main/res/drawable-xhdpi/icon.png
  7. +2
    -0
      extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt
  8. +6
    -4
      extras/AudioPerformanceTest/Builds/Android/app/build.gradle
  9. +2
    -0
      extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt
  10. +6
    -6
      extras/AudioPluginHost/Builds/Android/app/build.gradle
  11. BIN
      extras/AudioPluginHost/Builds/Android/app/src/main/res/drawable-hdpi/icon.png
  12. BIN
      extras/AudioPluginHost/Builds/Android/app/src/main/res/drawable-ldpi/icon.png
  13. BIN
      extras/AudioPluginHost/Builds/Android/app/src/main/res/drawable-mdpi/icon.png
  14. BIN
      extras/AudioPluginHost/Builds/Android/app/src/main/res/drawable-xhdpi/icon.png
  15. +3
    -1
      extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt
  16. +10
    -9
      extras/NetworkGraphicsDemo/Builds/Android/app/build.gradle
  17. +3
    -3
      extras/NetworkGraphicsDemo/Builds/Android/app/src/main/AndroidManifest.xml
  18. BIN
      extras/NetworkGraphicsDemo/Builds/Android/app/src/main/res/drawable-mdpi/icon.png

+ 5
- 1
examples/DemoRunner/Builds/Android/app/CMakeLists.txt View File

@@ -8,7 +8,7 @@ SET(BINARY_NAME "juce_jni")
add_library("cpufeatures" STATIC "${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c")
set_source_files_properties("${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c" PROPERTIES COMPILE_FLAGS "-Wno-sign-conversion -Wno-gnu-statement-expression")
add_definitions("-DJUCE_ANDROID=1" "-DJUCE_ANDROID_API_VERSION=23" "-DJUCE_ANDROID_ACTIVITY_CLASSNAME=com_juce_demorunner_DemoRunner" "-DJUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/juce/demorunner/DemoRunner\"" "-DJUCE_ANDROID_SHARING_CONTENT_PROVIDER_CLASSNAME=com_juce_demorunner_SharingContentProvider" "-DJUCE_ANDROID_SHARING_CONTENT_PROVIDER_CLASSPATH=\"com/juce/demorunner/SharingContentProvider\"" "-DJUCE_PUSH_NOTIFICATIONS=1" "-DJUCE_ANDROID_GL_ES_VERSION_3_0=1" "-DJUCE_DEMO_RUNNER=1" "-DJUCE_UNIT_TESTS=1" "-DJUCER_ANDROIDSTUDIO_7F0E4A25=1" "-DJUCE_APP_VERSION=5.4.1" "-DJUCE_APP_VERSION_HEX=0x50401")
add_definitions("-DJUCE_ANDROID=1" "-DJUCE_ANDROID_API_VERSION=23" "-DJUCE_PUSH_NOTIFICATIONS=1" "-DJUCE_ANDROID_GL_ES_VERSION_3_0=1" "-DJUCE_DEMO_RUNNER=1" "-DJUCE_UNIT_TESTS=1" "-DJUCER_ANDROIDSTUDIO_7F0E4A25=1" "-DJUCE_APP_VERSION=5.4.1" "-DJUCE_APP_VERSION_HEX=0x50401")
include_directories( AFTER
"../../../JuceLibraryCode"
@@ -704,7 +704,9 @@ add_library( ${BINARY_NAME}
"../../../../../modules/juce_core/misc/juce_Uuid.cpp"
"../../../../../modules/juce_core/misc/juce_Uuid.h"
"../../../../../modules/juce_core/misc/juce_WindowsRegistry.h"
"../../../../../modules/juce_core/native/java/README.txt"
"../../../../../modules/juce_core/native/juce_android_Files.cpp"
"../../../../../modules/juce_core/native/juce_android_JNIHelpers.cpp"
"../../../../../modules/juce_core/native/juce_android_JNIHelpers.h"
"../../../../../modules/juce_core/native/juce_android_Misc.cpp"
"../../../../../modules/juce_core/native/juce_android_Network.cpp"
@@ -2272,7 +2274,9 @@ set_source_files_properties("../../../../../modules/juce_core/misc/juce_StdFunct
set_source_files_properties("../../../../../modules/juce_core/misc/juce_Uuid.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/misc/juce_Uuid.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/misc/juce_WindowsRegistry.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/java/README.txt" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/juce_android_Files.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/juce_android_JNIHelpers.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/juce_android_JNIHelpers.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/juce_android_Misc.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/juce_android_Network.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)


+ 6
- 6
examples/DemoRunner/Builds/Android/app/build.gradle View File

@@ -85,12 +85,12 @@ android {
sourceSets {
main.java.srcDirs +=
["../../../../../modules/juce_audio_devices/native/java",
"../../../../../modules/juce_core/native/java",
"../../../../../modules/juce_gui_basics/native/java",
"../../../../../modules/juce_gui_extra/native/java",
"../../../../../modules/juce_opengl/native/java",
"../../../../../modules/juce_video/native/java"]
["../../../../../modules/juce_core/native/javacore/init",
"../../../../../modules/juce_core/native/javacore/app",
"../../../../../modules/juce_gui_basics/native/javacore/app"]
main.res.srcDirs +=
[]
}
repositories {


BIN
examples/DemoRunner/Builds/Android/app/src/main/res/drawable-hdpi/icon.png View File

Before After
Width: 384  |  Height: 384  |  Size: 34KB Width: 384  |  Height: 384  |  Size: 34KB

BIN
examples/DemoRunner/Builds/Android/app/src/main/res/drawable-ldpi/icon.png View File

Before After
Width: 192  |  Height: 192  |  Size: 15KB Width: 192  |  Height: 192  |  Size: 15KB

BIN
examples/DemoRunner/Builds/Android/app/src/main/res/drawable-mdpi/icon.png View File

Before After
Width: 256  |  Height: 256  |  Size: 18KB Width: 256  |  Height: 256  |  Size: 18KB

BIN
examples/DemoRunner/Builds/Android/app/src/main/res/drawable-xhdpi/icon.png View File

Before After
Width: 512  |  Height: 512  |  Size: 44KB Width: 512  |  Height: 512  |  Size: 44KB

+ 2
- 0
extras/AudioPerformanceTest/Builds/Android/app/CMakeLists.txt View File

@@ -557,6 +557,7 @@ add_library( ${BINARY_NAME}
"../../../../../modules/juce_core/misc/juce_Uuid.cpp"
"../../../../../modules/juce_core/misc/juce_Uuid.h"
"../../../../../modules/juce_core/misc/juce_WindowsRegistry.h"
"../../../../../modules/juce_core/native/java/README.txt"
"../../../../../modules/juce_core/native/juce_android_Files.cpp"
"../../../../../modules/juce_core/native/juce_android_JNIHelpers.cpp"
"../../../../../modules/juce_core/native/juce_android_JNIHelpers.h"
@@ -1828,6 +1829,7 @@ set_source_files_properties("../../../../../modules/juce_core/misc/juce_StdFunct
set_source_files_properties("../../../../../modules/juce_core/misc/juce_Uuid.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/misc/juce_Uuid.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/misc/juce_WindowsRegistry.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/java/README.txt" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/juce_android_Files.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/juce_android_JNIHelpers.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/juce_android_JNIHelpers.h" PROPERTIES HEADER_FILE_ONLY TRUE)


+ 6
- 4
extras/AudioPerformanceTest/Builds/Android/app/build.gradle View File

@@ -88,10 +88,12 @@ android {
sourceSets {
main.java.srcDirs +=
["../../../../../modules/juce_audio_devices/native/java",
"../../../../../modules/juce_core/native/java",
"../../../../../modules/juce_gui_basics/native/java",
"../../../../../modules/juce_gui_extra/native/java"]
["../../../../../modules/juce_core/native/javacore/init",
"../../../../../modules/juce_core/native/javacore/app",
"../../../../../modules/juce_gui_basics/native/javacore/app"]
main.res.srcDirs +=
[]
}
repositories {


+ 2
- 0
extras/AudioPluginHost/Builds/Android/app/CMakeLists.txt View File

@@ -574,6 +574,7 @@ add_library( ${BINARY_NAME}
"../../../../../modules/juce_core/misc/juce_Uuid.cpp"
"../../../../../modules/juce_core/misc/juce_Uuid.h"
"../../../../../modules/juce_core/misc/juce_WindowsRegistry.h"
"../../../../../modules/juce_core/native/java/README.txt"
"../../../../../modules/juce_core/native/juce_android_Files.cpp"
"../../../../../modules/juce_core/native/juce_android_JNIHelpers.cpp"
"../../../../../modules/juce_core/native/juce_android_JNIHelpers.h"
@@ -1918,6 +1919,7 @@ set_source_files_properties("../../../../../modules/juce_core/misc/juce_StdFunct
set_source_files_properties("../../../../../modules/juce_core/misc/juce_Uuid.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/misc/juce_Uuid.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/misc/juce_WindowsRegistry.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/java/README.txt" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/juce_android_Files.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/juce_android_JNIHelpers.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/juce_android_JNIHelpers.h" PROPERTIES HEADER_FILE_ONLY TRUE)


+ 6
- 6
extras/AudioPluginHost/Builds/Android/app/build.gradle View File

@@ -85,12 +85,12 @@ android {
sourceSets {
main.java.srcDirs +=
["../../../../../modules/juce_audio_devices/native/java",
"../../../../../modules/juce_core/native/java",
"../../../../../modules/juce_gui_basics/native/java",
"../../../../../modules/juce_gui_extra/native/java",
"../../../../../modules/juce_opengl/native/java",
"../../../../../modules/juce_video/native/java"]
["../../../../../modules/juce_core/native/javacore/init",
"../../../../../modules/juce_core/native/javacore/app",
"../../../../../modules/juce_gui_basics/native/javacore/app"]
main.res.srcDirs +=
[]
}
repositories {


BIN
extras/AudioPluginHost/Builds/Android/app/src/main/res/drawable-hdpi/icon.png View File

Before After
Width: 384  |  Height: 384  |  Size: 34KB Width: 384  |  Height: 384  |  Size: 34KB

BIN
extras/AudioPluginHost/Builds/Android/app/src/main/res/drawable-ldpi/icon.png View File

Before After
Width: 192  |  Height: 192  |  Size: 15KB Width: 192  |  Height: 192  |  Size: 15KB

BIN
extras/AudioPluginHost/Builds/Android/app/src/main/res/drawable-mdpi/icon.png View File

Before After
Width: 256  |  Height: 256  |  Size: 18KB Width: 256  |  Height: 256  |  Size: 18KB

BIN
extras/AudioPluginHost/Builds/Android/app/src/main/res/drawable-xhdpi/icon.png View File

Before After
Width: 512  |  Height: 512  |  Size: 44KB Width: 512  |  Height: 512  |  Size: 44KB

+ 3
- 1
extras/NetworkGraphicsDemo/Builds/Android/app/CMakeLists.txt View File

@@ -8,7 +8,7 @@ SET(BINARY_NAME "juce_jni")
add_library("cpufeatures" STATIC "${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c")
set_source_files_properties("${ANDROID_NDK}/sources/android/cpufeatures/cpu-features.c" PROPERTIES COMPILE_FLAGS "-Wno-sign-conversion -Wno-gnu-statement-expression")
add_definitions("-DJUCE_ANDROID=1" "-DJUCE_ANDROID_API_VERSION=10" "-DJUCE_PUSH_NOTIFICATIONS=1" "-DJUCER_ANDROIDSTUDIO_7F0E4A25=1" "-DJUCE_APP_VERSION=1.0.0" "-DJUCE_APP_VERSION_HEX=0x10000")
add_definitions("-DJUCE_ANDROID=1" "-DJUCE_ANDROID_API_VERSION=16" "-DJUCE_PUSH_NOTIFICATIONS=1" "-DJUCER_ANDROIDSTUDIO_7F0E4A25=1" "-DJUCE_APP_VERSION=1.0.0" "-DJUCE_APP_VERSION_HEX=0x10000")
include_directories( AFTER
"../../../JuceLibraryCode"
@@ -561,6 +561,7 @@ add_library( ${BINARY_NAME}
"../../../../../modules/juce_core/misc/juce_Uuid.cpp"
"../../../../../modules/juce_core/misc/juce_Uuid.h"
"../../../../../modules/juce_core/misc/juce_WindowsRegistry.h"
"../../../../../modules/juce_core/native/java/README.txt"
"../../../../../modules/juce_core/native/juce_android_Files.cpp"
"../../../../../modules/juce_core/native/juce_android_JNIHelpers.cpp"
"../../../../../modules/juce_core/native/juce_android_JNIHelpers.h"
@@ -1907,6 +1908,7 @@ set_source_files_properties("../../../../../modules/juce_core/misc/juce_StdFunct
set_source_files_properties("../../../../../modules/juce_core/misc/juce_Uuid.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/misc/juce_Uuid.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/misc/juce_WindowsRegistry.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/java/README.txt" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/juce_android_Files.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/juce_android_JNIHelpers.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_core/native/juce_android_JNIHelpers.h" PROPERTIES HEADER_FILE_ONLY TRUE)


+ 10
- 9
extras/NetworkGraphicsDemo/Builds/Android/app/build.gradle View File

@@ -1,7 +1,7 @@
apply plugin: 'com.android.application'
android {
compileSdkVersion 10
compileSdkVersion 16
buildToolsVersion "28.0.0"
externalNativeBuild {
cmake {
@@ -20,11 +20,11 @@ android {
defaultConfig {
applicationId "com.juce.networkgraphicsdemo"
minSdkVersion 10
targetSdkVersion 10
minSdkVersion 16
targetSdkVersion 16
externalNativeBuild {
cmake {
arguments "-DANDROID_TOOLCHAIN=clang", "-DANDROID_PLATFORM=android-10", "-DANDROID_STL=c++_static", "-DANDROID_CPP_FEATURES=exceptions rtti", "-DANDROID_ARM_MODE=arm", "-DANDROID_ARM_NEON=TRUE"
arguments "-DANDROID_TOOLCHAIN=clang", "-DANDROID_PLATFORM=android-16", "-DANDROID_STL=c++_static", "-DANDROID_CPP_FEATURES=exceptions rtti", "-DANDROID_ARM_MODE=arm", "-DANDROID_ARM_NEON=TRUE"
cFlags "-fsigned-char"
cppFlags "-fsigned-char", "-std=c++14"
}
@@ -85,11 +85,12 @@ android {
sourceSets {
main.java.srcDirs +=
["../../../../../modules/juce_audio_devices/native/java",
"../../../../../modules/juce_core/native/java",
"../../../../../modules/juce_gui_basics/native/java",
"../../../../../modules/juce_gui_extra/native/java",
"../../../../../modules/juce_opengl/native/java"]
["../../../../../modules/juce_core/native/javacore/init",
"../../../../../modules/juce_core/native/javacore/app",
"../../../../../modules/juce_gui_basics/native/javacore/app"]
main.res.srcDirs +=
[]
}
repositories {


+ 3
- 3
extras/NetworkGraphicsDemo/Builds/Android/app/src/main/AndroidManifest.xml View File

@@ -10,9 +10,9 @@
<uses-permission android:name="android.permission.BLUETOOTH"/>
<uses-permission android:name="android.permission.INTERNET"/>
<uses-feature android:glEsVersion="0x00020000" android:required="true"/>
<application android:label="@string/app_name" android:name="com.roli.juce.JuceApp" android:icon="@drawable/icon">
<activity android:name="android.app.Activity" android:label="@string/app_name" android:configChanges="keyboardHidden|orientation"
android:screenOrientation="unspecified" android:launchMode="singleTask">
<application android:label="@string/app_name" android:name="com.roli.juce.JuceApp" android:icon="@drawable/icon" android:hardwareAccelerated="false">
<activity android:name="android.app.Activity" android:label="@string/app_name" android:configChanges="keyboardHidden|orientation|screenSize"
android:screenOrientation="unspecified" android:launchMode="singleTask" android:hardwareAccelerated="true">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>


BIN
extras/NetworkGraphicsDemo/Builds/Android/app/src/main/res/drawable-mdpi/icon.png View File

Before After
Width: 512  |  Height: 512  |  Size: 44KB Width: 512  |  Height: 512  |  Size: 44KB

Loading…
Cancel
Save