Browse Source

Introjucer fixes for key shortcut and Android c++ flags. Enabled c++0x mode for Android.

tags/2021-05-28
jules 13 years ago
parent
commit
63bc3f29de
4 changed files with 10 additions and 7 deletions
  1. +1
    -1
      extras/Introjucer/Source/Application/jucer_Application.h
  2. +5
    -2
      extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h
  3. +2
    -2
      extras/JuceDemo/Builds/Android/jni/Android.mk
  4. +2
    -2
      modules/juce_gui_basics/application/juce_Application.cpp

+ 1
- 1
extras/Introjucer/Source/Application/jucer_Application.h View File

@@ -319,7 +319,7 @@ public:
{ {
case CommandIDs::newProject: case CommandIDs::newProject:
result.setInfo ("New Project...", "Creates a new Jucer project", CommandCategories::general, 0); result.setInfo ("New Project...", "Creates a new Jucer project", CommandCategories::general, 0);
result.defaultKeypresses.add (KeyPress ('o', ModifierKeys::commandModifier, 0));
result.defaultKeypresses.add (KeyPress ('n', ModifierKeys::commandModifier, 0));
break; break;
case CommandIDs::open: case CommandIDs::open:


+ 5
- 2
extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h View File

@@ -441,7 +441,9 @@ private:
{ {
const AndroidBuildConfiguration& androidConfig = dynamic_cast <const AndroidBuildConfiguration&> (*config); const AndroidBuildConfiguration& androidConfig = dynamic_cast <const AndroidBuildConfiguration&> (*config);
out << " LOCAL_CPPFLAGS += " << createCPPFlags (*config) << newLine
out << " LOCAL_CPPFLAGS += " << createCPPFlags (androidConfig)
<< (" " + replacePreprocessorTokens (androidConfig, getExtraCompilerFlagsString()).trim()).trimEnd()
<< newLine
<< getDynamicLibs (androidConfig); << getDynamicLibs (androidConfig);
break; break;
@@ -502,7 +504,8 @@ private:
} }
flags << createIncludePathFlags (config) flags << createIncludePathFlags (config)
<< " -O" << config.getGCCOptimisationFlag();
<< " -O" << config.getGCCOptimisationFlag()
<< " -std=c++0x";
defines = mergePreprocessorDefs (defines, getAllPreprocessorDefs (config)); defines = mergePreprocessorDefs (defines, getAllPreprocessorDefs (config));
return flags + createGCCPreprocessorFlags (defines); return flags + createGCCPreprocessorFlags (defines);


+ 2
- 2
extras/JuceDemo/Builds/Android/jni/Android.mk View File

@@ -46,10 +46,10 @@ LOCAL_SRC_FILES := \
../../../../../modules/juce_video/juce_video.cpp\ ../../../../../modules/juce_video/juce_video.cpp\
ifeq ($(CONFIG),Debug) ifeq ($(CONFIG),Debug)
LOCAL_CPPFLAGS += -fsigned-char -fexceptions -frtti -g -I "../../JuceLibraryCode" -O0 -D "JUCE_ANDROID=1" -D "JUCE_ANDROID_API_VERSION=8" -D "JUCE_ANDROID_ACTIVITY_CLASSNAME=com_juce_JuceDemo" -D JUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/juce/JuceDemo\" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_ANDROID_7F0E4A25=1"
LOCAL_CPPFLAGS += -fsigned-char -fexceptions -frtti -g -I "../../JuceLibraryCode" -O0 -std=c++0x -D "JUCE_ANDROID=1" -D "JUCE_ANDROID_API_VERSION=8" -D "JUCE_ANDROID_ACTIVITY_CLASSNAME=com_juce_JuceDemo" -D JUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/juce/JuceDemo\" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_ANDROID_7F0E4A25=1"
LOCAL_LDLIBS := -llog -lGLESv2 LOCAL_LDLIBS := -llog -lGLESv2
else else
LOCAL_CPPFLAGS += -fsigned-char -fexceptions -frtti -I "../../JuceLibraryCode" -Os -D "JUCE_ANDROID=1" -D "JUCE_ANDROID_API_VERSION=8" -D "JUCE_ANDROID_ACTIVITY_CLASSNAME=com_juce_JuceDemo" -D JUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/juce/JuceDemo\" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_ANDROID_7F0E4A25=1"
LOCAL_CPPFLAGS += -fsigned-char -fexceptions -frtti -I "../../JuceLibraryCode" -Os -std=c++0x -D "JUCE_ANDROID=1" -D "JUCE_ANDROID_API_VERSION=8" -D "JUCE_ANDROID_ACTIVITY_CLASSNAME=com_juce_JuceDemo" -D JUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/juce/JuceDemo\" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_ANDROID_7F0E4A25=1"
LOCAL_LDLIBS := -llog -lGLESv2 LOCAL_LDLIBS := -llog -lGLESv2
endif endif


+ 2
- 2
modules/juce_gui_basics/application/juce_Application.cpp View File

@@ -140,7 +140,7 @@ bool JUCEApplication::initialiseApp (const String& commandLine)
{ {
commandLineParameters = commandLine.trim(); commandLineParameters = commandLine.trim();
#if ! JUCE_IOS
#if ! (JUCE_IOS || JUCE_ANDROID)
jassert (appLock == nullptr); // initialiseApp must only be called once! jassert (appLock == nullptr); // initialiseApp must only be called once!
if (! moreThanOneInstanceAllowed()) if (! moreThanOneInstanceAllowed())
@@ -165,7 +165,7 @@ bool JUCEApplication::initialiseApp (const String& commandLine)
juce_initialiseMacMainMenu(); // needs to be called after the app object has created, to get its name juce_initialiseMacMainMenu(); // needs to be called after the app object has created, to get its name
#endif #endif
#if ! JUCE_IOS
#if ! (JUCE_IOS || JUCE_ANDROID)
broadcastCallback = new AppBroadcastCallback(); broadcastCallback = new AppBroadcastCallback();
#endif #endif


Loading…
Cancel
Save