Updated some module usage warning code.

modules/juce_audio_basics/juce_audio_basics.cpp

@@ -23,7 +23,7 @@
   ==============================================================================
 */
 
-#ifdef __JUCE_AUDIO_BASICS_JUCEHEADER__
+#if defined (__JUCE_AUDIO_BASICS_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix

modules/juce_audio_devices/juce_audio_devices.cpp

@@ -23,7 +23,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_AUDIO_DEVICES_JUCEHEADER__) && ! defined (JUCE_AMALGAMATED_INCLUDE)
+#if defined (__JUCE_AUDIO_DEVICES_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix

modules/juce_audio_formats/juce_audio_formats.cpp

@@ -23,7 +23,7 @@
   ==============================================================================
 */
 
-#ifdef __JUCE_AUDIO_FORMATS_JUCEHEADER__
+#if defined (__JUCE_AUDIO_FORMATS_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix

modules/juce_audio_processors/juce_audio_processors.cpp

@@ -23,7 +23,7 @@
   ==============================================================================
 */
 
-#ifdef __JUCE_AUDIO_PROCESSORS_JUCEHEADER__
+#if defined (__JUCE_AUDIO_PROCESSORS_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix

modules/juce_audio_utils/juce_audio_utils.cpp

@@ -23,7 +23,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_AUDIO_UTILS_JUCEHEADER__) && ! defined (JUCE_AMALGAMATED_INCLUDE)
+#if defined (__JUCE_AUDIO_UTILS_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix

modules/juce_browser_plugin/juce_browser_plugin.cpp

@@ -23,7 +23,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_BROWSER_PLUGIN_CLIENT_JUCEHEADER__) && ! defined (JUCE_AMALGAMATED_INCLUDE)
+#if defined (__JUCE_BROWSER_PLUGIN_CLIENT_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix

modules/juce_core/juce_core.cpp

@@ -23,7 +23,7 @@
   ==============================================================================
 */
 
-#ifdef __JUCE_CORE_JUCEHEADER__
+#if defined (__JUCE_CORE_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix

modules/juce_cryptography/juce_cryptography.cpp

@@ -23,7 +23,7 @@
   ==============================================================================
 */
 
-#ifdef __JUCE_CRYPTOGRAPHY_JUCEHEADER__
+#if defined (__JUCE_CRYPTOGRAPHY_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix

modules/juce_data_structures/juce_data_structures.cpp

@@ -23,7 +23,7 @@
   ==============================================================================
 */
 
-#ifdef __JUCE_DATA_STRUCTURES_JUCEHEADER__
+#if defined (__JUCE_DATA_STRUCTURES_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix

modules/juce_events/juce_events.cpp

@@ -23,7 +23,7 @@
   ==============================================================================
 */
 
-#if defined (__JUCE_EVENTS_JUCEHEADER__) && ! defined (JUCE_AMALGAMATED_INCLUDE)
+#if defined (__JUCE_EVENTS_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix

modules/juce_graphics/juce_graphics.cpp

@@ -23,7 +23,7 @@
   ==============================================================================
 */
 
-#ifdef __JUCE_GRAPHICS_MODULE_JUCEHEADER__
+#if defined (__JUCE_GRAPHICS_MODULE_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix

modules/juce_opengl/juce_opengl.cpp

@@ -23,7 +23,7 @@
   ==============================================================================
 */
 
-#ifdef __JUCE_OPENGL_JUCEHEADER__
+#if defined (__JUCE_OPENGL_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix

modules/juce_video/juce_video.cpp

@@ -23,7 +23,7 @@
   ==============================================================================
 */
 
-#ifdef __JUCE_VIDEO_JUCEHEADER__
+#if defined (__JUCE_VIDEO_JUCEHEADER__) && ! JUCE_AMALGAMATED_INCLUDE
  /* When you add this cpp file to your project, you mustn't include it in a file where you've
     already included any other headers - just put it inside a file on its own, possibly with your config
     flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix