mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-18 00:54:19 +00:00
Code Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
jules 2014-11-06 15:26:37 +00:00
commit 8741fdd439
13 changed files with 24 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
extras/amalgamation/Amalgamated files README.txt Normal file
View file

@ -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!

28
juce.h → extras/amalgamation/juce.h
View file

@ -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"
//==============================================================================

2
extras/amalgamation/juce_amalgamated.cpp Normal file
View file

@ -0,0 +1,2 @@
#include "juce_amalgamated_template.cpp"

0
juce_amalgamated.h → extras/amalgamation/juce_amalgamated.h
View file

2
extras/amalgamation/juce_amalgamated.mm Normal file
View file

@ -0,0 +1,2 @@
#include "juce_amalgamated_template.cpp"

0
amalgamation/juce_amalgamated1.cpp → extras/amalgamation/juce_amalgamated1.cpp
View file

0
amalgamation/juce_amalgamated2.cpp → extras/amalgamation/juce_amalgamated2.cpp
View file

0
amalgamation/juce_amalgamated3.cpp → extras/amalgamation/juce_amalgamated3.cpp
View file

0
amalgamation/juce_amalgamated4.cpp → extras/amalgamation/juce_amalgamated4.cpp
View file

0
amalgamation/juce_amalgamated_template.cpp → extras/amalgamation/juce_amalgamated_template.cpp
View file

0
amalgamation/juce_amalgamated_template.h → extras/amalgamation/juce_amalgamated_template.h
View file

2
juce_amalgamated.cpp
View file

@ -1,2 +0,0 @@
#include "amalgamation/juce_amalgamated_template.cpp"

2
juce_amalgamated.mm
View file

@ -1,2 +0,0 @@
#include "juce_amalgamated.cpp"