1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-07 04:10:08 +00:00

Re-save all projects.

This commit is contained in:
Lukasz Kozakiewicz 2017-10-23 09:54:16 +02:00
parent b2d2bda7a1
commit fc231a862f
317 changed files with 15941 additions and 174 deletions

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_ANDROID_ACTIVITY_CLASSNAME=com_juce_networkgraphicsdemo_JUCENetworkGraphicsDemo" "-DJUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/juce/networkgraphicsdemo/JUCENetworkGraphicsDemo\"" "-DJUCER_ANDROIDSTUDIO_7F0E4A25=1" "-DJUCE_APP_VERSION=1.0.0" "-DJUCE_APP_VERSION_HEX=0x10000")
add_definitions("-DJUCE_ANDROID=1" "-DJUCE_ANDROID_API_VERSION=10" "-DJUCE_ANDROID_ACTIVITY_CLASSNAME=com_juce_networkgraphicsdemo_JUCENetworkGraphicsDemo" "-DJUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/juce/networkgraphicsdemo/JUCENetworkGraphicsDemo\"" "-DJUCE_PUSH_NOTIFICATIONS=1" "-DJUCER_ANDROIDSTUDIO_7F0E4A25=1" "-DJUCE_APP_VERSION=1.0.0" "-DJUCE_APP_VERSION_HEX=0x10000")
include_directories( AFTER
"../../../JuceLibraryCode"
@ -16,6 +16,8 @@ include_directories( AFTER
"${ANDROID_NDK}/sources/android/cpufeatures"
)
enable_language(ASM)
IF(JUCE_BUILD_CONFIGFURATION MATCHES "DEBUG")
add_definitions("-DJUCE_DEBUG=0" "-DDEBUG=1" "-D_DEBUG=1")
ELSEIF(JUCE_BUILD_CONFIGFURATION MATCHES "RELEASE")
@ -1151,6 +1153,8 @@ add_library( ${BINARY_NAME}
"../../../../../modules/juce_gui_extra/misc/juce_LiveConstantEditor.h"
"../../../../../modules/juce_gui_extra/misc/juce_PreferencesPanel.cpp"
"../../../../../modules/juce_gui_extra/misc/juce_PreferencesPanel.h"
"../../../../../modules/juce_gui_extra/misc/juce_PushNotifications.cpp"
"../../../../../modules/juce_gui_extra/misc/juce_PushNotifications.h"
"../../../../../modules/juce_gui_extra/misc/juce_RecentlyOpenedFilesList.cpp"
"../../../../../modules/juce_gui_extra/misc/juce_RecentlyOpenedFilesList.h"
"../../../../../modules/juce_gui_extra/misc/juce_SplashScreen.cpp"
@ -1158,7 +1162,9 @@ add_library( ${BINARY_NAME}
"../../../../../modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.cpp"
"../../../../../modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.h"
"../../../../../modules/juce_gui_extra/misc/juce_WebBrowserComponent.h"
"../../../../../modules/juce_gui_extra/native/juce_android_PushNotifications.cpp"
"../../../../../modules/juce_gui_extra/native/juce_android_WebBrowserComponent.cpp"
"../../../../../modules/juce_gui_extra/native/juce_ios_PushNotifications.cpp"
"../../../../../modules/juce_gui_extra/native/juce_ios_UIViewComponent.mm"
"../../../../../modules/juce_gui_extra/native/juce_linux_X11_SystemTrayIcon.cpp"
"../../../../../modules/juce_gui_extra/native/juce_linux_X11_WebBrowserComponent.cpp"
@ -2367,6 +2373,8 @@ set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_Liv
set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_LiveConstantEditor.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_PreferencesPanel.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_PreferencesPanel.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_PushNotifications.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_PushNotifications.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_RecentlyOpenedFilesList.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_RecentlyOpenedFilesList.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_SplashScreen.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
@ -2374,7 +2382,9 @@ set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_Spl
set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_SystemTrayIconComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_extra/misc/juce_WebBrowserComponent.h" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_android_PushNotifications.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_android_WebBrowserComponent.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_ios_PushNotifications.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_ios_UIViewComponent.mm" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_linux_X11_SystemTrayIcon.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)
set_source_files_properties("../../../../../modules/juce_gui_extra/native/juce_linux_X11_WebBrowserComponent.cpp" PROPERTIES HEADER_FILE_ONLY TRUE)

View file

@ -84,5 +84,6 @@ repositories {
dependencies {
}
}

View file

@ -13,7 +13,7 @@
<uses-feature android:glEsVersion="0x00020000" android:required="true"/>
<application android:label="@string/app_name" android:icon="@drawable/icon">
<activity android:name="JUCENetworkGraphicsDemo" android:label="@string/app_name" android:configChanges="keyboardHidden|orientation"
android:screenOrientation="unspecified">
android:screenOrientation="unspecified" android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>

View file

@ -312,6 +312,7 @@ public class JUCENetworkGraphicsDemo extends Activity
getApplicationInfo().dataDir);
}
//==============================================================================
private void hideActionBar()
{
// get "getActionBar" method
@ -383,6 +384,7 @@ public class JUCENetworkGraphicsDemo extends Activity
private native void resumeApp();
private native void setScreenSize (int screenWidth, int screenHeight, int dpi);
private native void appActivityResult (int requestCode, int resultCode, Intent data);
private native void appNewIntent (Intent intent);
//==============================================================================
private ViewHolder viewHolder;
@ -1450,6 +1452,15 @@ public class JUCENetworkGraphicsDemo extends Activity
appActivityResult (requestCode, resultCode, data);
}
@Override
protected void onNewIntent (Intent intent)
{
super.onNewIntent(intent);
setIntent(intent);
appNewIntent (intent);
}
//==============================================================================
public final Typeface getTypeFaceFromAsset (String assetName)
{