Introjucer: made it possible to override settings in AppConfig.h. Version number bump.

extras/Introjucer/JuceLibraryCode/AppConfig.h

@@ -25,28 +25,58 @@
 //==============================================================================
 // juce_core flags:
 
-//#define  JUCE_FORCE_DEBUG
-//#define  JUCE_LOG_ASSERTIONS
-//#define  JUCE_CHECK_MEMORY_LEAKS
-//#define  JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+#ifndef    JUCE_FORCE_DEBUG
+ //#define JUCE_FORCE_DEBUG
+#endif
+
+#ifndef    JUCE_LOG_ASSERTIONS
+ //#define JUCE_LOG_ASSERTIONS
+#endif
+
+#ifndef    JUCE_CHECK_MEMORY_LEAKS
+ //#define JUCE_CHECK_MEMORY_LEAKS
+#endif
+
+#ifndef    JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+ //#define JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+#endif
 
 //==============================================================================
 // juce_graphics flags:
 
-#define    JUCE_USE_COREIMAGE_LOADER 0
-//#define  JUCE_USE_DIRECTWRITE
+#ifndef    JUCE_USE_COREIMAGE_LOADER
+ #define   JUCE_USE_COREIMAGE_LOADER 0
+#endif
+
+#ifndef    JUCE_USE_DIRECTWRITE
+ //#define JUCE_USE_DIRECTWRITE
+#endif
 
 //==============================================================================
 // juce_gui_basics flags:
 
-//#define  JUCE_ENABLE_REPAINT_DEBUGGING
-//#define  JUCE_USE_XSHM
-//#define  JUCE_USE_XRENDER
-//#define  JUCE_USE_XCURSOR
+#ifndef    JUCE_ENABLE_REPAINT_DEBUGGING
+ //#define JUCE_ENABLE_REPAINT_DEBUGGING
+#endif
+
+#ifndef    JUCE_USE_XSHM
+ //#define JUCE_USE_XSHM
+#endif
+
+#ifndef    JUCE_USE_XRENDER
+ //#define JUCE_USE_XRENDER
+#endif
+
+#ifndef    JUCE_USE_XCURSOR
+ //#define JUCE_USE_XCURSOR
+#endif
 
 //==============================================================================
 // juce_gui_extra flags:
 
-//#define  JUCE_WEB_BROWSER
+#ifndef    JUCE_WEB_BROWSER
+ //#define JUCE_WEB_BROWSER
+#endif
+
 
 #endif  // __JUCE_APPCONFIG_M70QFTRRK__

extras/Introjucer/Source/Project Saving/jucer_ProjectSaver.h

@@ -276,18 +276,19 @@ private:
                     const Project::ConfigFlag* const f = flags[i];
                     const String value (project.getConfigFlag (f->symbol).toString());
 
+                    out << "#ifndef    " << f->symbol << newLine;
+
                     if (value == Project::configFlagEnabled)
-                        out << "#define    " << f->symbol << " 1";
+                        out << " #define   " << f->symbol << " 1";
                     else if (value == Project::configFlagDisabled)
-                        out << "#define    " << f->symbol << " 0";
+                        out << " #define   " << f->symbol << " 0";
                     else
-                        out << "//#define  " << f->symbol;
+                        out << " //#define " << f->symbol;
 
-                    out << newLine;
+                    out << newLine
+                        << "#endif" << newLine
+                        << newLine;
                 }
-
-                if (j < modules.size() - 1)
-                    out << newLine;
             }
         }
 

extras/JuceDemo/JuceLibraryCode/AppConfig.h

@@ -32,60 +32,134 @@
 //==============================================================================
 // juce_audio_devices flags:
 
-//#define  JUCE_ASIO
-//#define  JUCE_WASAPI
-//#define  JUCE_DIRECTSOUND
-//#define  JUCE_ALSA
-//#define  JUCE_JACK
-//#define  JUCE_USE_CDREADER
-//#define  JUCE_USE_CDBURNER
+#ifndef    JUCE_ASIO
+ //#define JUCE_ASIO
+#endif
+
+#ifndef    JUCE_WASAPI
+ //#define JUCE_WASAPI
+#endif
+
+#ifndef    JUCE_DIRECTSOUND
+ //#define JUCE_DIRECTSOUND
+#endif
+
+#ifndef    JUCE_ALSA
+ //#define JUCE_ALSA
+#endif
+
+#ifndef    JUCE_JACK
+ //#define JUCE_JACK
+#endif
+
+#ifndef    JUCE_USE_CDREADER
+ //#define JUCE_USE_CDREADER
+#endif
+
+#ifndef    JUCE_USE_CDBURNER
+ //#define JUCE_USE_CDBURNER
+#endif
 
 //==============================================================================
 // juce_audio_formats flags:
 
