DISTRHO
/
JUCE
mirror of https://github.com/DISTRHO/JUCE
1
0
Fork 0
Code Releases 1 Activity
Browse Source

Cleaned out some old amalgamated build references.

tags/2021-05-28
jules 9 years ago
parent
4583fa3fbf
commit
c95253fad0
20 changed files with 18 additions and 25 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +0
    -5
      extras/Introjucer/Source/Project/jucer_Project.h
  2. +1
    -1
      modules/juce_audio_basics/juce_audio_basics.cpp
  3. +1
    -1
      modules/juce_audio_devices/juce_audio_devices.cpp
  4. +1
    -1
      modules/juce_audio_formats/juce_audio_formats.cpp
  5. +1
    -1
      modules/juce_audio_processors/juce_audio_processors.cpp
  6. +1
    -1
      modules/juce_audio_utils/juce_audio_utils.cpp
  7. +1
    -1
      modules/juce_box2d/juce_box2d.cpp
  8. +1
    -1
      modules/juce_browser_plugin_client/juce_browser_plugin.cpp
  9. +1
    -1
      modules/juce_core/juce_core.cpp
  10. +1
    -1
      modules/juce_cryptography/juce_cryptography.cpp
  11. +1
    -1
      modules/juce_data_structures/juce_data_structures.cpp
  12. +1
    -1
      modules/juce_events/juce_events.cpp
  13. +1
    -1
      modules/juce_graphics/juce_graphics.cpp
  14. +1
    -1
      modules/juce_gui_basics/juce_gui_basics.cpp
  15. +1
    -1
      modules/juce_gui_extra/juce_gui_extra.cpp
  16. +1
    -1
      modules/juce_opengl/juce_opengl.cpp
  17. +1
    -1
      modules/juce_osc/juce_osc.cpp
  18. +1
    -1
      modules/juce_tracktion_marketplace/juce_tracktion_marketplace.cpp
  19. +1
    -1
      modules/juce_video/juce_video.cpp
  20. +0
    -2
      modules/juce_video/playback/juce_QuickTimeMovieComponent.h

+ 0
- 5
extras/Introjucer/Source/Project/jucer_Project.h View File

@@ -116,13 +116,8 @@ public:
Value shouldIncludeBinaryInAppConfig() { return getProjectValue (Ids::includeBinaryInAppConfig); } 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 getAppConfigFilename() const { return "AppConfig.h"; }
String getJuceSourceFilenameRoot() const { return "JuceLibraryCode"; } String getJuceSourceFilenameRoot() const { return "JuceLibraryCode"; }
int getNumSeparateAmalgamatedFiles() const { return 4; }
String getJuceSourceHFilename() const { return "JuceHeader.h"; } String getJuceSourceHFilename() const { return "JuceHeader.h"; }
//============================================================================== //==============================================================================


+ 1
- 1
modules/juce_audio_basics/juce_audio_basics.cpp View File

@@ -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 /* 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 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 flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix


+ 1
- 1
modules/juce_audio_devices/juce_audio_devices.cpp View File

@@ -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 /* 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 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 flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix


+ 1
- 1
modules/juce_audio_formats/juce_audio_formats.cpp View File

@@ -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 /* 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 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 flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix


+ 1
- 1
modules/juce_audio_processors/juce_audio_processors.cpp View File

@@ -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 /* 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 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 flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix


+ 1
- 1
modules/juce_audio_utils/juce_audio_utils.cpp View File

@@ -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 /* 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 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 flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix


+ 1
- 1
modules/juce_box2d/juce_box2d.cpp View File

@@ -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 /* 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 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 flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix


+ 1
- 1
modules/juce_browser_plugin_client/juce_browser_plugin.cpp View File

@@ -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 /* 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 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 flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix


+ 1
- 1
modules/juce_core/juce_core.cpp View File

@@ -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 /* 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 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 flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix


+ 1
- 1
modules/juce_cryptography/juce_cryptography.cpp View File

@@ -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 /* 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 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 flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix


+ 1
- 1
modules/juce_data_structures/juce_data_structures.cpp View File

@@ -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 /* 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 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 flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix


+ 1
- 1
modules/juce_events/juce_events.cpp View File

@@ -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 /* 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 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 flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix


+ 1
- 1
modules/juce_graphics/juce_graphics.cpp View File

@@ -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 /* 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 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 flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix


+ 1
- 1
modules/juce_gui_basics/juce_gui_basics.cpp View File

@@ -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 /* 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 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 flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix


+ 1
- 1
modules/juce_gui_extra/juce_gui_extra.cpp View File

@@ -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 /* 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 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 flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix


+ 1
- 1
modules/juce_opengl/juce_opengl.cpp View File

@@ -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 /* 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 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 flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix


+ 1
- 1
modules/juce_osc/juce_osc.cpp View File

@@ -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 /* 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 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 flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix


+ 1
- 1
modules/juce_tracktion_marketplace/juce_tracktion_marketplace.cpp View File

@@ -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 /* 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 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 flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix


+ 1
- 1
modules/juce_video/juce_video.cpp View File

@@ -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 /* 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 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 flags preceding it, but don't include anything else. That also includes avoiding any automatic prefix


+ 0
- 2
modules/juce_video/playback/juce_QuickTimeMovieComponent.h View File

@@ -25,8 +25,6 @@
#ifndef JUCE_QUICKTIMEMOVIECOMPONENT_H_INCLUDED #ifndef JUCE_QUICKTIMEMOVIECOMPONENT_H_INCLUDED
#define 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 #ifndef DOXYGEN
#if JUCE_WINDOWS #if JUCE_WINDOWS
typedef ActiveXControlComponent QTCompBaseClass; typedef ActiveXControlComponent QTCompBaseClass;


Write Preview
Loading…
Cancel
Save