From 15502c26030ff09fbffd2176a6517f996399af32 Mon Sep 17 00:00:00 2001 From: Julian Storer Date: Wed, 31 Aug 2011 17:21:59 +0100 Subject: [PATCH] Updated amalgamated files. Minor tweak to amalgamator. --- extras/amalgamator/Source/Main.cpp | 2 -- juce_amalgamated.cpp | 6 ++++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extras/amalgamator/Source/Main.cpp b/extras/amalgamator/Source/Main.cpp index 1f447397dd..985fc523a4 100644 --- a/extras/amalgamator/Source/Main.cpp +++ b/extras/amalgamator/Source/Main.cpp @@ -393,7 +393,6 @@ static void mungeJuce (const File& juceFolder) findAllFilesIncludedIn (hppTemplate, alreadyIncludedFiles); includesToIgnore.add (hppTarget.getFileName()); - std::cout << alreadyIncludedFiles.joinIntoString (";") << "\n"; munge (cppTemplate, cppTarget, "*.cpp;*.c;*.h;*.mm;*.m", alreadyIncludedFiles, includesToIgnore); } @@ -426,7 +425,6 @@ int main (int argc, char* argv[]) findAllFilesIncludedIn (templateHeader, alreadyIncludedFiles); includesToIgnore.add ("juce_amalgamated.h"); - std::cout << alreadyIncludedFiles.joinIntoString (";") << "\n"; munge (templateFile, targetFile, wildcard, alreadyIncludedFiles, includesToIgnore); } else if (argc == 4) diff --git a/juce_amalgamated.cpp b/juce_amalgamated.cpp index 0e9a7136ad..817a5d632c 100644 --- a/juce_amalgamated.cpp +++ b/juce_amalgamated.cpp @@ -83328,7 +83328,8 @@ END_JUCE_NAMESPACE #endif -#if JUCE_BUILD_MISC // (put these in misc to balance the file sizes and avoid problems in iphone build) +// (put these in misc to balance the file sizes and avoid problems in iphone build) +#if JUCE_BUILD_MISC /*** Start of inlined file: juce_Colour.cpp ***/ BEGIN_JUCE_NAMESPACE @@ -195460,7 +195461,8 @@ END_JUCE_NAMESPACE #endif -#if JUCE_BUILD_CORE && ! JUCE_ONLY_BUILD_CORE_LIBRARY // do these in the core section to help balance the sizes +// do these in the core section to help balance the sizes +#if JUCE_BUILD_CORE && ! JUCE_ONLY_BUILD_CORE_LIBRARY /*** Start of inlined file: juce_JPEGLoader.cpp ***/ #if JUCE_MSVC