-//#define  JUCE_USE_FLAC
-//#define  JUCE_USE_OGGVORBIS
-//#define  JUCE_USE_MP3AUDIOFORMAT
+#ifndef    JUCE_USE_FLAC
+ //#define JUCE_USE_FLAC
+#endif
+
+#ifndef    JUCE_USE_OGGVORBIS
+ //#define JUCE_USE_OGGVORBIS
+#endif
+
+#ifndef    JUCE_USE_MP3AUDIOFORMAT
+ //#define JUCE_USE_MP3AUDIOFORMAT
+#endif
 
 //==============================================================================
 // juce_audio_processors flags:
 
-#define    JUCE_PLUGINHOST_VST 0
-#define    JUCE_PLUGINHOST_AU 0
+#ifndef    JUCE_PLUGINHOST_VST
+ #define   JUCE_PLUGINHOST_VST 0
+#endif
+
+#ifndef    JUCE_PLUGINHOST_AU
+ #define   JUCE_PLUGINHOST_AU 0
+#endif
 
 //==============================================================================
 // juce_core flags:
 
-//#define  JUCE_FORCE_DEBUG
-//#define  JUCE_LOG_ASSERTIONS
-//#define  JUCE_CHECK_MEMORY_LEAKS
-//#define  JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+#ifndef    JUCE_FORCE_DEBUG
+ //#define JUCE_FORCE_DEBUG
+#endif
+
+#ifndef    JUCE_LOG_ASSERTIONS
+ //#define JUCE_LOG_ASSERTIONS
+#endif
+
+#ifndef    JUCE_CHECK_MEMORY_LEAKS
+ //#define JUCE_CHECK_MEMORY_LEAKS
+#endif
+
+#ifndef    JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+ //#define JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+#endif
 
 //==============================================================================
 // juce_graphics flags:
 
-//#define  JUCE_USE_COREIMAGE_LOADER
-//#define  JUCE_USE_DIRECTWRITE
+#ifndef    JUCE_USE_COREIMAGE_LOADER
+ //#define JUCE_USE_COREIMAGE_LOADER
+#endif
+
+#ifndef    JUCE_USE_DIRECTWRITE
+ //#define JUCE_USE_DIRECTWRITE
+#endif
 
 //==============================================================================
 // juce_gui_basics flags:
 
-//#define  JUCE_ENABLE_REPAINT_DEBUGGING
-//#define  JUCE_USE_XSHM
-//#define  JUCE_USE_XRENDER
-//#define  JUCE_USE_XCURSOR
+#ifndef    JUCE_ENABLE_REPAINT_DEBUGGING
+ //#define JUCE_ENABLE_REPAINT_DEBUGGING
+#endif
+
+#ifndef    JUCE_USE_XSHM
+ //#define JUCE_USE_XSHM
+#endif
+
+#ifndef    JUCE_USE_XRENDER
+ //#define JUCE_USE_XRENDER
+#endif
+
+#ifndef    JUCE_USE_XCURSOR
+ //#define JUCE_USE_XCURSOR
+#endif
 
 //==============================================================================
 // juce_gui_extra flags:
 
-//#define  JUCE_WEB_BROWSER
+#ifndef    JUCE_WEB_BROWSER
+ //#define JUCE_WEB_BROWSER
+#endif
 
 //==============================================================================
 // juce_video flags:
 
-//#define  JUCE_DIRECTSHOW
-//#define  JUCE_MEDIAFOUNDATION
-//#define  JUCE_QUICKTIME
-//#define  JUCE_USE_CAMERA
+#ifndef    JUCE_DIRECTSHOW
+ //#define JUCE_DIRECTSHOW
+#endif
+
+#ifndef    JUCE_MEDIAFOUNDATION
+ //#define JUCE_MEDIAFOUNDATION
+#endif
+
+#ifndef    JUCE_QUICKTIME
+ //#define JUCE_QUICKTIME
+#endif
+
+#ifndef    JUCE_USE_CAMERA
+ //#define JUCE_USE_CAMERA
+#endif
+
 
 #endif  // __JUCE_APPCONFIG_SLVVV6J__

extras/audio plugin demo/JuceLibraryCode/AppConfig.h

@@ -29,48 +29,109 @@
 //==============================================================================
 // juce_audio_devices flags:
 
