Cleaned out some old amalgamated build references.

extras/Introjucer/Source/Project/jucer_Project.h

@@ -116,13 +116,8 @@ public:
     Value shouldIncludeBinaryInAppConfig()              { return getProjectValue (Ids::includeBinaryInAppConfig); }
 
     //==============================================================================
-    String getAmalgamatedHeaderFileName() const         { return "juce_amalgamated.h"; }
-    String getAmalgamatedMMFileName() const             { return "juce_amalgamated.mm"; }
-    String getAmalgamatedCppFileName() const            { return "juce_amalgamated.cpp"; }
-
     String getAppConfigFilename() const                 { return "AppConfig.h"; }
     String getJuceSourceFilenameRoot() const            { return "JuceLibraryCode"; }
-    int getNumSeparateAmalgamatedFiles() const          { return 4; }
     String getJuceSourceHFilename() const               { return "JuceHeader.h"; }
 
     //==============================================================================

modules/juce_audio_basics/juce_audio_basics.cpp

@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (JUCE_AUDIO_BASICS_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
+#ifdef JUCE_AUDIO_BASICS_H_INCLUDED
  /* 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

@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (JUCE_AUDIO_DEVICES_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
+#ifdef JUCE_AUDIO_DEVICES_H_INCLUDED
  /* 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

@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (JUCE_AUDIO_FORMATS_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
+#ifdef JUCE_AUDIO_FORMATS_H_INCLUDED
  /* 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

@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (JUCE_AUDIO_PROCESSORS_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
+#ifdef JUCE_AUDIO_PROCESSORS_H_INCLUDED
  /* 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

@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (JUCE_AUDIO_UTILS_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
+#ifdef JUCE_AUDIO_UTILS_H_INCLUDED
  /* 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_box2d/juce_box2d.cpp

@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (JUCE_BOX2D_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
+#ifdef JUCE_BOX2D_H_INCLUDED
  /* 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_client/juce_browser_plugin.cpp

@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (JUCE_BROWSER_PLUGIN_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
+#ifdef JUCE_BROWSER_PLUGIN_H_INCLUDED
  /* 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

@@ -26,7 +26,7 @@
   ==============================================================================
 */
 
-#if defined (JUCE_CORE_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
+#ifdef JUCE_CORE_H_INCLUDED
  /* 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

@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (JUCE_CRYPTOGRAPHY_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
+#ifdef JUCE_CRYPTOGRAPHY_H_INCLUDED
  /* 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

@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (JUCE_DATA_STRUCTURES_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
+#ifdef JUCE_DATA_STRUCTURES_H_INCLUDED
  /* 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

@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (JUCE_EVENTS_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
+#ifdef JUCE_EVENTS_H_INCLUDED
  /* 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

@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (JUCE_GRAPHICS_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
+#ifdef JUCE_GRAPHICS_H_INCLUDED
  /* 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_gui_basics/juce_gui_basics.cpp

@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (JUCE_GUI_BASICS_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
+#ifdef JUCE_GUI_BASICS_H_INCLUDED
  /* 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_gui_extra/juce_gui_extra.cpp

@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (JUCE_GUI_EXTRA_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
+#ifdef JUCE_GUI_EXTRA_H_INCLUDED
  /* 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

@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (JUCE_OPENGL_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
+#ifdef JUCE_OPENGL_H_INCLUDED
  /* 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_osc/juce_osc.cpp

@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (JUCE_OSC_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
+#ifdef JUCE_OSC_H_INCLUDED
  /* 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_tracktion_marketplace/juce_tracktion_marketplace.cpp

@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (JUCE_TRACKTION_MARKETPLACE_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
+#ifdef JUCE_TRACKTION_MARKETPLACE_H_INCLUDED
  /* 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

@@ -22,7 +22,7 @@
   ==============================================================================
 */
 
-#if defined (JUCE_VIDEO_H_INCLUDED) && ! JUCE_AMALGAMATED_INCLUDE
+#ifdef JUCE_VIDEO_H_INCLUDED
  /* 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/playback/juce_QuickTimeMovieComponent.h

@@ -25,8 +25,6 @@
 #ifndef JUCE_QUICKTIMEMOVIECOMPONENT_H_INCLUDED
 #define JUCE_QUICKTIMEMOVIECOMPONENT_H_INCLUDED
 
-// (NB: This stuff mustn't go inside the "#if QUICKTIME" block, or it'll break the
-// amalgamated build)
 #ifndef DOXYGEN
  #if JUCE_WINDOWS
   typedef ActiveXControlComponent QTCompBaseClass;