From 63bc3f29de47ed3baccec66eb6b8f4acd11ce10d Mon Sep 17 00:00:00 2001
From: jules <jules@rawmaterialsoftware.com>
Date: Wed, 4 Apr 2012 12:52:07 +0100
Subject: [PATCH] Introjucer fixes for key shortcut and Android c++ flags.
 Enabled c++0x mode for Android.

---
 extras/Introjucer/Source/Application/jucer_Application.h   | 2 +-
 .../Source/Project Saving/jucer_ProjectExport_Android.h    | 7 +++++--
 extras/JuceDemo/Builds/Android/jni/Android.mk              | 4 ++--
 modules/juce_gui_basics/application/juce_Application.cpp   | 4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/extras/Introjucer/Source/Application/jucer_Application.h b/extras/Introjucer/Source/Application/jucer_Application.h
index b6ebea7380..5682f9cdab 100644
--- a/extras/Introjucer/Source/Application/jucer_Application.h
+++ b/extras/Introjucer/Source/Application/jucer_Application.h
@@ -319,7 +319,7 @@ public:
         {
         case CommandIDs::newProject:
             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;
 
         case CommandIDs::open:
diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h
index 275c629fbd..f9b9c19a67 100644
--- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h	
+++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_Android.h	
@@ -441,7 +441,9 @@ private:
             {
                 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);
 
                 break;
@@ -502,7 +504,8 @@ private:
         }
 
         flags << createIncludePathFlags (config)
-              << " -O" << config.getGCCOptimisationFlag();
+              << " -O" << config.getGCCOptimisationFlag()
+              << " -std=c++0x";
 
         defines = mergePreprocessorDefs (defines, getAllPreprocessorDefs (config));
         return flags + createGCCPreprocessorFlags (defines);
diff --git a/extras/JuceDemo/Builds/Android/jni/Android.mk b/extras/JuceDemo/Builds/Android/jni/Android.mk
index 85f8b8e765..526cd1eace 100644
--- a/extras/JuceDemo/Builds/Android/jni/Android.mk
+++ b/extras/JuceDemo/Builds/Android/jni/Android.mk
@@ -46,10 +46,10 @@ LOCAL_SRC_FILES := \
   ../../../../../modules/juce_video/juce_video.cpp\
 
 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
 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
 endif
 
diff --git a/modules/juce_gui_basics/application/juce_Application.cpp b/modules/juce_gui_basics/application/juce_Application.cpp
index dba113bc03..e0f89619e3 100644
--- a/modules/juce_gui_basics/application/juce_Application.cpp
+++ b/modules/juce_gui_basics/application/juce_Application.cpp
@@ -140,7 +140,7 @@ bool JUCEApplication::initialiseApp (const String& commandLine)
 {
     commandLineParameters = commandLine.trim();
 
-   #if ! JUCE_IOS
+   #if ! (JUCE_IOS || JUCE_ANDROID)
     jassert (appLock == nullptr); // initialiseApp must only be called once!
 
     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
    #endif
 
-   #if ! JUCE_IOS
+   #if ! (JUCE_IOS || JUCE_ANDROID)
     broadcastCallback = new AppBroadcastCallback();
    #endif