-//#define  JUCE_ASIO
-//#define  JUCE_WASAPI
-//#define  JUCE_DIRECTSOUND
-//#define  JUCE_ALSA
-//#define  JUCE_JACK
-//#define  JUCE_USE_CDREADER
-//#define  JUCE_USE_CDBURNER
+#ifndef    JUCE_ASIO
+ //#define JUCE_ASIO
+#endif
+
+#ifndef    JUCE_WASAPI
+ //#define JUCE_WASAPI
+#endif
+
+#ifndef    JUCE_DIRECTSOUND
+ //#define JUCE_DIRECTSOUND
+#endif
+
+#ifndef    JUCE_ALSA
+ //#define JUCE_ALSA
+#endif
+
+#ifndef    JUCE_JACK
+ //#define JUCE_JACK
+#endif
+
+#ifndef    JUCE_USE_CDREADER
+ //#define JUCE_USE_CDREADER
+#endif
+
+#ifndef    JUCE_USE_CDBURNER
+ //#define JUCE_USE_CDBURNER
+#endif
 
 //==============================================================================
 // juce_audio_formats flags:
 
-//#define  JUCE_USE_FLAC
-//#define  JUCE_USE_OGGVORBIS
-//#define  JUCE_USE_MP3AUDIOFORMAT
+#ifndef    JUCE_USE_FLAC
+ //#define JUCE_USE_FLAC
+#endif
+
+#ifndef    JUCE_USE_OGGVORBIS
+ //#define JUCE_USE_OGGVORBIS
+#endif
+
+#ifndef    JUCE_USE_MP3AUDIOFORMAT
+ //#define JUCE_USE_MP3AUDIOFORMAT
+#endif
 
 //==============================================================================
 // juce_audio_processors flags:
 
-#define    JUCE_PLUGINHOST_VST 0
-#define    JUCE_PLUGINHOST_AU 0
+#ifndef    JUCE_PLUGINHOST_VST
+ #define   JUCE_PLUGINHOST_VST 0
+#endif
+
+#ifndef    JUCE_PLUGINHOST_AU
+ #define   JUCE_PLUGINHOST_AU 0
+#endif
 
 //==============================================================================
 // juce_core flags:
 
-//#define  JUCE_FORCE_DEBUG
-//#define  JUCE_LOG_ASSERTIONS
-//#define  JUCE_CHECK_MEMORY_LEAKS
-//#define  JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+#ifndef    JUCE_FORCE_DEBUG
+ //#define JUCE_FORCE_DEBUG
+#endif
+
+#ifndef    JUCE_LOG_ASSERTIONS
+ //#define JUCE_LOG_ASSERTIONS
+#endif
+
+#ifndef    JUCE_CHECK_MEMORY_LEAKS
+ //#define JUCE_CHECK_MEMORY_LEAKS
+#endif
+
+#ifndef    JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+ //#define JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+#endif
 
 //==============================================================================
 // juce_graphics flags:
 
-//#define  JUCE_USE_COREIMAGE_LOADER
-//#define  JUCE_USE_DIRECTWRITE
+#ifndef    JUCE_USE_COREIMAGE_LOADER
+ //#define JUCE_USE_COREIMAGE_LOADER
+#endif
+
+#ifndef    JUCE_USE_DIRECTWRITE
+ //#define JUCE_USE_DIRECTWRITE
+#endif
 
 //==============================================================================
 // juce_gui_basics flags:
 
-//#define  JUCE_ENABLE_REPAINT_DEBUGGING
-//#define  JUCE_USE_XSHM
-//#define  JUCE_USE_XRENDER
-//#define  JUCE_USE_XCURSOR
+#ifndef    JUCE_ENABLE_REPAINT_DEBUGGING
+ //#define JUCE_ENABLE_REPAINT_DEBUGGING
+#endif
+
+#ifndef    JUCE_USE_XSHM
+ //#define JUCE_USE_XSHM
+#endif
+
+#ifndef    JUCE_USE_XRENDER
+ //#define JUCE_USE_XRENDER
+#endif
+
+#ifndef    JUCE_USE_XCURSOR
+ //#define JUCE_USE_XCURSOR
+#endif
+
 
 //==============================================================================
 // Audio plugin settings..

extras/audio plugin host/JuceLibraryCode/AppConfig.h

@@ -32,60 +32,134 @@
 //==============================================================================
 // juce_audio_devices flags:
 
