From 6dc961db2abef4517e886dfb4d582a20393211af Mon Sep 17 00:00:00 2001 From: jules Date: Thu, 6 Nov 2014 15:23:00 +0000 Subject: [PATCH] Moved the old amalgamated headers and cpps into a subfolder extras/amalgamation --- .../amalgamation/Amalgamated files README.txt | 6 ++++ juce.h => extras/amalgamation/juce.h | 28 +++++++++---------- extras/amalgamation/juce_amalgamated.cpp | 2 ++ .../amalgamation/juce_amalgamated.h | 0 extras/amalgamation/juce_amalgamated.mm | 2 ++ .../amalgamation}/juce_amalgamated1.cpp | 0 .../amalgamation}/juce_amalgamated2.cpp | 0 .../amalgamation}/juce_amalgamated3.cpp | 0 .../amalgamation}/juce_amalgamated4.cpp | 0 .../juce_amalgamated_template.cpp | 0 .../amalgamation}/juce_amalgamated_template.h | 0 juce_amalgamated.cpp | 2 -- juce_amalgamated.mm | 2 -- 13 files changed, 24 insertions(+), 18 deletions(-) create mode 100644 extras/amalgamation/Amalgamated files README.txt rename juce.h => extras/amalgamation/juce.h (73%) create mode 100644 extras/amalgamation/juce_amalgamated.cpp rename juce_amalgamated.h => extras/amalgamation/juce_amalgamated.h (100%) create mode 100644 extras/amalgamation/juce_amalgamated.mm rename {amalgamation => extras/amalgamation}/juce_amalgamated1.cpp (100%) rename {amalgamation => extras/amalgamation}/juce_amalgamated2.cpp (100%) rename {amalgamation => extras/amalgamation}/juce_amalgamated3.cpp (100%) rename {amalgamation => extras/amalgamation}/juce_amalgamated4.cpp (100%) rename {amalgamation => extras/amalgamation}/juce_amalgamated_template.cpp (100%) rename {amalgamation => extras/amalgamation}/juce_amalgamated_template.h (100%) delete mode 100644 juce_amalgamated.cpp delete mode 100644 juce_amalgamated.mm diff --git a/extras/amalgamation/Amalgamated files README.txt b/extras/amalgamation/Amalgamated files README.txt new file mode 100644 index 0000000000..3c83a5cbcb --- /dev/null +++ b/extras/amalgamation/Amalgamated files README.txt @@ -0,0 +1,6 @@ + +This folder contains some *deprecated* files which include all the juce source +code in a single cpp/header. Until the modules were introduced in 2011, this +was a commonly-used way of compiling a JUCE app. These are left here just in +case anyone has code that still relies on this approach, but they're not +guaranteed to remain up to date, so use them at your own risk! \ No newline at end of file diff --git a/juce.h b/extras/amalgamation/juce.h similarity index 73% rename from juce.h rename to extras/amalgamation/juce.h index a80ec813ae..205a0bf10f 100644 --- a/juce.h +++ b/extras/amalgamation/juce.h @@ -43,20 +43,20 @@ #endif //============================================================================== -#include "modules/juce_core/juce_core.h" -#include "modules/juce_gui_basics/juce_gui_basics.h" -#include "modules/juce_data_structures/juce_data_structures.h" -#include "modules/juce_events/juce_events.h" -#include "modules/juce_graphics/juce_graphics.h" -#include "modules/juce_video/juce_video.h" -#include "modules/juce_opengl/juce_opengl.h" -#include "modules/juce_audio_basics/juce_audio_basics.h" -#include "modules/juce_audio_formats/juce_audio_formats.h" -#include "modules/juce_audio_processors/juce_audio_processors.h" -#include "modules/juce_audio_devices/juce_audio_devices.h" -#include "modules/juce_cryptography/juce_cryptography.h" -#include "modules/juce_gui_extra/juce_gui_extra.h" -#include "modules/juce_audio_utils/juce_audio_utils.h" +#include "../../modules/juce_core/juce_core.h" +#include "../../modules/juce_gui_basics/juce_gui_basics.h" +#include "../../modules/juce_data_structures/juce_data_structures.h" +#include "../../modules/juce_events/juce_events.h" +#include "../../modules/juce_graphics/juce_graphics.h" +#include "../../modules/juce_video/juce_video.h" +#include "../../modules/juce_opengl/juce_opengl.h" +#include "../../modules/juce_audio_basics/juce_audio_basics.h" +#include "../../modules/juce_audio_formats/juce_audio_formats.h" +#include "../../modules/juce_audio_processors/juce_audio_processors.h" +#include "../../modules/juce_audio_devices/juce_audio_devices.h" +#include "../../modules/juce_cryptography/juce_cryptography.h" +#include "../../modules/juce_gui_extra/juce_gui_extra.h" +#include "../../modules/juce_audio_utils/juce_audio_utils.h" //============================================================================== diff --git a/extras/amalgamation/juce_amalgamated.cpp b/extras/amalgamation/juce_amalgamated.cpp new file mode 100644 index 0000000000..a450df3194 --- /dev/null +++ b/extras/amalgamation/juce_amalgamated.cpp @@ -0,0 +1,2 @@ + +#include "juce_amalgamated_template.cpp" diff --git a/juce_amalgamated.h b/extras/amalgamation/juce_amalgamated.h similarity index 100% rename from juce_amalgamated.h rename to extras/amalgamation/juce_amalgamated.h diff --git a/extras/amalgamation/juce_amalgamated.mm b/extras/amalgamation/juce_amalgamated.mm new file mode 100644 index 0000000000..a450df3194 --- /dev/null +++ b/extras/amalgamation/juce_amalgamated.mm @@ -0,0 +1,2 @@ + +#include "juce_amalgamated_template.cpp" diff --git a/amalgamation/juce_amalgamated1.cpp b/extras/amalgamation/juce_amalgamated1.cpp similarity index 100% rename from amalgamation/juce_amalgamated1.cpp rename to extras/amalgamation/juce_amalgamated1.cpp diff --git a/amalgamation/juce_amalgamated2.cpp b/extras/amalgamation/juce_amalgamated2.cpp similarity index 100% rename from amalgamation/juce_amalgamated2.cpp rename to extras/amalgamation/juce_amalgamated2.cpp diff --git a/amalgamation/juce_amalgamated3.cpp b/extras/amalgamation/juce_amalgamated3.cpp similarity index 100% rename from amalgamation/juce_amalgamated3.cpp rename to extras/amalgamation/juce_amalgamated3.cpp diff --git a/amalgamation/juce_amalgamated4.cpp b/extras/amalgamation/juce_amalgamated4.cpp similarity index 100% rename from amalgamation/juce_amalgamated4.cpp rename to extras/amalgamation/juce_amalgamated4.cpp diff --git a/amalgamation/juce_amalgamated_template.cpp b/extras/amalgamation/juce_amalgamated_template.cpp similarity index 100% rename from amalgamation/juce_amalgamated_template.cpp rename to extras/amalgamation/juce_amalgamated_template.cpp diff --git a/amalgamation/juce_amalgamated_template.h b/extras/amalgamation/juce_amalgamated_template.h similarity index 100% rename from amalgamation/juce_amalgamated_template.h rename to extras/amalgamation/juce_amalgamated_template.h diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp deleted file mode 100644 index 01ff57df2f..0000000000 --- a/juce_amalgamated.cpp +++ /dev/null @@ -1,2 +0,0 @@ - -#include "amalgamation/juce_amalgamated_template.cpp" diff --git a/juce_amalgamated.mm b/juce_amalgamated.mm deleted file mode 100644 index 106ed56db9..0000000000 --- a/juce_amalgamated.mm +++ /dev/null @@ -1,2 +0,0 @@ - -#include "juce_amalgamated.cpp"