mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-02-07 04:10:08 +00:00
Code Activity

Updated amalgamated files. Minor tweak to amalgamator.

Browse source
This commit is contained in:
Julian Storer 2011-08-31 17:21:59 +01:00
parent 8e0d573b03
commit 15502c2603
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
extras/amalgamator/Source/Main.cpp
View file

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

6
juce_amalgamated.cpp
View file

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