-//#define  JUCE_ASIO
-#define    JUCE_WASAPI 1
-#define    JUCE_DIRECTSOUND 1
-#define    JUCE_ALSA 1
-//#define  JUCE_JACK
-#define    JUCE_USE_CDREADER 0
-#define    JUCE_USE_CDBURNER 0
+#ifndef    JUCE_ASIO
+ //#define JUCE_ASIO
+#endif
+
+#ifndef    JUCE_WASAPI
+ #define   JUCE_WASAPI 1
+#endif
+
+#ifndef    JUCE_DIRECTSOUND
+ #define   JUCE_DIRECTSOUND 1
+#endif
+
+#ifndef    JUCE_ALSA
+ #define   JUCE_ALSA 1
+#endif
+
+#ifndef    JUCE_JACK
+ //#define JUCE_JACK
+#endif
+
+#ifndef    JUCE_USE_CDREADER
+ #define   JUCE_USE_CDREADER 0
+#endif
+
+#ifndef    JUCE_USE_CDBURNER
+ #define   JUCE_USE_CDBURNER 0
+#endif
 
 //==============================================================================
 // juce_audio_formats flags:
 
-#define    JUCE_USE_FLAC 0
-#define    JUCE_USE_OGGVORBIS 0
-//#define  JUCE_USE_MP3AUDIOFORMAT
+#ifndef    JUCE_USE_FLAC
+ #define   JUCE_USE_FLAC 0
+#endif
+
+#ifndef    JUCE_USE_OGGVORBIS
+ #define   JUCE_USE_OGGVORBIS 0
+#endif
+
+#ifndef    JUCE_USE_MP3AUDIOFORMAT
+ //#define JUCE_USE_MP3AUDIOFORMAT
+#endif
 
 //==============================================================================
 // juce_audio_processors flags:
 
-#define    JUCE_PLUGINHOST_VST 1
-#define    JUCE_PLUGINHOST_AU 1
+#ifndef    JUCE_PLUGINHOST_VST
+ #define   JUCE_PLUGINHOST_VST 1
+#endif
+
+#ifndef    JUCE_PLUGINHOST_AU
+ #define   JUCE_PLUGINHOST_AU 1
+#endif
 
 //==============================================================================
 // juce_core flags:
 
-//#define  JUCE_FORCE_DEBUG
-//#define  JUCE_LOG_ASSERTIONS
-//#define  JUCE_CHECK_MEMORY_LEAKS
-//#define  JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+#ifndef    JUCE_FORCE_DEBUG
+ //#define JUCE_FORCE_DEBUG
+#endif
+
+#ifndef    JUCE_LOG_ASSERTIONS
+ //#define JUCE_LOG_ASSERTIONS
+#endif
+
+#ifndef    JUCE_CHECK_MEMORY_LEAKS
+ //#define JUCE_CHECK_MEMORY_LEAKS
+#endif
+
+#ifndef    JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+ //#define JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+#endif
 
 //==============================================================================
 // juce_graphics flags:
 
-//#define  JUCE_USE_COREIMAGE_LOADER
-//#define  JUCE_USE_DIRECTWRITE
+#ifndef    JUCE_USE_COREIMAGE_LOADER
+ //#define JUCE_USE_COREIMAGE_LOADER
+#endif
+
+#ifndef    JUCE_USE_DIRECTWRITE
+ //#define JUCE_USE_DIRECTWRITE
+#endif
 
 //==============================================================================
 // juce_gui_basics flags:
 
-//#define  JUCE_ENABLE_REPAINT_DEBUGGING
-//#define  JUCE_USE_XSHM
-//#define  JUCE_USE_XRENDER
-//#define  JUCE_USE_XCURSOR
+#ifndef    JUCE_ENABLE_REPAINT_DEBUGGING
+ //#define JUCE_ENABLE_REPAINT_DEBUGGING
+#endif
+
+#ifndef    JUCE_USE_XSHM
+ //#define JUCE_USE_XSHM
+#endif
+
+#ifndef    JUCE_USE_XRENDER
+ //#define JUCE_USE_XRENDER
+#endif
+
+#ifndef    JUCE_USE_XCURSOR
+ //#define JUCE_USE_XCURSOR
+#endif
 
 //==============================================================================
 // juce_gui_extra flags:
 
-#define    JUCE_WEB_BROWSER 0
+#ifndef    JUCE_WEB_BROWSER
+ #define   JUCE_WEB_BROWSER 0
+#endif
 
 //==============================================================================
 // juce_video flags:
 
-//#define  JUCE_DIRECTSHOW
-//#define  JUCE_MEDIAFOUNDATION
-#define    JUCE_QUICKTIME 0
-#define    JUCE_USE_CAMERA 0
+#ifndef    JUCE_DIRECTSHOW
+ //#define JUCE_DIRECTSHOW
+#endif
+
+#ifndef    JUCE_MEDIAFOUNDATION
+ //#define JUCE_MEDIAFOUNDATION
+#endif
+
+#ifndef    JUCE_QUICKTIME
+ #define   JUCE_QUICKTIME 0
+#endif
+
+#ifndef    JUCE_USE_CAMERA
+ #define   JUCE_USE_CAMERA 0
+#endif
+
 
 #endif  // __JUCE_APPCONFIG_NTE0XB0IJ__

