From ee9531dd533a7511dacfe21cbc8966b0533959dd Mon Sep 17 00:00:00 2001 From: jules Date: Thu, 28 Aug 2014 16:53:58 +0100 Subject: [PATCH] Introjucer: added a JUCE_DONT_DECLARE_PROJECTINFO guard flag around the auto-generated ProjectInfo namespace, in case you need to avoid declaring it for some reason. --- extras/Demo/JuceLibraryCode/JuceHeader.h | 2 ++ extras/Introjucer/JuceLibraryCode/JuceHeader.h | 2 ++ extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h | 2 ++ extras/audio plugin demo/JuceLibraryCode/JuceHeader.h | 2 ++ extras/audio plugin host/JuceLibraryCode/JuceHeader.h | 2 ++ extras/binarybuilder/JuceLibraryCode/JuceHeader.h | 2 ++ extras/example projects/JuceLibraryCode/JuceHeader.h | 2 ++ extras/windows dll/JuceLibraryCode/JuceHeader.h | 2 ++ 8 files changed, 16 insertions(+) diff --git a/extras/Demo/JuceLibraryCode/JuceHeader.h b/extras/Demo/JuceLibraryCode/JuceHeader.h index d07f0a6d60..3f59dc05f2 100644 --- a/extras/Demo/JuceLibraryCode/JuceHeader.h +++ b/extras/Demo/JuceLibraryCode/JuceHeader.h @@ -37,11 +37,13 @@ using namespace juce; #endif +#if ! JUCE_DONT_DECLARE_PROJECTINFO namespace ProjectInfo { const char* const projectName = "JuceDemo"; const char* const versionString = "3.0.0"; const int versionNumber = 0x30000; } +#endif #endif // __APPHEADERFILE_SBBIZR__ diff --git a/extras/Introjucer/JuceLibraryCode/JuceHeader.h b/extras/Introjucer/JuceLibraryCode/JuceHeader.h index 3269ff2624..aa4d9f98c9 100644 --- a/extras/Introjucer/JuceLibraryCode/JuceHeader.h +++ b/extras/Introjucer/JuceLibraryCode/JuceHeader.h @@ -29,11 +29,13 @@ using namespace juce; #endif +#if ! JUCE_DONT_DECLARE_PROJECTINFO namespace ProjectInfo { const char* const projectName = "The Introjucer"; const char* const versionString = "3.1.0"; const int versionNumber = 0x30100; } +#endif #endif // __APPHEADERFILE_M70QFTRRK__ diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h index 73508cc429..4afeb3b763 100644 --- a/extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h +++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h @@ -433,12 +433,14 @@ private: << " using namespace juce;" << newLine << "#endif" << newLine << newLine + << "#if ! JUCE_DONT_DECLARE_PROJECTINFO" << newLine << "namespace ProjectInfo" << newLine << "{" << newLine << " const char* const projectName = " << CppTokeniserFunctions::addEscapeChars (project.getTitle()).quoted() << ";" << newLine << " const char* const versionString = " << CppTokeniserFunctions::addEscapeChars (project.getVersionString()).quoted() << ";" << newLine << " const int versionNumber = " << project.getVersionAsHex() << ";" << newLine << "}" << newLine + << "#endif" << newLine << newLine << "#endif // " << headerGuard << newLine; } diff --git a/extras/audio plugin demo/JuceLibraryCode/JuceHeader.h b/extras/audio plugin demo/JuceLibraryCode/JuceHeader.h index 5d15b01fcf..56dec336c7 100644 --- a/extras/audio plugin demo/JuceLibraryCode/JuceHeader.h +++ b/extras/audio plugin demo/JuceLibraryCode/JuceHeader.h @@ -33,11 +33,13 @@ using namespace juce; #endif +#if ! JUCE_DONT_DECLARE_PROJECTINFO namespace ProjectInfo { const char* const projectName = "JuceDemoPlugin"; const char* const versionString = "1.0.0"; const int versionNumber = 0x10000; } +#endif #endif // __APPHEADERFILE_0NRD9LLGO__ diff --git a/extras/audio plugin host/JuceLibraryCode/JuceHeader.h b/extras/audio plugin host/JuceLibraryCode/JuceHeader.h index 93365e480d..d621d187fa 100644 --- a/extras/audio plugin host/JuceLibraryCode/JuceHeader.h +++ b/extras/audio plugin host/JuceLibraryCode/JuceHeader.h @@ -35,11 +35,13 @@ using namespace juce; #endif +#if ! JUCE_DONT_DECLARE_PROJECTINFO namespace ProjectInfo { const char* const projectName = "Plugin Host"; const char* const versionString = "1.0.0"; const int versionNumber = 0x10000; } +#endif #endif // __APPHEADERFILE_NTE0XB0IJ__ diff --git a/extras/binarybuilder/JuceLibraryCode/JuceHeader.h b/extras/binarybuilder/JuceLibraryCode/JuceHeader.h index 68f06a6e32..ffc6562192 100644 --- a/extras/binarybuilder/JuceLibraryCode/JuceHeader.h +++ b/extras/binarybuilder/JuceLibraryCode/JuceHeader.h @@ -22,11 +22,13 @@ using namespace juce; #endif +#if ! JUCE_DONT_DECLARE_PROJECTINFO namespace ProjectInfo { const char* const projectName = "BinaryBuilder"; const char* const versionString = "1.0.0"; const int versionNumber = 0x10000; } +#endif #endif // __APPHEADERFILE_3T6YQETY1__ diff --git a/extras/example projects/JuceLibraryCode/JuceHeader.h b/extras/example projects/JuceLibraryCode/JuceHeader.h index e86b895346..56b5bc2f5d 100644 --- a/extras/example projects/JuceLibraryCode/JuceHeader.h +++ b/extras/example projects/JuceLibraryCode/JuceHeader.h @@ -27,11 +27,13 @@ using namespace juce; #endif +#if ! JUCE_DONT_DECLARE_PROJECTINFO namespace ProjectInfo { const char* const projectName = "HelloWorld"; const char* const versionString = "1.0.0"; const int versionNumber = 0x10000; } +#endif #endif // __APPHEADERFILE_TTAKTK1S__ diff --git a/extras/windows dll/JuceLibraryCode/JuceHeader.h b/extras/windows dll/JuceLibraryCode/JuceHeader.h index 59b1f3ce2d..59958aebe5 100644 --- a/extras/windows dll/JuceLibraryCode/JuceHeader.h +++ b/extras/windows dll/JuceLibraryCode/JuceHeader.h @@ -35,11 +35,13 @@ using namespace juce; #endif +#if ! JUCE_DONT_DECLARE_PROJECTINFO namespace ProjectInfo { const char* const projectName = "juce_dll"; const char* const versionString = "1.0.0"; const int versionNumber = 0x10000; } +#endif #endif // __APPHEADERFILE_IVABE4__