diff --git a/extras/Introjucer/Source/Project/jucer_Project.h b/extras/Introjucer/Source/Project/jucer_Project.h index 9c89c62055..6e3489f85e 100644 --- a/extras/Introjucer/Source/Project/jucer_Project.h +++ b/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"; } //============================================================================== diff --git a/modules/juce_audio_basics/juce_audio_basics.cpp b/modules/juce_audio_basics/juce_audio_basics.cpp index 95cc730c7e..93349c3340 100644 --- a/modules/juce_audio_basics/juce_audio_basics.cpp +++ b/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 diff --git a/modules/juce_audio_devices/juce_audio_devices.cpp b/modules/juce_audio_devices/juce_audio_devices.cpp index 2bc3c6a09f..695e272de3 100644 --- a/modules/juce_audio_devices/juce_audio_devices.cpp +++ b/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 diff --git a/modules/juce_audio_formats/juce_audio_formats.cpp b/modules/juce_audio_formats/juce_audio_formats.cpp index 8a157b6a94..33780c680c 100644 --- a/modules/juce_audio_formats/juce_audio_formats.cpp +++ b/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 diff --git a/modules/juce_audio_processors/juce_audio_processors.cpp b/modules/juce_audio_processors/juce_audio_processors.cpp index 45346689b9..7b365d7794 100644 --- a/modules/juce_audio_processors/juce_audio_processors.cpp +++ b/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 diff --git a/modules/juce_audio_utils/juce_audio_utils.cpp b/modules/juce_audio_utils/juce_audio_utils.cpp index eb195f72e0..d38d3c41e8 100644 --- a/modules/juce_audio_utils/juce_audio_utils.cpp +++ b/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 diff --git a/modules/juce_box2d/juce_box2d.cpp b/modules/juce_box2d/juce_box2d.cpp index c7e0241801..a2c2dbf3f9 100644 --- a/modules/juce_box2d/juce_box2d.cpp +++ b/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 diff --git a/modules/juce_browser_plugin_client/juce_browser_plugin.cpp b/modules/juce_browser_plugin_client/juce_browser_plugin.cpp index e529386cfb..08f8c48de0 100644 --- a/modules/juce_browser_plugin_client/juce_browser_plugin.cpp +++ b/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 diff --git a/modules/juce_core/juce_core.cpp b/modules/juce_core/juce_core.cpp index 29e55975ea..acb91759cd 100644 --- a/modules/juce_core/juce_core.cpp +++ b/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 diff --git a/modules/juce_cryptography/juce_cryptography.cpp b/modules/juce_cryptography/juce_cryptography.cpp index b7ce66eaa6..520b186ebd 100644 --- a/modules/juce_cryptography/juce_cryptography.cpp +++ b/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 diff --git a/modules/juce_data_structures/juce_data_structures.cpp b/modules/juce_data_structures/juce_data_structures.cpp index 0d2b8759cc..cf1b2fe53f 100644 --- a/modules/juce_data_structures/juce_data_structures.cpp +++ b/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 diff --git a/modules/juce_events/juce_events.cpp b/modules/juce_events/juce_events.cpp index 13c84c9b6e..df74b21e25 100644 --- a/modules/juce_events/juce_events.cpp +++ b/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 diff --git a/modules/juce_graphics/juce_graphics.cpp b/modules/juce_graphics/juce_graphics.cpp index 2d5a0966ef..9d0b1833ad 100644 --- a/modules/juce_graphics/juce_graphics.cpp +++ b/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 diff --git a/modules/juce_gui_basics/juce_gui_basics.cpp b/modules/juce_gui_basics/juce_gui_basics.cpp index 0af3e64f02..72c79aea0b 100644 --- a/modules/juce_gui_basics/juce_gui_basics.cpp +++ b/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 diff --git a/modules/juce_gui_extra/juce_gui_extra.cpp b/modules/juce_gui_extra/juce_gui_extra.cpp index 59b4df9e4f..9a38d7d426 100644 --- a/modules/juce_gui_extra/juce_gui_extra.cpp +++ b/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 diff --git a/modules/juce_opengl/juce_opengl.cpp b/modules/juce_opengl/juce_opengl.cpp index c17adbf2a9..a7a02e7e31 100644 --- a/modules/juce_opengl/juce_opengl.cpp +++ b/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 diff --git a/modules/juce_osc/juce_osc.cpp b/modules/juce_osc/juce_osc.cpp index af603d9fd8..4708aaad7f 100644 --- a/modules/juce_osc/juce_osc.cpp +++ b/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 diff --git a/modules/juce_tracktion_marketplace/juce_tracktion_marketplace.cpp b/modules/juce_tracktion_marketplace/juce_tracktion_marketplace.cpp index d0c79d30fd..21db91125d 100644 --- a/modules/juce_tracktion_marketplace/juce_tracktion_marketplace.cpp +++ b/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 diff --git a/modules/juce_video/juce_video.cpp b/modules/juce_video/juce_video.cpp index b1993b8f72..7aea0585b7 100644 --- a/modules/juce_video/juce_video.cpp +++ b/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 diff --git a/modules/juce_video/playback/juce_QuickTimeMovieComponent.h b/modules/juce_video/playback/juce_QuickTimeMovieComponent.h index 604a5632df..cd8201bd50 100644 --- a/modules/juce_video/playback/juce_QuickTimeMovieComponent.h +++ b/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;