extras/binarybuilder/JuceLibraryCode/AppConfig.h

@@ -19,9 +19,21 @@
 //==============================================================================
 // juce_core flags:
 
-//#define  JUCE_FORCE_DEBUG
-//#define  JUCE_LOG_ASSERTIONS
-//#define  JUCE_CHECK_MEMORY_LEAKS
-//#define  JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+#ifndef    JUCE_FORCE_DEBUG
+ //#define JUCE_FORCE_DEBUG
+#endif
+
+#ifndef    JUCE_LOG_ASSERTIONS
+ //#define JUCE_LOG_ASSERTIONS
+#endif
+
+#ifndef    JUCE_CHECK_MEMORY_LEAKS
+ //#define JUCE_CHECK_MEMORY_LEAKS
+#endif
+
+#ifndef    JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+ //#define JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+#endif
+
 
 #endif  // __JUCE_APPCONFIG_3T6YQETY1__

extras/example projects/JuceLibraryCode/AppConfig.h

@@ -24,28 +24,58 @@
 //==============================================================================
 // juce_core flags:
 
-//#define  JUCE_FORCE_DEBUG
-//#define  JUCE_LOG_ASSERTIONS
-//#define  JUCE_CHECK_MEMORY_LEAKS
-//#define  JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+#ifndef    JUCE_FORCE_DEBUG
+ //#define JUCE_FORCE_DEBUG
+#endif
+
+#ifndef    JUCE_LOG_ASSERTIONS
+ //#define JUCE_LOG_ASSERTIONS
+#endif
+
+#ifndef    JUCE_CHECK_MEMORY_LEAKS
+ //#define JUCE_CHECK_MEMORY_LEAKS
+#endif
+
+#ifndef    JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+ //#define JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+#endif
 
 //==============================================================================
 // juce_graphics flags:
 
-//#define  JUCE_USE_COREIMAGE_LOADER
-//#define  JUCE_USE_DIRECTWRITE
+#ifndef    JUCE_USE_COREIMAGE_LOADER
+ //#define JUCE_USE_COREIMAGE_LOADER
+#endif
+
+#ifndef    JUCE_USE_DIRECTWRITE
+ //#define JUCE_USE_DIRECTWRITE
+#endif
 
 //==============================================================================
 // juce_gui_basics flags:
 
-//#define  JUCE_ENABLE_REPAINT_DEBUGGING
-//#define  JUCE_USE_XSHM
-//#define  JUCE_USE_XRENDER
-//#define  JUCE_USE_XCURSOR
+#ifndef    JUCE_ENABLE_REPAINT_DEBUGGING
+ //#define JUCE_ENABLE_REPAINT_DEBUGGING
+#endif
+
+#ifndef    JUCE_USE_XSHM
+ //#define JUCE_USE_XSHM
+#endif
+
+#ifndef    JUCE_USE_XRENDER
+ //#define JUCE_USE_XRENDER
+#endif
+
+#ifndef    JUCE_USE_XCURSOR
+ //#define JUCE_USE_XCURSOR
+#endif
 
 //==============================================================================
 // juce_gui_extra flags:
 
-//#define  JUCE_WEB_BROWSER
+#ifndef    JUCE_WEB_BROWSER
+ //#define JUCE_WEB_BROWSER
+#endif
+
 
 #endif  // __JUCE_APPCONFIG_TTAKTK1S__

extras/static library/JuceLibraryCode/AppConfig.h

@@ -31,60 +31,134 @@
 //==============================================================================
 // juce_audio_devices flags:
 
-//#define  JUCE_ASIO
-//#define  JUCE_WASAPI
-//#define  JUCE_DIRECTSOUND
-//#define  JUCE_ALSA
-//#define  JUCE_JACK
-//#define  JUCE_USE_CDREADER
-//#define  JUCE_USE_CDBURNER
+#ifndef    JUCE_ASIO
+ //#define JUCE_ASIO
+#endif
+
+#ifndef    JUCE_WASAPI
+ //#define JUCE_WASAPI
+#endif
+
+#ifndef    JUCE_DIRECTSOUND
+ //#define JUCE_DIRECTSOUND
+#endif
+
+#ifndef    JUCE_ALSA
+ //#define JUCE_ALSA
+#endif
+
+#ifndef    JUCE_JACK
+ //#define JUCE_JACK
+#endif
+
+#ifndef    JUCE_USE_CDREADER
+ //#define JUCE_USE_CDREADER
+#endif
+
+#ifndef    JUCE_USE_CDBURNER
+ //#define JUCE_USE_CDBURNER
+#endif
 
 //==============================================================================
 // juce_audio_formats flags:
 
-//#define  JUCE_USE_FLAC
-//#define  JUCE_USE_OGGVORBIS
-//#define  JUCE_USE_MP3AUDIOFORMAT
+#ifndef    JUCE_USE_FLAC
+ //#define JUCE_USE_FLAC
+#endif
+
+#ifndef    JUCE_USE_OGGVORBIS
+ //#define JUCE_USE_OGGVORBIS
+#endif
+
+#ifndef    JUCE_USE_MP3AUDIOFORMAT
+ //#define JUCE_USE_MP3AUDIOFORMAT
+#endif
 
 //==============================================================================
 // juce_audio_processors flags:
 
-//#define  JUCE_PLUGINHOST_VST
-//#define  JUCE_PLUGINHOST_AU
+#ifndef    JUCE_PLUGINHOST_VST
+ //#define JUCE_PLUGINHOST_VST
+#endif
+
+#ifndef    JUCE_PLUGINHOST_AU
+ //#define JUCE_PLUGINHOST_AU
+#endif
 
 //==============================================================================
 // juce_core flags:
 
-//#define  JUCE_FORCE_DEBUG
-//#define  JUCE_LOG_ASSERTIONS
-//#define  JUCE_CHECK_MEMORY_LEAKS
-//#define  JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+#ifndef    JUCE_FORCE_DEBUG
+ //#define JUCE_FORCE_DEBUG
+#endif
+
+#ifndef    JUCE_LOG_ASSERTIONS
+ //#define JUCE_LOG_ASSERTIONS
+#endif
+
+#ifndef    JUCE_CHECK_MEMORY_LEAKS
+ //#define JUCE_CHECK_MEMORY_LEAKS
+#endif
+
+#ifndef    JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+ //#define JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+#endif
 
 //==============================================================================
 // juce_graphics flags:
 
-//#define  JUCE_USE_COREIMAGE_LOADER
-//#define  JUCE_USE_DIRECTWRITE
+#ifndef    JUCE_USE_COREIMAGE_LOADER
+ //#define JUCE_USE_COREIMAGE_LOADER
+#endif
+
+#ifndef    JUCE_USE_DIRECTWRITE
+ //#define JUCE_USE_DIRECTWRITE
+#endif
 
 //==============================================================================
 // juce_gui_basics flags:
 
-//#define  JUCE_ENABLE_REPAINT_DEBUGGING
-//#define  JUCE_USE_XSHM
-//#define  JUCE_USE_XRENDER
-//#define  JUCE_USE_XCURSOR
+#ifndef    JUCE_ENABLE_REPAINT_DEBUGGING
+ //#define JUCE_ENABLE_REPAINT_DEBUGGING
+#endif
+
+#ifndef    JUCE_USE_XSHM
+ //#define JUCE_USE_XSHM
+#endif
+
+#ifndef    JUCE_USE_XRENDER
+ //#define JUCE_USE_XRENDER
+#endif
+
+#ifndef    JUCE_USE_XCURSOR
+ //#define JUCE_USE_XCURSOR
+#endif
 
 //==============================================================================
 // juce_gui_extra flags:
 
-//#define  JUCE_WEB_BROWSER
+#ifndef    JUCE_WEB_BROWSER
+ //#define JUCE_WEB_BROWSER
+#endif
 
 //==============================================================================
 // juce_video flags:
 
-//#define  JUCE_DIRECTSHOW
-//#define  JUCE_MEDIAFOUNDATION
-//#define  JUCE_QUICKTIME
-//#define  JUCE_USE_CAMERA
+#ifndef    JUCE_DIRECTSHOW
+ //#define JUCE_DIRECTSHOW
+#endif
+
+#ifndef    JUCE_MEDIAFOUNDATION
+ //#define JUCE_MEDIAFOUNDATION
+#endif
+
+#ifndef    JUCE_QUICKTIME
+ //#define JUCE_QUICKTIME
+#endif
+
+#ifndef    JUCE_USE_CAMERA
+ //#define JUCE_USE_CAMERA
+#endif
+
 
 #endif  // __JUCE_APPCONFIG_IVABE4__

extras/the jucer/JuceLibraryCode/AppConfig.h

@@ -24,28 +24,58 @@
 //==============================================================================
 // juce_core flags:
 
-//#define  JUCE_FORCE_DEBUG
-//#define  JUCE_LOG_ASSERTIONS
-//#define  JUCE_CHECK_MEMORY_LEAKS
-//#define  JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+#ifndef    JUCE_FORCE_DEBUG
+ //#define JUCE_FORCE_DEBUG
+#endif
+
+#ifndef    JUCE_LOG_ASSERTIONS
+ //#define JUCE_LOG_ASSERTIONS
+#endif
+
+#ifndef    JUCE_CHECK_MEMORY_LEAKS
+ //#define JUCE_CHECK_MEMORY_LEAKS
+#endif
+
+#ifndef    JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+ //#define JUCE_DONT_AUTOLINK_TO_WIN32_LIBRARIES
+#endif
 
 //==============================================================================
 // juce_graphics flags:
 
-//#define  JUCE_USE_COREIMAGE_LOADER
-//#define  JUCE_USE_DIRECTWRITE
+#ifndef    JUCE_USE_COREIMAGE_LOADER
+ //#define JUCE_USE_COREIMAGE_LOADER
+#endif
+
+#ifndef    JUCE_USE_DIRECTWRITE
+ //#define JUCE_USE_DIRECTWRITE
+#endif
 
 //==============================================================================
 // juce_gui_basics flags:
 
-//#define  JUCE_ENABLE_REPAINT_DEBUGGING
-//#define  JUCE_USE_XSHM
-//#define  JUCE_USE_XRENDER
-//#define  JUCE_USE_XCURSOR
+#ifndef    JUCE_ENABLE_REPAINT_DEBUGGING
+ //#define JUCE_ENABLE_REPAINT_DEBUGGING
+#endif
+
+#ifndef    JUCE_USE_XSHM
+ //#define JUCE_USE_XSHM
+#endif
+
+#ifndef    JUCE_USE_XRENDER
+ //#define JUCE_USE_XRENDER
+#endif
+
+#ifndef    JUCE_USE_XCURSOR
+ //#define JUCE_USE_XCURSOR
+#endif
 
 //==============================================================================
 // juce_gui_extra flags:
 
-//#define  JUCE_WEB_BROWSER
+#ifndef    JUCE_WEB_BROWSER
+ //#define JUCE_WEB_BROWSER
+#endif
+
 
 #endif  // __JUCE_APPCONFIG_UY86NK__

modules/juce_audio_basics/juce_module_info

@@ -1,7 +1,7 @@
 {
   "id":             "juce_audio_basics",
   "name":           "JUCE audio and midi data classes",
-  "version":        "2.0.15",
+  "version":        "2.0.16",
   "description":    "Classes for audio buffer manipulation, midi message handling, synthesis, etc",
   "website":        "http://www.juce.com/juce",
   "license":        "GPL/Commercial",

modules/juce_audio_devices/juce_module_info

@@ -1,7 +1,7 @@
 {
   "id":             "juce_audio_devices",
   "name":           "JUCE audio and midi I/O device classes",
-  "version":        "2.0.15",
+  "version":        "2.0.16",
   "description":    "Classes to play and record from audio and midi i/o devices.",
   "website":        "http://www.juce.com/juce",
   "license":        "GPL/Commercial",

modules/juce_audio_formats/juce_module_info

@@ -1,7 +1,7 @@
 {
   "id":             "juce_audio_formats",
   "name":           "JUCE audio file format codecs",
-  "version":        "2.0.15",
+  "version":        "2.0.16",
   "description":    "Classes for reading and writing various audio file formats.",
   "website":        "http://www.juce.com/juce",
   "license":        "GPL/Commercial",

modules/juce_audio_plugin_client/juce_module_info

@@ -1,7 +1,7 @@
 {
   "id":             "juce_audio_plugin_client",
   "name":           "JUCE audio plugin wrapper classes",
-  "version":        "2.0.15",
+  "version":        "2.0.16",
   "description":    "Classes for building VST, RTAS and AU plugins.",
   "website":        "http://www.juce.com/juce",
   "license":        "GPL/Commercial",

modules/juce_audio_processors/juce_module_info

@@ -1,12 +1,12 @@
 {
   "id":             "juce_audio_processors",
   "name":           "JUCE audio plugin hosting classes",
-  "version":        "2.0.15",
+  "version":        "2.0.16",
   "description":    "Classes for loading and playing VST, AU, or internally-generated audio processors.",
   "website":        "http://www.juce.com/juce",
   "license":        "GPL/Commercial",
 
-  "dependencies":   [ { "id": "juce_gui_basics",     "version": "matching" },
+  "dependencies":   [ { "id": "juce_gui_extra",     "version": "matching" },
                       { "id": "juce_audio_basics",   "version": "matching" } ],
 
   "include":        "juce_audio_processors.h",

modules/juce_audio_utils/juce_module_info

@@ -1,7 +1,7 @@
 {
   "id":             "juce_audio_utils",
   "name":           "JUCE extra audio utility classes",
-  "version":        "2.0.15",
+  "version":        "2.0.16",
   "description":    "Classes for audio-related GUI and miscellaneous tasks.",
   "website":        "http://www.juce.com/juce",
   "license":        "GPL/Commercial",

modules/juce_browser_plugin/juce_module_info

@@ -1,7 +1,7 @@
 {
   "id":             "juce_browser_plugin_client",
   "name":           "JUCE browser plugin wrapper classes",
-  "version":        "2.0.15",
+  "version":        "2.0.16",
   "description":    "Classes for building NPAPI and ActiveX browser plugins.",
   "website":        "http://www.juce.com/juce",
   "license":        "GPL/Commercial",

modules/juce_core/juce_module_info

@@ -1,7 +1,7 @@
 {
   "id":             "juce_core",
   "name":           "JUCE core classes",
-  "version":        "2.0.15",
+  "version":        "2.0.16",
   "description":    "The essential set of basic JUCE classes, as required by all the other JUCE modules. Includes text, container, memory, threading and i/o functionality.",
   "website":        "http://www.juce.com/juce",
   "license":        "GPL/Commercial",

modules/juce_core/system/juce_StandardHeader.h

@@ -33,7 +33,7 @@
 */
 #define JUCE_MAJOR_VERSION      2
 #define JUCE_MINOR_VERSION      0
-#define JUCE_BUILDNUMBER        15
+#define JUCE_BUILDNUMBER        16
 
 /** Current Juce version number.
 

modules/juce_cryptography/juce_module_info

@@ -1,7 +1,7 @@
 {
   "id":             "juce_cryptography",
   "name":           "JUCE cryptography classes",
-  "version":        "2.0.15",
+  "version":        "2.0.16",
   "description":    "Classes for various basic cryptography functions, including RSA, Blowfish, MD5, SHA, etc.",
   "website":        "http://www.juce.com/juce",
   "license":        "GPL/Commercial",

modules/juce_data_structures/juce_module_info

@@ -1,7 +1,7 @@
 {
   "id":             "juce_data_structures",
   "name":           "JUCE data model helper classes",
-  "version":        "2.0.15",
+  "version":        "2.0.16",
   "description":    "Classes for undo/redo management, and smart data structures.",
   "website":        "http://www.juce.com/juce",
   "license":        "GPL/Commercial",

modules/juce_events/juce_module_info

@@ -1,7 +1,7 @@
 {
   "id":             "juce_events",
   "name":           "JUCE message and event handling classes",
-  "version":        "2.0.15",
+  "version":        "2.0.16",
   "description":    "Classes for running an application's main event loop and sending/receiving messages, timers, etc.",
   "website":        "http://www.juce.com/juce",
   "license":        "GPL/Commercial",

modules/juce_graphics/juce_module_info

@@ -1,7 +1,7 @@
 {
   "id":             "juce_graphics",
   "name":           "JUCE graphics classes",
-  "version":        "2.0.15",
+  "version":        "2.0.16",
   "description":    "Classes for 2D vector graphics, image loading/saving, font handling, etc.",
   "website":        "http://www.juce.com/juce",
   "license":        "GPL/Commercial",

modules/juce_gui_basics/juce_module_info

@@ -1,7 +1,7 @@
 {
   "id":             "juce_gui_basics",
   "name":           "JUCE GUI core classes",
-  "version":        "2.0.15",
+  "version":        "2.0.16",
   "description":    "Basic user-interface components and related classes.",
   "website":        "http://www.juce.com/juce",
   "license":        "GPL/Commercial",

modules/juce_gui_extra/juce_module_info

@@ -1,7 +1,7 @@
 {
   "id":             "juce_gui_extra",
   "name":           "JUCE extended GUI classes",
-  "version":        "2.0.15",
+  "version":        "2.0.16",
   "description":    "Miscellaneous GUI classes for specialised tasks.",
   "website":        "http://www.juce.com/juce",
   "license":        "GPL/Commercial",

modules/juce_opengl/juce_module_info

@@ -1,7 +1,7 @@
 {
   "id":             "juce_opengl",
   "name":           "JUCE OpenGL classes",
-  "version":        "2.0.15",
+  "version":        "2.0.16",
   "description":    "Classes for rendering OpenGL in a JUCE window.",
   "website":        "http://www.juce.com/juce",
   "license":        "GPL/Commercial",

modules/juce_video/juce_module_info

@@ -1,7 +1,7 @@
 {
   "id":             "juce_video",
   "name":           "JUCE video playback and capture classes",
-  "version":        "2.0.15",
+  "version":        "2.0.16",
   "description":    "Classes for playing video and capturing camera input.",
   "website":        "http://www.juce.com/juce",
   "license":        "GPL/Commercial",