Changed the Linux native code files to use the same amalgamation file structure as the mac and windows ones do; made a small adjustment to the amalgamator, and removed some redundancy from the amalgamated files (if you are amalgamating code yourself, please build a new copy of the amalgamator, as the old one won't work correctly on this new code); fixed a few minor build warnings in linux

build/linux/JUCE.make

@@ -291,19 +291,20 @@ OBJECTS := \
 	$(OBJDIR)/juce_TopLevelWindow.o \
 	$(OBJDIR)/juce_ComponentPeer.o \
 	$(OBJDIR)/juce_AlertWindow.o \
-	$(OBJDIR)/juce_linux_FileChooser.o \
+	$(OBJDIR)/juce_linux_Files.o \
+	$(OBJDIR)/juce_linux_Audio.o \
 	$(OBJDIR)/juce_linux_Fonts.o \
-	$(OBJDIR)/juce_linux_Messaging.o \
-	$(OBJDIR)/juce_linux_Midi.o \
+	$(OBJDIR)/juce_linux_Network.o \
 	$(OBJDIR)/juce_linux_NamedPipe.o \
+	$(OBJDIR)/juce_linux_Midi.o \
+	$(OBJDIR)/juce_linux_Windowing.o \
+	$(OBJDIR)/juce_linux_AudioCDReader.o \
 	$(OBJDIR)/juce_linux_Threads.o \
+	$(OBJDIR)/juce_linux_Messaging.o \
 	$(OBJDIR)/juce_linux_SystemStats.o \
+	$(OBJDIR)/juce_linux_NativeCode.o \
+	$(OBJDIR)/juce_linux_FileChooser.o \
 	$(OBJDIR)/juce_linux_WebBrowserComponent.o \
-	$(OBJDIR)/juce_linux_Audio.o \
-	$(OBJDIR)/juce_linux_Network.o \
-	$(OBJDIR)/juce_linux_AudioCDReader.o \
-	$(OBJDIR)/juce_linux_Files.o \
-	$(OBJDIR)/juce_linux_Windowing.o \
 
 MKDIR_TYPE := msdos
 CMD := $(subst \,\\,$(ComSpec)$(COMSPEC))
@@ -1605,22 +1606,22 @@ $(OBJDIR)/juce_AlertWindow.o: ../../src/juce_appframework/gui/components/windows
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_linux_FileChooser.o: platform_specific_code/juce_linux_FileChooser.cpp
+$(OBJDIR)/juce_linux_Files.o: platform_specific_code/juce_linux_Files.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_linux_Fonts.o: platform_specific_code/juce_linux_Fonts.cpp
+$(OBJDIR)/juce_linux_Audio.o: platform_specific_code/juce_linux_Audio.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_linux_Messaging.o: platform_specific_code/juce_linux_Messaging.cpp
+$(OBJDIR)/juce_linux_Fonts.o: platform_specific_code/juce_linux_Fonts.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_linux_Midi.o: platform_specific_code/juce_linux_Midi.cpp
+$(OBJDIR)/juce_linux_Network.o: platform_specific_code/juce_linux_Network.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
@@ -1630,42 +1631,47 @@ $(OBJDIR)/juce_linux_NamedPipe.o: platform_specific_code/juce_linux_NamedPipe.cp
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_linux_Threads.o: platform_specific_code/juce_linux_Threads.cpp
+$(OBJDIR)/juce_linux_Midi.o: platform_specific_code/juce_linux_Midi.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_linux_SystemStats.o: platform_specific_code/juce_linux_SystemStats.cpp
+$(OBJDIR)/juce_linux_Windowing.o: platform_specific_code/juce_linux_Windowing.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_linux_WebBrowserComponent.o: platform_specific_code/juce_linux_WebBrowserComponent.cpp
+$(OBJDIR)/juce_linux_AudioCDReader.o: platform_specific_code/juce_linux_AudioCDReader.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_linux_Audio.o: platform_specific_code/juce_linux_Audio.cpp
+$(OBJDIR)/juce_linux_Threads.o: platform_specific_code/juce_linux_Threads.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_linux_Network.o: platform_specific_code/juce_linux_Network.cpp
+$(OBJDIR)/juce_linux_Messaging.o: platform_specific_code/juce_linux_Messaging.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_linux_AudioCDReader.o: platform_specific_code/juce_linux_AudioCDReader.cpp
+$(OBJDIR)/juce_linux_SystemStats.o: platform_specific_code/juce_linux_SystemStats.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_linux_Files.o: platform_specific_code/juce_linux_Files.cpp
+$(OBJDIR)/juce_linux_NativeCode.o: platform_specific_code/juce_linux_NativeCode.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_linux_Windowing.o: platform_specific_code/juce_linux_Windowing.cpp
+$(OBJDIR)/juce_linux_FileChooser.o: platform_specific_code/juce_linux_FileChooser.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
+$(OBJDIR)/juce_linux_WebBrowserComponent.o: platform_specific_code/juce_linux_WebBrowserComponent.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"

build/linux/platform_specific_code/juce_linux_Audio.cpp

@@ -29,38 +29,13 @@
   ==============================================================================
 */
 
-#include "../../../juce_Config.h"
+// (This file gets included by juce_linux_NativeCode.cpp, rather than being
+// compiled on its own).
+#ifdef JUCE_INCLUDED_FILE
 
 #if JUCE_ALSA
 
-#include "linuxincludes.h"
-
-//==============================================================================
-/* Got an include error here? If so, you've either not got ALSA installed, or you've
-   not got your paths set up correctly to find its header files.
-
-   The package you need to install to get ASLA support is "libasound2-dev".
-
-   If you don't have the ALSA library and don't want to build Juce with audio support,
-   just disable the JUCE_ALSA flag in juce_Config.h
-*/
-#include <alsa/asoundlib.h>
-
-
 //==============================================================================
-#include "../../../src/juce_core/basics/juce_StandardHeader.h"
-
-BEGIN_JUCE_NAMESPACE
-
-#include "../../../src/juce_appframework/audio/devices/juce_AudioIODeviceType.h"
-#include "../../../src/juce_core/threads/juce_Thread.h"
-#include "../../../src/juce_core/threads/juce_ScopedLock.h"
-#include "../../../src/juce_core/basics/juce_Time.h"
-#include "../../../src/juce_core/io/files/juce_File.h"
-#include "../../../src/juce_core/io/files/juce_FileInputStream.h"
-#include "../../../src/juce_core/basics/juce_Singleton.h"
-#include "../../../src/juce_appframework/audio/dsp/juce_AudioDataConverters.h"
-
 static const int maxNumChans = 64;
 
 
@@ -1028,20 +1003,13 @@ AudioIODeviceType* juce_createDefaultAudioIODeviceType()
     return new ALSAAudioIODeviceType();
 }
 
-
-END_JUCE_NAMESPACE
-
-
 //==============================================================================
 #else  // if ALSA is turned off..
 
-#include "../../../src/juce_core/basics/juce_StandardHeader.h"
-
-BEGIN_JUCE_NAMESPACE
-
-#include "../../../src/juce_appframework/audio/devices/juce_AudioIODeviceType.h"
-AudioIODeviceType* juce_createDefaultAudioIODeviceType()    { return 0; }
-
-END_JUCE_NAMESPACE
+AudioIODeviceType* juce_createDefaultAudioIODeviceType()
+{
+    return 0;
+}
 
 #endif
+#endif

build/linux/platform_specific_code/juce_linux_AudioCDReader.cpp

@@ -29,11 +29,9 @@
   ==============================================================================
 */
 
-#include "../../../src/juce_core/basics/juce_StandardHeader.h"
-
-BEGIN_JUCE_NAMESPACE
-
-#include "../../../src/juce_appframework/audio/audio_file_formats/juce_AudioCDReader.h"
+// (This file gets included by juce_linux_NativeCode.cpp, rather than being
+// compiled on its own).
+#ifdef JUCE_INCLUDED_FILE
 
 
 //==============================================================================
@@ -106,4 +104,4 @@ int AudioCDReader::getCDDBId()
     return 0;
 }
 
-END_JUCE_NAMESPACE
+#endif

build/linux/platform_specific_code/juce_linux_FileChooser.cpp

@@ -29,14 +29,9 @@
   ==============================================================================
 */
 
-#include "../../../juce_Config.h"
-#include "linuxincludes.h"
-#include "../../../src/juce_core/basics/juce_StandardHeader.h"
-
-BEGIN_JUCE_NAMESPACE
-
-#include "../../../src/juce_appframework/gui/components/filebrowser/juce_FileChooser.h"
-
+// (This file gets included by juce_linux_NativeCode.cpp, rather than being
+// compiled on its own).
+#ifdef JUCE_INCLUDED_FILE
 
 //==============================================================================
 void FileChooser::showPlatformDialog (OwnedArray<File>& results,
@@ -53,4 +48,4 @@ void FileChooser::showPlatformDialog (OwnedArray<File>& results,
     jassertfalse
 }
 
-END_JUCE_NAMESPACE
+#endif

build/linux/platform_specific_code/juce_linux_Files.cpp

@@ -29,20 +29,9 @@
   ==============================================================================
 */
 
-#include "linuxincludes.h"
-#include "../../../src/juce_core/basics/juce_StandardHeader.h"
-
-#include <sys/stat.h>
-#include <sys/dir.h>
-#include <sys/ptrace.h>
-#include <sys/vfs.h>        // for statfs
-#include <sys/wait.h>
-#include <unistd.h>
-#include <fnmatch.h>
-#include <utime.h>
-#include <pwd.h>
-#include <fcntl.h>
-#include <dlfcn.h>
+// (This file gets included by juce_linux_NativeCode.cpp, rather than being
+// compiled on its own).
+#ifdef JUCE_INCLUDED_FILE
 
 #define U_ISOFS_SUPER_MAGIC     (short) 0x9660   // linux/iso_fs.h
 #define U_MSDOS_SUPER_MAGIC     (short) 0x4d44   // linux/msdos_fs.h
@@ -50,26 +39,6 @@
 #define U_SMB_SUPER_MAGIC       (short) 0x517B   // linux/smb_fs.h
 
 
-BEGIN_JUCE_NAMESPACE
-
-#include "../../../src/juce_core/io/files/juce_FileInputStream.h"
-#include "../../../src/juce_core/io/files/juce_FileOutputStream.h"
-#include "../../../src/juce_core/basics/juce_SystemStats.h"
-#include "../../../src/juce_core/basics/juce_Time.h"
-#include "../../../src/juce_core/basics/juce_Random.h"
-#include "../../../src/juce_core/io/network/juce_URL.h"
-#include "../../../src/juce_core/io/files/juce_NamedPipe.h"
-#include "../../../src/juce_core/threads/juce_InterProcessLock.h"
-#include "../../../src/juce_core/threads/juce_Thread.h"
-
-//==============================================================================
-/*
-    Note that a lot of methods that you'd expect to find in this file actually
-    live in juce_posix_SharedCode.h!
-*/
-#include "../../macosx/platform_specific_code/juce_posix_SharedCode.h"
-
-
 //==============================================================================
 void juce_getFileTimes (const String& fileName,
                         int64& modificationTime,
@@ -479,5 +448,4 @@ bool juce_launchFile (const String& fileName,
     return cpid >= 0;
 }
 
-
-END_JUCE_NAMESPACE
+#endif

build/linux/platform_specific_code/juce_linux_Fonts.cpp

@@ -29,26 +29,9 @@
   ==============================================================================
 */
 
-#include "../../../juce_Config.h"
-#include "linuxincludes.h"
-
-/*  Got a build error here? You'll need to install the freetype library...
-
-    The name of the package to install is "libfreetype6-dev".
-*/
-#include <ft2build.h>
-#include FT_FREETYPE_H
-
-#include "../../../src/juce_core/basics/juce_StandardHeader.h"
-
-BEGIN_JUCE_NAMESPACE
-
-#include "../../../src/juce_appframework/gui/graphics/fonts/juce_Font.h"
-#include "../../../src/juce_core/basics/juce_Singleton.h"
-#include "../../../src/juce_core/io/streams/juce_MemoryInputStream.h"
-#include "../../../src/juce_core/io/files/juce_DirectoryIterator.h"
-#include "../../../src/juce_core/text/juce_XmlDocument.h"
-#include "../../../src/juce_appframework/application/juce_DeletedAtShutdown.h"
+// (This file gets included by juce_linux_NativeCode.cpp, rather than being
+// compiled on its own).
+#ifdef JUCE_INCLUDED_FILE
 
 
 //==============================================================================
@@ -637,4 +620,4 @@ void Typeface::getDefaultFontNames (String& defaultSans, String& defaultSerif, S
     defaultFixed = linux_getDefaultMonospacedFontName();
 }
 
-END_JUCE_NAMESPACE
+#endif

build/linux/platform_specific_code/juce_linux_Messaging.cpp

@@ -29,24 +29,11 @@
   ==============================================================================
 */
 
-#include "../../../juce_Config.h"
-
-#include "linuxincludes.h"
-#include <stdio.h>
-#include <signal.h>
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-#include <X11/Xresource.h>
-#include <X11/Xutil.h>
-#include "../../../src/juce_core/basics/juce_StandardHeader.h"
-
-BEGIN_JUCE_NAMESPACE
-
-#include "../../../src/juce_appframework/events/juce_MessageManager.h"
-#include "../../../src/juce_core/threads/juce_WaitableEvent.h"
-#include "../../../src/juce_core/threads/juce_Process.h"
-#include "../../../src/juce_core/threads/juce_ScopedLock.h"
+// (This file gets included by juce_linux_NativeCode.cpp, rather than being
+// compiled on its own).
+#ifdef JUCE_INCLUDED_FILE
 
+//==============================================================================
 #ifdef JUCE_DEBUG
   #define JUCE_DEBUG_XERRORS 1
 #endif
@@ -417,4 +404,4 @@ bool juce_dispatchNextMessageOnSystemQueue (bool returnIfNoPendingMessages)
     return true;
 }
 
-END_JUCE_NAMESPACE
+#endif

build/linux/platform_specific_code/juce_linux_Midi.cpp

@@ -29,21 +29,12 @@
   ==============================================================================
 */
 
-#include "../../../juce_Config.h"
+// (This file gets included by juce_linux_NativeCode.cpp, rather than being
+// compiled on its own).
+#ifdef JUCE_INCLUDED_FILE
 
 #if JUCE_ALSA
 
-#include "../../../src/juce_core/basics/juce_StandardHeader.h"
-#include <alsa/asoundlib.h>
-
-BEGIN_JUCE_NAMESPACE
-
-#include "../../../src/juce_appframework/audio/devices/juce_MidiOutput.h"
-#include "../../../src/juce_appframework/audio/devices/juce_MidiInput.h"
-#include "../../../src/juce_core/threads/juce_Thread.h"
-#include "../../../src/juce_core/basics/juce_Time.h"
-
-
 //==============================================================================
 static snd_seq_t* iterateDevices (const bool forInput,
                                   StringArray& deviceNamesFound,
@@ -442,23 +433,11 @@ MidiInput* MidiInput::createNewDevice (const String& deviceName, MidiInputCallba
 
 
 
-END_JUCE_NAMESPACE
-
 //==============================================================================
-
 #else
 
-//==============================================================================
 // (These are just stub functions if ALSA is unavailable...)
 
-#include "../../../src/juce_core/basics/juce_StandardHeader.h"
-
-BEGIN_JUCE_NAMESPACE
-
-#include "../../../src/juce_appframework/audio/devices/juce_MidiOutput.h"
-#include "../../../src/juce_appframework/audio/devices/juce_MidiInput.h"
-
-//==============================================================================
 const StringArray MidiOutput::getDevices()                          { return StringArray(); }
 int MidiOutput::getDefaultDeviceIndex()                             { return 0; }
 MidiOutput* MidiOutput::openDevice (int)                            { return 0; }
@@ -469,11 +448,7 @@ bool MidiOutput::getVolume (float&, float&)     { return false; }
 void MidiOutput::setVolume (float, float)       {}
 void MidiOutput::sendMessageNow (const MidiMessage&)    {}
 
-MidiInput::MidiInput (const String& name_)
-    : name (name_),
-      internal (0)
-{}
-
+MidiInput::MidiInput (const String& name_) : name (name_), internal (0)  {}
 MidiInput::~MidiInput() {}
 void MidiInput::start() {}
 void MidiInput::stop()  {}
@@ -482,6 +457,5 @@ const StringArray MidiInput::getDevices()   { return StringArray(); }
 MidiInput* MidiInput::openDevice (int, MidiInputCallback*)                  { return 0; }
 MidiInput* MidiInput::createNewDevice (const String&, MidiInputCallback*)   { return 0; }
 
-END_JUCE_NAMESPACE
-
+#endif
 #endif

build/linux/platform_specific_code/juce_linux_NativeCode.cpp

@@ -0,0 +1,120 @@
+/*
+  ==============================================================================
+
+   This file is part of the JUCE library - "Jules' Utility Class Extensions"
+   Copyright 2004-7 by Raw Material Software ltd.
+
+  ------------------------------------------------------------------------------
+
+   JUCE can be redistributed and/or modified under the terms of the
+   GNU General Public License, as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later version.
+
+   JUCE is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with JUCE; if not, visit www.gnu.org/licenses or write to the
+   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+   Boston, MA 02111-1307 USA
+
+  ------------------------------------------------------------------------------
+
+   If you'd like to release a closed-source product which uses JUCE, commercial
+   licenses are also available: visit www.rawmaterialsoftware.com/juce for
+   more information.
+
+  ==============================================================================
+*/
+
+/*
+    This file wraps together all the mac-specific code, so that
+    we can include all the native headers just once, and compile all our
+    platform-specific stuff in one big lump, keeping it out of the way of
+    the rest of the codebase.
+*/
+
+#include "juce_linux_NativeIncludes.h"
+
+
+BEGIN_JUCE_NAMESPACE
+
+#include "../../../src/juce_core/io/files/juce_FileInputStream.h"
+#include "../../../src/juce_core/io/files/juce_FileOutputStream.h"
+#include "../../../src/juce_core/basics/juce_SystemStats.h"
+#include "../../../src/juce_core/basics/juce_Time.h"
+#include "../../../src/juce_core/basics/juce_Random.h"
+#include "../../../src/juce_core/io/network/juce_URL.h"
+#include "../../../src/juce_core/io/files/juce_NamedPipe.h"
+#include "../../../src/juce_core/threads/juce_InterProcessLock.h"
+#include "../../../src/juce_appframework/audio/devices/juce_AudioIODeviceType.h"
+#include "../../../src/juce_core/threads/juce_Thread.h"
+#include "../../../src/juce_core/threads/juce_ScopedLock.h"
+#include "../../../src/juce_core/io/files/juce_File.h"
+#include "../../../src/juce_core/basics/juce_Singleton.h"
+#include "../../../src/juce_appframework/audio/dsp/juce_AudioDataConverters.h"
+#include "../../../src/juce_appframework/audio/audio_file_formats/juce_AudioCDReader.h"
+#include "../../../src/juce_appframework/gui/graphics/fonts/juce_Font.h"
+#include "../../../src/juce_core/io/streams/juce_MemoryInputStream.h"
+#include "../../../src/juce_core/io/files/juce_DirectoryIterator.h"
+#include "../../../src/juce_core/text/juce_XmlDocument.h"
+#include "../../../src/juce_appframework/application/juce_DeletedAtShutdown.h"
+#include "../../../src/juce_appframework/events/juce_MessageManager.h"
+#include "../../../src/juce_core/threads/juce_WaitableEvent.h"
+#include "../../../src/juce_core/threads/juce_Process.h"
+#include "../../../src/juce_appframework/gui/components/filebrowser/juce_FileChooser.h"
+#include "../../../src/juce_appframework/audio/devices/juce_MidiOutput.h"
+#include "../../../src/juce_appframework/audio/devices/juce_MidiInput.h"
+#include "../../../src/juce_core/text/juce_StringArray.h"
+#include "../../../src/juce_core/containers/juce_MemoryBlock.h"
+#include "../../../src/juce_core/misc/juce_PlatformUtilities.h"
+#include "../../../src/juce_core/threads/juce_CriticalSection.h"
+#include "../../../src/juce_appframework/events/juce_Timer.h"
+#include "../../../src/juce_appframework/gui/components/special/juce_WebBrowserComponent.h"
+#include "../../../src/juce_appframework/gui/components/keyboard/juce_KeyPress.h"
+#include "../../../src/juce_appframework/application/juce_SystemClipboard.h"
+#include "../../../src/juce_appframework/gui/components/windows/juce_AlertWindow.h"
+#include "../../../src/juce_appframework/gui/components/special/juce_OpenGLComponent.h"
+#include "../../../src/juce_appframework/gui/components/juce_Desktop.h"
+#include "../../../src/juce_appframework/gui/components/juce_ComponentDeletionWatcher.h"
+#include "../../../src/juce_appframework/gui/graphics/geometry/juce_RectangleList.h"
+#include "../../../src/juce_appframework/gui/graphics/imaging/juce_ImageFileFormat.h"
+#include "../../../src/juce_appframework/gui/graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h"
+#include "../../../src/juce_appframework/gui/components/mouse/juce_DragAndDropContainer.h"
+#include "../../../src/juce_appframework/gui/components/special/juce_SystemTrayIconComponent.h"
+#include "../../../src/juce_appframework/application/juce_Application.h"
+
+/* Remove this macro if you're having problems compiling the cpu affinity
+   calls (the API for these has changed about quite a bit in various Linux
+   versions, and a lot of distros seem to ship with obsolete versions)
+*/
+#if defined (CPU_ISSET) && ! defined (SUPPORT_AFFINITIES)
+  #define SUPPORT_AFFINITIES 1
+#endif
+
+//==============================================================================
+#define JUCE_INCLUDED_FILE 1
+
+// Now include the actual code files..
+
+#include "../../macosx/platform_specific_code/juce_posix_SharedCode.h"
+#include "juce_linux_Files.cpp"
+#include "../../macosx/platform_specific_code/juce_mac_NamedPipe.cpp"
+#include "juce_linux_Network.cpp"
+#include "juce_linux_SystemStats.cpp"
+#include "juce_linux_Threads.cpp"
+
+#if ! JUCE_ONLY_BUILD_CORE_LIBRARY
+ #include "juce_linux_Messaging.cpp"
+ #include "juce_linux_Fonts.cpp"
+ #include "juce_linux_Windowing.cpp"
+ #include "juce_linux_Audio.cpp"
+ #include "juce_linux_Midi.cpp"
+ #include "juce_linux_AudioCDReader.cpp"
+ #include "juce_linux_FileChooser.cpp"
+ #include "juce_linux_WebBrowserComponent.cpp"
+#endif
+
+END_JUCE_NAMESPACE

build/linux/platform_specific_code/juce_linux_NativeIncludes.h

@@ -0,0 +1,122 @@
+/*
+  ==============================================================================
+
+   This file is part of the JUCE library - "Jules' Utility Class Extensions"
+   Copyright 2004-7 by Raw Material Software ltd.
+
+  ------------------------------------------------------------------------------
+
+   JUCE can be redistributed and/or modified under the terms of the
+   GNU General Public License, as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later version.
+
+   JUCE is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with JUCE; if not, visit www.gnu.org/licenses or write to the
+   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+   Boston, MA 02111-1307 USA
+
+  ------------------------------------------------------------------------------
+
+   If you'd like to release a closed-source product which uses JUCE, commercial
+   licenses are also available: visit www.rawmaterialsoftware.com/juce for
+   more information.
+
+  ==============================================================================
+*/
+
+#ifndef __JUCE_LINUX_NATIVEINCLUDES_JUCEHEADER__
+#define __JUCE_LINUX_NATIVEINCLUDES_JUCEHEADER__
+
+/*
+    This file wraps together all the linux-specific headers, so
+    that we can include them all just once, and compile all our
+    platform-specific stuff in one big lump, keeping it out of the
+    way of the rest of the codebase.
+*/
+
+#include "../../../src/juce_core/basics/juce_StandardHeader.h"
+
+#include <sched.h>
+#include <pthread.h>
+#include <sys/time.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <sys/dir.h>
+#include <sys/ptrace.h>
+#include <sys/vfs.h>
+#include <sys/wait.h>
+#include <fnmatch.h>
+#include <utime.h>
+#include <pwd.h>
+#include <fcntl.h>
+#include <dlfcn.h>
+#include <netdb.h>
+#include <arpa/inet.h>
+#include <netinet/in.h>
+#include <sys/types.h>
+#include <sys/ioctl.h>
+#include <sys/socket.h>
+#include <linux/if.h>
+#include <sys/sysinfo.h>
+#include <sys/file.h>
+#include <signal.h>
+
+/* Got a build error here? You'll need to install the freetype library...
+   The name of the package to install is "libfreetype6-dev".
+*/
+#include <ft2build.h>
+#include FT_FREETYPE_H
+
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+#include <X11/Xresource.h>
+#include <X11/Xutil.h>
+#include <X11/Xmd.h>
+#include <X11/keysym.h>
+#include <X11/cursorfont.h>
+
+#if JUCE_USE_XINERAMA
+ /* If you're trying to use Xinerama, you'll need to install the "libxinerama-dev" package..  */
+ #include <X11/extensions/Xinerama.h>
+#endif
+
+#if JUCE_USE_XSHM
+ #include <X11/extensions/XShm.h>
+ #include <sys/shm.h>
+ #include <sys/ipc.h>
+#endif
+
+#if JUCE_OPENGL
+ /* Got an include error here?
+
+    If you want to install OpenGL support, the packages to get are "mesa-common-dev"
+    and "freeglut3-dev".
+
+    Alternatively, you can turn off the JUCE_OPENGL flag in juce_Config.h if you
+    want to disable it.
+ */
+ #include <GL/glx.h>
+#endif
+
+#undef KeyPress
+
+#if JUCE_ALSA
+ /* Got an include error here? If so, you've either not got ALSA installed, or you've
+    not got your paths set up correctly to find its header files.
+
+    The package you need to install to get ASLA support is "libasound2-dev".
+
+    If you don't have the ALSA library and don't want to build Juce with audio support,
+    just disable the JUCE_ALSA flag in juce_Config.h
+ */
+ #include <alsa/asoundlib.h>
+#endif
+
+#undef SIZEOF
+
+#endif   // __JUCE_LINUX_NATIVEINCLUDES_JUCEHEADER__

build/linux/platform_specific_code/juce_linux_Network.cpp

@@ -29,25 +29,9 @@
   ==============================================================================
 */
 
-#include "linuxincludes.h"
-#include <netdb.h>
-#include <arpa/inet.h>
-#include <netinet/in.h>
-#include <sys/types.h>
-#include <sys/ioctl.h>
-#include <sys/socket.h>
-#include <sys/wait.h>
-#include <linux/if.h>
-
-#include "../../../src/juce_core/basics/juce_StandardHeader.h"
-
-BEGIN_JUCE_NAMESPACE
-
-#include "../../../src/juce_core/text/juce_StringArray.h"
-#include "../../../src/juce_core/basics/juce_SystemStats.h"
-#include "../../../src/juce_core/containers/juce_MemoryBlock.h"
-#include "../../../src/juce_core/misc/juce_PlatformUtilities.h"
-#include "../../../src/juce_core/io/network/juce_URL.h"
+// (This file gets included by juce_linux_NativeCode.cpp, rather than being
+// compiled on its own).
+#ifdef JUCE_INCLUDED_FILE
 
 
 //==============================================================================
@@ -500,4 +484,4 @@ int juce_seekInInternetFile (void* handle, int newPosition)
     return 0;
 }
 
-END_JUCE_NAMESPACE
+#endif

build/linux/platform_specific_code/juce_linux_SystemStats.cpp

@@ -29,23 +29,9 @@
   ==============================================================================
 */
 
-#include "linuxincludes.h"
-#include "../../../src/juce_core/basics/juce_StandardHeader.h"
-#include <sys/sysinfo.h>
-#include <dlfcn.h>
-
-
-#ifndef CPU_ISSET
-  #undef SUPPORT_AFFINITIES
-#endif
-
-BEGIN_JUCE_NAMESPACE
-
-#include "../../../src/juce_core/io/files/juce_File.h"
-#include "../../../src/juce_core/basics/juce_SystemStats.h"
-#include "../../../src/juce_core/threads/juce_Process.h"
-#include "../../../src/juce_appframework/events/juce_Timer.h"
-#include "../../../src/juce_core/misc/juce_PlatformUtilities.h"
+// (This file gets included by juce_linux_NativeCode.cpp, rather than being
+// compiled on its own).
+#ifdef JUCE_INCLUDED_FILE
 
 
 //==============================================================================
@@ -274,4 +260,4 @@ void PlatformUtilities::fpuReset()
 {
 }
 
-END_JUCE_NAMESPACE
+#endif

build/linux/platform_specific_code/juce_linux_Threads.cpp

@@ -29,33 +29,15 @@
   ==============================================================================
 */
 
-#include "linuxincludes.h"
-#include <dlfcn.h>
-#include <sys/file.h>
-#include <sys/types.h>
-#include <sys/ptrace.h>
-#include "../../../src/juce_core/basics/juce_StandardHeader.h"
-
-BEGIN_JUCE_NAMESPACE
-
-#include "../../../src/juce_core/threads/juce_CriticalSection.h"
-#include "../../../src/juce_core/threads/juce_WaitableEvent.h"
-#include "../../../src/juce_core/threads/juce_Thread.h"
-#include "../../../src/juce_core/threads/juce_Process.h"
-#include "../../../src/juce_core/io/files/juce_File.h"
-#include "../../../src/juce_core/basics/juce_SystemStats.h"
-#include "../../../src/juce_core/misc/juce_PlatformUtilities.h"
+// (This file gets included by juce_linux_NativeCode.cpp, rather than being
+// compiled on its own).
+#ifdef JUCE_INCLUDED_FILE
 
-//==============================================================================
 /*
     Note that a lot of methods that you'd expect to find in this file actually
     live in juce_posix_SharedCode.h!
 */
 
-#ifndef CPU_ISSET
-  #undef SUPPORT_AFFINITIES
-#endif
-
 //==============================================================================
 void JUCE_API juce_threadEntryPoint (void*);
 
@@ -276,4 +258,4 @@ void* PlatformUtilities::getProcedureEntryPoint (void* libraryHandle, const Stri
 
 #endif
 
-END_JUCE_NAMESPACE
+#endif

build/linux/platform_specific_code/juce_linux_WebBrowserComponent.cpp

@@ -29,11 +29,9 @@
   ==============================================================================
 */
 
-#include "../../../src/juce_core/basics/juce_StandardHeader.h"
-
-BEGIN_JUCE_NAMESPACE
-
-#include "../../../src/juce_appframework/gui/components/special/juce_WebBrowserComponent.h"
+// (This file gets included by juce_linux_NativeCode.cpp, rather than being
+// compiled on its own).
+#ifdef JUCE_INCLUDED_FILE
 
 #if JUCE_WEB_BROWSER
 
@@ -133,4 +131,4 @@ bool WebBrowserComponent::pageAboutToLoad (const String& url)
 }
 
 #endif
-END_JUCE_NAMESPACE
+#endif

build/linux/platform_specific_code/juce_linux_Windowing.cpp

@@ -29,65 +29,9 @@
   ==============================================================================
 */
 
-#include "../../../juce_Config.h"
-#include "linuxincludes.h"
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-#include <X11/Xatom.h>
-#include <X11/Xmd.h>
-#include <X11/keysym.h>
-#include <X11/cursorfont.h>
-#include <dlfcn.h>
-
-#if JUCE_USE_XINERAMA
- /* If you're trying to use Xinerama, you'll need to install the "libxinerama-dev" package..
- */
- #include <X11/extensions/Xinerama.h>
-#endif
-
-#if JUCE_USE_XSHM
- #include <X11/extensions/XShm.h>
- #include <sys/shm.h>
- #include <sys/ipc.h>
-#endif
-
-#if JUCE_OPENGL
- /*  Got an include error here?
-
-     If you want to install OpenGL support, the packages to get are "mesa-common-dev"
-     and "freeglut3-dev".
-
-     Alternatively, you can turn off the JUCE_OPENGL flag in juce_Config.h if you
-     want to disable it.
- */
- #include <GL/glx.h>
-#endif
-
-
-#undef KeyPress
-
-#include "../../../src/juce_core/basics/juce_StandardHeader.h"
-
-BEGIN_JUCE_NAMESPACE
-
-#include "../../../src/juce_appframework/events/juce_Timer.h"
-#include "../../../src/juce_appframework/application/juce_DeletedAtShutdown.h"
-#include "../../../src/juce_appframework/gui/components/keyboard/juce_KeyPress.h"
-#include "../../../src/juce_appframework/application/juce_SystemClipboard.h"
-#include "../../../src/juce_appframework/gui/components/windows/juce_AlertWindow.h"
-#include "../../../src/juce_appframework/gui/components/special/juce_OpenGLComponent.h"
-#include "../../../src/juce_appframework/gui/components/juce_Desktop.h"
-#include "../../../src/juce_appframework/events/juce_MessageManager.h"
-#include "../../../src/juce_appframework/gui/components/juce_ComponentDeletionWatcher.h"
-#include "../../../src/juce_appframework/gui/graphics/geometry/juce_RectangleList.h"
-#include "../../../src/juce_appframework/gui/graphics/imaging/juce_ImageFileFormat.h"
-#include "../../../src/juce_appframework/gui/graphics/contexts/juce_LowLevelGraphicsSoftwareRenderer.h"
-#include "../../../src/juce_appframework/gui/components/mouse/juce_DragAndDropContainer.h"
-#include "../../../src/juce_appframework/gui/components/special/juce_SystemTrayIconComponent.h"
-#include "../../../src/juce_appframework/application/juce_Application.h"
-#include "../../../src/juce_core/threads/juce_Process.h"
-#include "../../../src/juce_core/io/network/juce_URL.h"
-#include "../../../src/juce_core/misc/juce_PlatformUtilities.h"
+// (This file gets included by juce_linux_NativeCode.cpp, rather than being
+// compiled on its own).
+#ifdef JUCE_INCLUDED_FILE
 
 //==============================================================================
 #define TAKE_FOCUS 0
@@ -3369,4 +3313,4 @@ const int KeyPress::fastForwardKey      = (0xffeeff02) | extendedKeyModifier;
 const int KeyPress::rewindKey           = (0xffeeff03) | extendedKeyModifier;
 
 
-END_JUCE_NAMESPACE
+#endif

build/linux/platform_specific_code/linuxincludes.h

@@ -1,54 +0,0 @@
-/*
-  ==============================================================================
-
-   This file is part of the JUCE library - "Jules' Utility Class Extensions"
-   Copyright 2004-7 by Raw Material Software ltd.
-
-  ------------------------------------------------------------------------------
-
-   JUCE can be redistributed and/or modified under the terms of the
-   GNU General Public License, as published by the Free Software Foundation;
-   either version 2 of the License, or (at your option) any later version.
-
-   JUCE is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with JUCE; if not, visit www.gnu.org/licenses or write to the
-   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-   Boston, MA 02111-1307 USA
-
-  ------------------------------------------------------------------------------
-
-   If you'd like to release a closed-source product which uses JUCE, commercial
-   licenses are also available: visit www.rawmaterialsoftware.com/juce for
-   more information.
-
-  ==============================================================================
-*/
-
-#ifndef __LINUXINCLUDES_JUCEHEADER__
-#define __LINUXINCLUDES_JUCEHEADER__
-
-// Linux Header Files:
-#include <unistd.h>
-#include <stdlib.h>
-#include <sched.h>
-#include <pthread.h>
-#include <sys/time.h>
-#include <errno.h>
-
-#include "../../../juce_Config.h"
-
-/* Remove this macro if you're having problems compiling the cpu affinity
-   calls (the API for these has changed about quite a bit in various Linux
-   versions, and a lot of distros seem to ship with obsolete versions)
-*/
-#ifndef SUPPORT_AFFINITIES
-  #define SUPPORT_AFFINITIES 1
-#endif
-
-
-#endif   // __LINUXINCLUDES_JUCEHEADER__

build/macosx/platform_specific_code/juce_mac_NamedPipe.cpp

@@ -29,26 +29,9 @@
   ==============================================================================
 */
 
-#include "../../../src/juce_core/basics/juce_StandardHeader.h"
-
-#include <sys/stat.h>
-#include <sys/dir.h>
-#include <fcntl.h>
-
-// As well as being for the mac, this file is included by the linux build.
-
-#if ! JUCE_MAC
- #include <sys/wait.h>
- #include <errno.h>
- #include <unistd.h>
-#endif
-
-BEGIN_JUCE_NAMESPACE
-
-#include "../../../src/juce_core/io/files/juce_File.h"
-#include "../../../src/juce_core/io/files/juce_NamedPipe.h"
-#include "../../../src/juce_core/threads/juce_Thread.h"
-
+// (This file gets included by juce_mac_NativeCode.mm, rather than being
+// compiled on its own).
+#if JUCE_INCLUDED_FILE
 
 //==============================================================================
 struct NamedPipeInternal
@@ -233,5 +216,4 @@ int NamedPipe::write (const void* sourceBuffer, int numBytesToWrite, int timeOut
     return bytesWritten;
 }
 
-
-END_JUCE_NAMESPACE
+#endif

build/macosx/platform_specific_code/juce_mac_NativeCode.mm

@@ -38,7 +38,6 @@
 
 #include "juce_mac_NativeIncludes.h"
 
-
 BEGIN_JUCE_NAMESPACE
 
 //==============================================================================
@@ -49,6 +48,7 @@ BEGIN_JUCE_NAMESPACE
 #include "../../../src/juce_core/threads/juce_Thread.h"
 #include "../../../src/juce_core/threads/juce_InterProcessLock.h"
 #include "../../../src/juce_core/io/files/juce_FileInputStream.h"
+#include "../../../src/juce_core/io/files/juce_NamedPipe.h"
 #include "../../../src/juce_core/io/network/juce_URL.h"
 #include "../../../src/juce_core/misc/juce_PlatformUtilities.h"
 #include "../../../src/juce_core/text/juce_LocalisedStrings.h"
@@ -109,6 +109,7 @@ BEGIN_JUCE_NAMESPACE
 #include "juce_mac_Strings.mm"
 #include "juce_mac_SystemStats.mm"
 #include "juce_mac_Network.mm"
+#include "juce_mac_NamedPipe.cpp"
 #include "juce_mac_Threads.mm"
 #include "juce_posix_SharedCode.h"
 #include "juce_mac_Files.mm"

build/macosx/platform_specific_code/juce_posix_SharedCode.h

@@ -407,7 +407,8 @@ const String juce_getVolumeLabel (const String& filenameOnVolume,
 //==============================================================================
 void juce_runSystemCommand (const String& command)
 {
-    system ((const char*) command.toUTF8());
+    int result = system ((const char*) command.toUTF8());
+    (void) result;
 }
 
 const String juce_getOutputFromCommand (const String& command)

extras/amalgamator/juce_AmalgamatorMain.cpp

@@ -131,7 +131,8 @@ static bool parseFile (const File& rootFolder,
                 if (matchesWildcard (filename.replaceCharacter (T('\\'), T('/')), wildcards)
                      && ! includesToIgnore.contains (targetFile.getFileName()))
                 {
-                    if (! alreadyIncludedFiles.contains (targetFile.getFullPathName()))
+                    if (line.containsIgnoreCase (T("FORCE_AMALGAMATOR_INCLUDE"))
+                        || ! alreadyIncludedFiles.contains (targetFile.getFullPathName()))
                     {
                         if (! canFileBeReincluded (targetFile))
                             alreadyIncludedFiles.add (targetFile.getFullPathName());

extras/amalgamator/juce_AppConfig.h

@@ -1,10 +1,16 @@
-
 /*
     This file contains settings that you might want to explicitly apply to 
-    the your build.
+    your Juce build.
+
+    These flags enable or disable juce features - if you're linking to juce as
+    a library, then to change them, you'd need to alter your juce_Config.h file and
+    recompile the juce lib. But because we're using the amalgamated file, you can
+    just include this file before including your juce_amalgamated.cpp file to
+    have the same effect.
 
-    Most of these are turned on or off by default, but you can override
-    that setting here by un-commenting it and giving it a 1 or 0 value.
+    If you leave any of these commented-out, they'll take on the default value 
+    assigned to them in juce_Config.h, so to force them on or off, just set them
+    to an explicit 0 or 1 in here.
 */
 
 #define JUCE_ONLY_BUILD_CORE_LIBRARY   1

extras/audio plugin host/src/juce_AppConfig.h

@@ -31,10 +31,17 @@
 
 /*
     This file contains settings that you might want to explicitly apply to
-    the your build.
+    your Juce build.
 
-    Most of these are turned on or off by default, but you can override
-    that setting here by un-commenting it and giving it a 1 or 0 value.
+    These flags enable or disable juce features - if you're linking to juce as
+    a library, then to change them, you'd need to alter your juce_Config.h file and
+    recompile the juce lib. But because we're using the amalgamated file, you can
+    just include this file before including your juce_amalgamated.cpp file to
+    have the same effect.
+
+    If you leave any of these commented-out, they'll take on the default value
+    assigned to them in juce_Config.h, so to force them on or off, just set them
+    to an explicit 0 or 1 in here.
 */
 
 #define JUCE_PLUGINHOST_VST  1

extras/audio plugins/demo/src/juce_AppConfig.h

@@ -31,10 +31,17 @@
 
 /*
     This file contains settings that you might want to explicitly apply to
-    the your build.
+    your Juce build.
 
-    Most of these are turned on or off by default, but you can override
-    that setting here by un-commenting it and giving it a 1 or 0 value.
+    These flags enable or disable juce features - if you're linking to juce as
+    a library, then to change them, you'd need to alter your juce_Config.h file and
+    recompile the juce lib. But because we're using the amalgamated file, you can
+    just include this file before including your juce_amalgamated.cpp file to
+    have the same effect.
+
+    If you leave any of these commented-out, they'll take on the default value
+    assigned to them in juce_Config.h, so to force them on or off, just set them
+    to an explicit 0 or 1 in here.
 */
 
 #define JUCE_QUICKTIME  0

extras/binarybuilder/juce_AppConfig.h

@@ -1,10 +1,16 @@
-
 /*
     This file contains settings that you might want to explicitly apply to 
-    the your build.
+    your Juce build.
+
+    These flags enable or disable juce features - if you're linking to juce as
+    a library, then to change them, you'd need to alter your juce_Config.h file and
+    recompile the juce lib. But because we're using the amalgamated file, you can
+    just include this file before including your juce_amalgamated.cpp file to
+    have the same effect.
 
-    Most of these are turned on or off by default, but you can override
-    that setting here by un-commenting it and giving it a 1 or 0 value.
+    If you leave any of these commented-out, they'll take on the default value 
+    assigned to them in juce_Config.h, so to force them on or off, just set them
+    to an explicit 0 or 1 in here.
 */
 
 #define JUCE_ONLY_BUILD_CORE_LIBRARY   1

extras/example projects/common/juce_AppConfig.h

@@ -1,10 +1,16 @@
-
 /*
     This file contains settings that you might want to explicitly apply to 
-    the your build.
+    your Juce build.
+
+    These flags enable or disable juce features - if you're linking to juce as
+    a library, then to change them, you'd need to alter your juce_Config.h file and
+    recompile the juce lib. But because we're using the amalgamated file, you can
+    just include this file before including your juce_amalgamated.cpp file to
+    have the same effect.
 
-    Most of these are turned on or off by default, but you can override
-    that setting here by un-commenting it and giving it a 1 or 0 value.
+    If you leave any of these commented-out, they'll take on the default value 
+    assigned to them in juce_Config.h, so to force them on or off, just set them
+    to an explicit 0 or 1 in here.
 */
 
 //#define JUCE_ONLY_BUILD_CORE_LIBRARY   1

extras/juce demo/build/linux/JuceDemo.make

@@ -43,7 +43,6 @@ OBJECTS := \
 	$(OBJDIR)/BinaryData.o \
 	$(OBJDIR)/juce_LibrarySource.o \
 	$(OBJDIR)/MainDemoWindow.o \
-	$(OBJDIR)/WebBrowserDemo.o \
 	$(OBJDIR)/WidgetsDemo.o \
 	$(OBJDIR)/ThreadingDemo.o \
 	$(OBJDIR)/TreeViewDemo.o \
@@ -56,6 +55,7 @@ OBJECTS := \
 	$(OBJDIR)/DragAndDropDemo.o \
 	$(OBJDIR)/CameraDemo.o \
 	$(OBJDIR)/AudioDemo.o \
+	$(OBJDIR)/WebBrowserDemo.o \
 
 MKDIR_TYPE := msdos
 CMD := $(subst \,\\,$(ComSpec)$(COMSPEC))
@@ -117,11 +117,6 @@ $(OBJDIR)/MainDemoWindow.o: ../../src/MainDemoWindow.cpp
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/WebBrowserDemo.o: ../../src/demos/WebBrowserDemo.cpp
-	-@$(CMD_MKOBJDIR)
-	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
-
 $(OBJDIR)/WidgetsDemo.o: ../../src/demos/WidgetsDemo.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
@@ -182,5 +177,10 @@ $(OBJDIR)/AudioDemo.o: ../../src/demos/AudioDemo.cpp
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
+$(OBJDIR)/WebBrowserDemo.o: ../../src/demos/WebBrowserDemo.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
+
 -include $(OBJECTS:%.o=%.d)
 

extras/juce demo/build/win32_vc8/jucedemo.sln

@@ -1,6 +1,6 @@
 
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual C++ Express 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jucedemo", "jucedemo.vcproj", "{050D65C2-17C4-4EE1-ABCE-BEA9DA83D77A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JUCE", "..\..\..\..\build\win32\vc8\JUCE.vcproj", "{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}"

extras/juce demo/src/BinaryData.cpp

@@ -1828,141 +1828,142 @@ static const unsigned char temp4[] = {47,42,13,10,32,32,61,61,61,61,61,61,61,61,
   32,32,32,32,114,101,116,117,114,110,32,110,101,119,32,84,114,101,101,86,105,101,119,68,101,109,111,40,41,59,13,10,125,13,10,0,0};
 const char* BinaryData::treeviewdemo_cpp = (const char*) temp4;
 
-static const unsigned char temp5[] = {47,42,13,10,32,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
+static const unsigned char temp5[] = {47,42,13,10,32,32,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
   61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
-  61,61,61,13,10,32,13,10,32,84,104,105,115,32,102,105,108,101,32,105,115,32,112,97,114,116,32,111,102,32,116,104,101,32,74,85,67,69,32,108,
-  105,98,114,97,114,121,32,45,32,34,74,117,108,101,115,39,32,85,116,105,108,105,116,121,32,67,108,97,115,115,32,69,120,116,101,110,115,105,111,110,
-  115,34,13,10,32,67,111,112,121,114,105,103,104,116,32,50,48,48,52,45,55,32,98,121,32,82,97,119,32,77,97,116,101,114,105,97,108,32,83,111,
-  102,116,119,97,114,101,32,108,116,100,46,13,10,32,13,10,32,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
+  61,61,61,61,13,10,13,10,32,32,32,84,104,105,115,32,102,105,108,101,32,105,115,32,112,97,114,116,32,111,102,32,116,104,101,32,74,85,67,69,
+  32,108,105,98,114,97,114,121,32,45,32,34,74,117,108,101,115,39,32,85,116,105,108,105,116,121,32,67,108,97,115,115,32,69,120,116,101,110,115,105,
+  111,110,115,34,13,10,32,32,32,67,111,112,121,114,105,103,104,116,32,50,48,48,52,45,55,32,98,121,32,82,97,119,32,77,97,116,101,114,105,97,
+  108,32,83,111,102,116,119,97,114,101,32,108,116,100,46,13,10,13,10,32,32,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
   45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
-  45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,13,10,32,13,10,32,74,85,67,69,32,99,97,110,32,98,101,32,114,101,100,105,115,116,114,
-  105,98,117,116,101,100,32,97,110,100,47,111,114,32,109,111,100,105,102,105,101,100,32,117,110,100,101,114,32,116,104,101,32,116,101,114,109,115,32,111,
-  102,32,116,104,101,13,10,32,71,78,85,32,71,101,110,101,114,97,108,32,80,117,98,108,105,99,32,76,105,99,101,110,115,101,44,32,97,115,32,112,
-  117,98,108,105,115,104,101,100,32,98,121,32,116,104,101,32,70,114,101,101,32,83,111,102,116,119,97,114,101,32,70,111,117,110,100,97,116,105,111,110,
-  59,13,10,32,101,105,116,104,101,114,32,118,101,114,115,105,111,110,32,50,32,111,102,32,116,104,101,32,76,105,99,101,110,115,101,44,32,111,114,32,
-  40,97,116,32,121,111,117,114,32,111,112,116,105,111,110,41,32,97,110,121,32,108,97,116,101,114,32,118,101,114,115,105,111,110,46,13,10,32,13,10,
-  32,74,85,67,69,32,105,115,32,100,105,115,116,114,105,98,117,116,101,100,32,105,110,32,116,104,101,32,104,111,112,101,32,116,104,97,116,32,105,116,
-  32,119,105,108,108,32,98,101,32,117,115,101,102,117,108,44,13,10,32,98,117,116,32,87,73,84,72,79,85,84,32,65,78,89,32,87,65,82,82,65,
-  78,84,89,59,32,119,105,116,104,111,117,116,32,101,118,101,110,32,116,104,101,32,105,109,112,108,105,101,100,32,119,97,114,114,97,110,116,121,32,111,
-  102,13,10,32,77,69,82,67,72,65,78,84,65,66,73,76,73,84,89,32,111,114,32,70,73,84,78,69,83,83,32,70,79,82,32,65,32,80,65,82,
-  84,73,67,85,76,65,82,32,80,85,82,80,79,83,69,46,32,32,83,101,101,32,116,104,101,13,10,32,71,78,85,32,71,101,110,101,114,97,108,32,
-  80,117,98,108,105,99,32,76,105,99,101,110,115,101,32,102,111,114,32,109,111,114,101,32,100,101,116,97,105,108,115,46,13,10,32,13,10,32,89,111,
-  117,32,115,104,111,117,108,100,32,104,97,118,101,32,114,101,99,101,105,118,101,100,32,97,32,99,111,112,121,32,111,102,32,116,104,101,32,71,78,85,
-  32,71,101,110,101,114,97,108,32,80,117,98,108,105,99,32,76,105,99,101,110,115,101,13,10,32,97,108,111,110,103,32,119,105,116,104,32,74,85,67,
-  69,59,32,105,102,32,110,111,116,44,32,118,105,115,105,116,32,119,119,119,46,103,110,117,46,111,114,103,47,108,105,99,101,110,115,101,115,32,111,114,
-  32,119,114,105,116,101,32,116,111,32,116,104,101,13,10,32,70,114,101,101,32,83,111,102,116,119,97,114,101,32,70,111,117,110,100,97,116,105,111,110,
-  44,32,73,110,99,46,44,32,53,57,32,84,101,109,112,108,101,32,80,108,97,99,101,44,32,83,117,105,116,101,32,51,51,48,44,13,10,32,66,111,
-  115,116,111,110,44,32,77,65,32,48,50,49,49,49,45,49,51,48,55,32,85,83,65,13,10,32,13,10,32,45,45,45,45,45,45,45,45,45,45,45,
+  45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,13,10,13,10,32,32,32,74,85,67,69,32,99,97,110,32,98,101,32,114,101,
+  100,105,115,116,114,105,98,117,116,101,100,32,97,110,100,47,111,114,32,109,111,100,105,102,105,101,100,32,117,110,100,101,114,32,116,104,101,32,116,101,
+  114,109,115,32,111,102,32,116,104,101,13,10,32,32,32,71,78,85,32,71,101,110,101,114,97,108,32,80,117,98,108,105,99,32,76,105,99,101,110,115,
+  101,44,32,97,115,32,112,117,98,108,105,115,104,101,100,32,98,121,32,116,104,101,32,70,114,101,101,32,83,111,102,116,119,97,114,101,32,70,111,117,
+  110,100,97,116,105,111,110,59,13,10,32,32,32,101,105,116,104,101,114,32,118,101,114,115,105,111,110,32,50,32,111,102,32,116,104,101,32,76,105,99,
+  101,110,115,101,44,32,111,114,32,40,97,116,32,121,111,117,114,32,111,112,116,105,111,110,41,32,97,110,121,32,108,97,116,101,114,32,118,101,114,115,
+  105,111,110,46,13,10,13,10,32,32,32,74,85,67,69,32,105,115,32,100,105,115,116,114,105,98,117,116,101,100,32,105,110,32,116,104,101,32,104,111,
+  112,101,32,116,104,97,116,32,105,116,32,119,105,108,108,32,98,101,32,117,115,101,102,117,108,44,13,10,32,32,32,98,117,116,32,87,73,84,72,79,
+  85,84,32,65,78,89,32,87,65,82,82,65,78,84,89,59,32,119,105,116,104,111,117,116,32,101,118,101,110,32,116,104,101,32,105,109,112,108,105,101,
+  100,32,119,97,114,114,97,110,116,121,32,111,102,13,10,32,32,32,77,69,82,67,72,65,78,84,65,66,73,76,73,84,89,32,111,114,32,70,73,84,
+  78,69,83,83,32,70,79,82,32,65,32,80,65,82,84,73,67,85,76,65,82,32,80,85,82,80,79,83,69,46,32,32,83,101,101,32,116,104,101,13,
+  10,32,32,32,71,78,85,32,71,101,110,101,114,97,108,32,80,117,98,108,105,99,32,76,105,99,101,110,115,101,32,102,111,114,32,109,111,114,101,32,
+  100,101,116,97,105,108,115,46,13,10,13,10,32,32,32,89,111,117,32,115,104,111,117,108,100,32,104,97,118,101,32,114,101,99,101,105,118,101,100,32,
+  97,32,99,111,112,121,32,111,102,32,116,104,101,32,71,78,85,32,71,101,110,101,114,97,108,32,80,117,98,108,105,99,32,76,105,99,101,110,115,101,
+  13,10,32,32,32,97,108,111,110,103,32,119,105,116,104,32,74,85,67,69,59,32,105,102,32,110,111,116,44,32,118,105,115,105,116,32,119,119,119,46,
+  103,110,117,46,111,114,103,47,108,105,99,101,110,115,101,115,32,111,114,32,119,114,105,116,101,32,116,111,32,116,104,101,13,10,32,32,32,70,114,101,
+  101,32,83,111,102,116,119,97,114,101,32,70,111,117,110,100,97,116,105,111,110,44,32,73,110,99,46,44,32,53,57,32,84,101,109,112,108,101,32,80,
+  108,97,99,101,44,32,83,117,105,116,101,32,51,51,48,44,13,10,32,32,32,66,111,115,116,111,110,44,32,77,65,32,48,50,49,49,49,45,49,51,
+  48,55,32,85,83,65,13,10,13,10,32,32,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
   45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,
-  45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,45,13,10,32,13,10,32,73,102,32,121,111,117,39,
-  100,32,108,105,107,101,32,116,111,32,114,101,108,101,97,115,101,32,97,32,99,108,111,115,101,100,45,115,111,117,114,99,101,32,112,114,111,100,117,99,
-  116,32,119,104,105,99,104,32,117,115,101,115,32,74,85,67,69,44,32,99,111,109,109,101,114,99,105,97,108,13,10,32,108,105,99,101,110,115,101,115,
-  32,97,114,101,32,97,108,115,111,32,97,118,97,105,108,97,98,108,101,58,32,118,105,115,105,116,32,119,119,119,46,114,97,119,109,97,116,101,114,105,
-  97,108,115,111,102,116,119,97,114,101,46,99,111,109,47,106,117,99,101,32,102,111,114,13,10,32,109,111,114,101,32,105,110,102,111,114,109,97,116,105,
-  111,110,46,13,10,32,13,10,32,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
-  61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
-  61,61,61,61,61,61,61,13,10,32,42,47,13,10,13,10,35,105,110,99,108,117,100,101,32,34,46,46,47,106,117,99,101,100,101,109,111,95,104,101,
-  97,100,101,114,115,46,104,34,13,10,13,10,35,105,102,32,74,85,67,69,95,87,69,66,95,66,82,79,87,83,69,82,13,10,13,10,47,47,61,61,
-  61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
-  61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,13,10,47,42,
-  42,32,87,101,39,108,108,32,117,115,101,32,97,32,115,117,98,99,108,97,115,115,32,111,102,32,87,101,98,66,114,111,119,115,101,114,67,111,109,112,
-  111,110,101,110,116,32,116,111,32,100,101,109,111,110,115,116,114,97,116,101,32,104,111,119,32,116,111,32,103,101,116,32,99,97,108,108,98,97,99,107,
-  115,13,10,32,32,32,32,119,104,101,110,32,116,104,101,32,98,114,111,119,115,101,114,32,99,104,97,110,103,101,115,32,85,82,76,46,32,89,111,117,
-  32,100,111,110,39,116,32,110,101,101,100,32,116,111,32,100,111,32,116,104,105,115,44,32,121,111,117,32,99,97,110,32,106,117,115,116,32,97,108,115,
-  111,13,10,32,32,32,32,106,117,115,116,32,117,115,101,32,116,104,101,32,87,101,98,66,114,111,119,115,101,114,67,111,109,112,111,110,101,110,116,32,
-  99,108,97,115,115,32,100,105,114,101,99,116,108,121,46,13,10,42,47,13,10,99,108,97,115,115,32,68,101,109,111,66,114,111,119,115,101,114,67,111,
-  109,112,111,110,101,110,116,32,32,58,32,112,117,98,108,105,99,32,87,101,98,66,114,111,119,115,101,114,67,111,109,112,111,110,101,110,116,13,10,123,
-  13,10,112,117,98,108,105,99,58,13,10,32,32,32,32,47,47,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
-  61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
-  61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,13,10,32,32,32,32,68,101,109,111,66,114,111,119,115,101,114,67,111,109,112,111,110,101,110,
-  116,32,40,84,101,120,116,69,100,105,116,111,114,42,32,97,100,100,114,101,115,115,84,101,120,116,66,111,120,95,41,13,10,32,32,32,32,32,32,32,
-  32,58,32,97,100,100,114,101,115,115,84,101,120,116,66,111,120,32,40,97,100,100,114,101,115,115,84,101,120,116,66,111,120,95,41,13,10,32,32,32,
-  32,123,13,10,32,32,32,32,125,13,10,13,10,32,32,32,32,47,47,32,84,104,105,115,32,109,101,116,104,111,100,32,103,101,116,115,32,99,97,108,
-  108,101,100,32,119,104,101,110,32,116,104,101,32,98,114,111,119,115,101,114,32,105,115,32,97,98,111,117,116,32,116,111,32,103,111,32,116,111,32,97,
-  32,110,101,119,32,85,82,76,46,46,13,10,32,32,32,32,98,111,111,108,32,112,97,103,101,65,98,111,117,116,84,111,76,111,97,100,32,40,99,111,
-  110,115,116,32,83,116,114,105,110,103,38,32,110,101,119,85,82,76,41,13,10,32,32,32,32,123,13,10,32,32,32,32,32,32,32,32,47,47,32,87,
-  101,39,108,108,32,106,117,115,116,32,117,112,100,97,116,101,32,111,117,114,32,97,100,100,114,101,115,115,32,98,111,120,32,116,111,32,114,101,102,108,
-  101,99,116,32,116,104,101,32,110,101,119,32,108,111,99,97,116,105,111,110,46,46,13,10,32,32,32,32,32,32,32,32,97,100,100,114,101,115,115,84,
-  101,120,116,66,111,120,45,62,115,101,116,84,101,120,116,32,40,110,101,119,85,82,76,44,32,102,97,108,115,101,41,59,13,10,13,10,32,32,32,32,
-  32,32,32,32,47,47,32,119,101,32,99,111,117,108,100,32,114,101,116,117,114,110,32,102,97,108,115,101,32,104,101,114,101,32,116,111,32,116,101,108,
-  108,32,116,104,101,32,98,114,111,119,115,101,114,32,110,111,116,32,116,111,32,103,111,32,97,104,101,97,100,32,119,105,116,104,13,10,32,32,32,32,
-  32,32,32,32,47,47,32,108,111,97,100,105,110,103,32,116,104,101,32,112,97,103,101,46,13,10,32,32,32,32,32,32,32,32,114,101,116,117,114,110,
-  32,116,114,117,101,59,13,10,32,32,32,32,125,13,10,13,10,32,32,32,32,47,47,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
-  61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
-  61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,13,10,32,32,32,32,106,117,99,101,95,85,115,101,68,101,98,117,103,
-  103,105,110,103,78,101,119,79,112,101,114,97,116,111,114,13,10,13,10,112,114,105,118,97,116,101,58,13,10,32,32,32,32,84,101,120,116,69,100,105,
-  116,111,114,42,32,97,100,100,114,101,115,115,84,101,120,116,66,111,120,59,13,10,13,10,32,32,32,32,68,101,109,111,66,114,111,119,115,101,114,67,
-  111,109,112,111,110,101,110,116,32,40,68,101,109,111,66,114,111,119,115,101,114,67,111,109,112,111,110,101,110,116,38,41,59,13,10,32,32,32,32,99,
-  111,110,115,116,32,68,101,109,111,66,114,111,119,115,101,114,67,111,109,112,111,110,101,110,116,38,32,111,112,101,114,97,116,111,114,61,32,40,99,111,
-  110,115,116,32,68,101,109,111,66,114,111,119,115,101,114,67,111,109,112,111,110,101,110,116,38,41,59,13,10,125,59,13,10,13,10,13,10,47,47,61,
+  45,45,45,45,45,45,45,45,45,45,13,10,13,10,32,32,32,73,102,32,121,111,117,39,100,32,108,105,107,101,32,116,111,32,114,101,108,101,97,115,
+  101,32,97,32,99,108,111,115,101,100,45,115,111,117,114,99,101,32,112,114,111,100,117,99,116,32,119,104,105,99,104,32,117,115,101,115,32,74,85,67,
+  69,44,32,99,111,109,109,101,114,99,105,97,108,13,10,32,32,32,108,105,99,101,110,115,101,115,32,97,114,101,32,97,108,115,111,32,97,118,97,105,
+  108,97,98,108,101,58,32,118,105,115,105,116,32,119,119,119,46,114,97,119,109,97,116,101,114,105,97,108,115,111,102,116,119,97,114,101,46,99,111,109,
+  47,106,117,99,101,32,102,111,114,13,10,32,32,32,109,111,114,101,32,105,110,102,111,114,109,97,116,105,111,110,46,13,10,13,10,32,32,61,61,61,
   61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
-  61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,13,10,99,
-  108,97,115,115,32,87,101,98,66,114,111,119,115,101,114,68,101,109,111,32,32,32,58,32,112,117,98,108,105,99,32,67,111,109,112,111,110,101,110,116,
-  44,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,112,117,98,108,105,99,32,84,101,120,116,69,
-  100,105,116,111,114,76,105,115,116,101,110,101,114,44,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,
-  32,112,117,98,108,105,99,32,66,117,116,116,111,110,76,105,115,116,101,110,101,114,13,10,123,13,10,112,117,98,108,105,99,58,13,10,32,32,32,32,
-  47,47,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
+  61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,13,10,42,47,13,
+  10,13,10,35,105,110,99,108,117,100,101,32,34,46,46,47,106,117,99,101,100,101,109,111,95,104,101,97,100,101,114,115,46,104,34,13,10,13,10,35,
+  105,102,32,74,85,67,69,95,87,69,66,95,66,82,79,87,83,69,82,13,10,13,10,47,47,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
+  61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
+  61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,13,10,47,42,42,32,87,101,39,108,108,32,117,115,101,32,97,
+  32,115,117,98,99,108,97,115,115,32,111,102,32,87,101,98,66,114,111,119,115,101,114,67,111,109,112,111,110,101,110,116,32,116,111,32,100,101,109,111,
+  110,115,116,114,97,116,101,32,104,111,119,32,116,111,32,103,101,116,32,99,97,108,108,98,97,99,107,115,13,10,32,32,32,32,119,104,101,110,32,116,
+  104,101,32,98,114,111,119,115,101,114,32,99,104,97,110,103,101,115,32,85,82,76,46,32,89,111,117,32,100,111,110,39,116,32,110,101,101,100,32,116,
+  111,32,100,111,32,116,104,105,115,44,32,121,111,117,32,99,97,110,32,106,117,115,116,32,97,108,115,111,13,10,32,32,32,32,106,117,115,116,32,117,
+  115,101,32,116,104,101,32,87,101,98,66,114,111,119,115,101,114,67,111,109,112,111,110,101,110,116,32,99,108,97,115,115,32,100,105,114,101,99,116,108,
+  121,46,13,10,42,47,13,10,99,108,97,115,115,32,68,101,109,111,66,114,111,119,115,101,114,67,111,109,112,111,110,101,110,116,32,32,58,32,112,117,
+  98,108,105,99,32,87,101,98,66,114,111,119,115,101,114,67,111,109,112,111,110,101,110,116,13,10,123,13,10,112,117,98,108,105,99,58,13,10,32,32,
+  32,32,47,47,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
+  61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
+  61,61,13,10,32,32,32,32,68,101,109,111,66,114,111,119,115,101,114,67,111,109,112,111,110,101,110,116,32,40,84,101,120,116,69,100,105,116,111,114,
+  42,32,97,100,100,114,101,115,115,84,101,120,116,66,111,120,95,41,13,10,32,32,32,32,32,32,32,32,58,32,97,100,100,114,101,115,115,84,101,120,
+  116,66,111,120,32,40,97,100,100,114,101,115,115,84,101,120,116,66,111,120,95,41,13,10,32,32,32,32,123,13,10,32,32,32,32,125,13,10,13,10,
+  32,32,32,32,47,47,32,84,104,105,115,32,109,101,116,104,111,100,32,103,101,116,115,32,99,97,108,108,101,100,32,119,104,101,110,32,116,104,101,32,
+  98,114,111,119,115,101,114,32,105,115,32,97,98,111,117,116,32,116,111,32,103,111,32,116,111,32,97,32,110,101,119,32,85,82,76,46,46,13,10,32,
+  32,32,32,98,111,111,108,32,112,97,103,101,65,98,111,117,116,84,111,76,111,97,100,32,40,99,111,110,115,116,32,83,116,114,105,110,103,38,32,110,
+  101,119,85,82,76,41,13,10,32,32,32,32,123,13,10,32,32,32,32,32,32,32,32,47,47,32,87,101,39,108,108,32,106,117,115,116,32,117,112,100,
+  97,116,101,32,111,117,114,32,97,100,100,114,101,115,115,32,98,111,120,32,116,111,32,114,101,102,108,101,99,116,32,116,104,101,32,110,101,119,32,108,
+  111,99,97,116,105,111,110,46,46,13,10,32,32,32,32,32,32,32,32,97,100,100,114,101,115,115,84,101,120,116,66,111,120,45,62,115,101,116,84,101,
+  120,116,32,40,110,101,119,85,82,76,44,32,102,97,108,115,101,41,59,13,10,13,10,32,32,32,32,32,32,32,32,47,47,32,119,101,32,99,111,117,
+  108,100,32,114,101,116,117,114,110,32,102,97,108,115,101,32,104,101,114,101,32,116,111,32,116,101,108,108,32,116,104,101,32,98,114,111,119,115,101,114,
+  32,110,111,116,32,116,111,32,103,111,32,97,104,101,97,100,32,119,105,116,104,13,10,32,32,32,32,32,32,32,32,47,47,32,108,111,97,100,105,110,
+  103,32,116,104,101,32,112,97,103,101,46,13,10,32,32,32,32,32,32,32,32,114,101,116,117,114,110,32,116,114,117,101,59,13,10,32,32,32,32,125,
+  13,10,13,10,32,32,32,32,47,47,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
+  61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
+  61,61,61,61,61,61,61,61,13,10,32,32,32,32,106,117,99,101,95,85,115,101,68,101,98,117,103,103,105,110,103,78,101,119,79,112,101,114,97,116,
+  111,114,13,10,13,10,112,114,105,118,97,116,101,58,13,10,32,32,32,32,84,101,120,116,69,100,105,116,111,114,42,32,97,100,100,114,101,115,115,84,
+  101,120,116,66,111,120,59,13,10,13,10,32,32,32,32,68,101,109,111,66,114,111,119,115,101,114,67,111,109,112,111,110,101,110,116,32,40,68,101,109,
+  111,66,114,111,119,115,101,114,67,111,109,112,111,110,101,110,116,38,41,59,13,10,32,32,32,32,99,111,110,115,116,32,68,101,109,111,66,114,111,119,
+  115,101,114,67,111,109,112,111,110,101,110,116,38,32,111,112,101,114,97,116,111,114,61,32,40,99,111,110,115,116,32,68,101,109,111,66,114,111,119,115,
+  101,114,67,111,109,112,111,110,101,110,116,38,41,59,13,10,125,59,13,10,13,10,13,10,47,47,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
+  61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
+  61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,13,10,99,108,97,115,115,32,87,101,98,66,114,111,119,115,
+  101,114,68,101,109,111,32,32,32,58,32,112,117,98,108,105,99,32,67,111,109,112,111,110,101,110,116,44,13,10,32,32,32,32,32,32,32,32,32,32,
+  32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,112,117,98,108,105,99,32,84,101,120,116,69,100,105,116,111,114,76,105,115,116,101,110,101,114,
+  44,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,112,117,98,108,105,99,32,66,117,116,116,111,
+  110,76,105,115,116,101,110,101,114,13,10,123,13,10,112,117,98,108,105,99,58,13,10,32,32,32,32,47,47,61,61,61,61,61,61,61,61,61,61,61,
+  61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
+  61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,13,10,32,32,32,32,87,101,98,66,114,111,119,
+  115,101,114,68,101,109,111,40,41,13,10,32,32,32,32,123,13,10,32,32,32,32,32,32,32,32,115,101,116,78,97,109,101,32,40,34,87,101,98,32,
+  66,114,111,119,115,101,114,34,41,59,13,10,13,10,32,32,32,32,32,32,32,32,47,47,32,67,114,101,97,116,101,32,97,110,32,97,100,100,114,101,
+  115,115,32,98,111,120,46,46,13,10,32,32,32,32,32,32,32,32,97,100,100,65,110,100,77,97,107,101,86,105,115,105,98,108,101,32,40,97,100,100,
+  114,101,115,115,84,101,120,116,66,111,120,32,61,32,110,101,119,32,84,101,120,116,69,100,105,116,111,114,40,41,41,59,13,10,32,32,32,32,32,32,
+  32,32,97,100,100,114,101,115,115,84,101,120,116,66,111,120,45,62,115,101,116,84,101,120,116,84,111,83,104,111,119,87,104,101,110,69,109,112,116,121,
+  32,40,34,69,110,116,101,114,32,97,32,119,101,98,32,97,100,100,114,101,115,115,44,32,101,46,103,46,32,104,116,116,112,58,47,47,119,119,119,46,
+  114,97,119,109,97,116,101,114,105,97,108,115,111,102,116,119,97,114,101,46,99,111,109,34,44,32,67,111,108,111,117,114,115,58,58,103,114,101,121,41,
+  59,13,10,32,32,32,32,32,32,32,32,97,100,100,114,101,115,115,84,101,120,116,66,111,120,45,62,97,100,100,76,105,115,116,101,110,101,114,32,40,
+  116,104,105,115,41,59,13,10,13,10,32,32,32,32,32,32,32,32,47,47,32,99,114,101,97,116,101,32,116,104,101,32,97,99,116,117,97,108,32,98,
+  114,111,119,115,101,114,32,99,111,109,112,111,110,101,110,116,13,10,32,32,32,32,32,32,32,32,97,100,100,65,110,100,77,97,107,101,86,105,115,105,
+  98,108,101,32,40,119,101,98,86,105,101,119,32,61,32,110,101,119,32,68,101,109,111,66,114,111,119,115,101,114,67,111,109,112,111,110,101,110,116,32,
+  40,97,100,100,114,101,115,115,84,101,120,116,66,111,120,41,41,59,13,10,13,10,32,32,32,32,32,32,32,32,47,47,32,97,100,100,32,115,111,109,
+  101,32,98,117,116,116,111,110,115,46,46,13,10,32,32,32,32,32,32,32,32,97,100,100,65,110,100,77,97,107,101,86,105,115,105,98,108,101,32,40,
+  103,111,66,117,116,116,111,110,32,61,32,110,101,119,32,84,101,120,116,66,117,116,116,111,110,32,40,34,71,111,34,44,32,34,71,111,32,116,111,32,
+  85,82,76,34,41,41,59,13,10,32,32,32,32,32,32,32,32,103,111,66,117,116,116,111,110,45,62,97,100,100,66,117,116,116,111,110,76,105,115,116,
+  101,110,101,114,32,40,116,104,105,115,41,59,13,10,32,32,32,32,32,32,32,32,97,100,100,65,110,100,77,97,107,101,86,105,115,105,98,108,101,32,
+  40,98,97,99,107,66,117,116,116,111,110,32,61,32,110,101,119,32,84,101,120,116,66,117,116,116,111,110,32,40,34,60,60,34,44,32,34,66,97,99,
+  107,34,41,41,59,13,10,32,32,32,32,32,32,32,32,98,97,99,107,66,117,116,116,111,110,45,62,97,100,100,66,117,116,116,111,110,76,105,115,116,
+  101,110,101,114,32,40,116,104,105,115,41,59,13,10,32,32,32,32,32,32,32,32,97,100,100,65,110,100,77,97,107,101,86,105,115,105,98,108,101,32,
+  40,102,111,114,119,97,114,100,66,117,116,116,111,110,32,61,32,110,101,119,32,84,101,120,116,66,117,116,116,111,110,32,40,34,62,62,34,44,32,34,
+  70,111,114,119,97,114,100,34,41,41,59,13,10,32,32,32,32,32,32,32,32,102,111,114,119,97,114,100,66,117,116,116,111,110,45,62,97,100,100,66,
+  117,116,116,111,110,76,105,115,116,101,110,101,114,32,40,116,104,105,115,41,59,13,10,13,10,32,32,32,32,32,32,32,32,47,47,32,115,101,110,100,
+  32,116,104,101,32,98,114,111,119,115,101,114,32,116,111,32,97,32,115,116,97,114,116,32,112,97,103,101,46,46,13,10,32,32,32,32,32,32,32,32,
+  119,101,98,86,105,101,119,45,62,103,111,84,111,85,82,76,32,40,34,104,116,116,112,58,47,47,119,119,119,46,103,111,111,103,108,101,46,99,111,109,
+  34,41,59,13,10,32,32,32,32,125,13,10,13,10,32,32,32,32,126,87,101,98,66,114,111,119,115,101,114,68,101,109,111,40,41,13,10,32,32,32,
+  32,123,13,10,32,32,32,32,32,32,32,32,100,101,108,101,116,101,65,108,108,67,104,105,108,100,114,101,110,40,41,59,13,10,32,32,32,32,125,13,
+  10,13,10,32,32,32,32,118,111,105,100,32,114,101,115,105,122,101,100,40,41,13,10,32,32,32,32,123,13,10,32,32,32,32,32,32,32,32,119,101,
+  98,86,105,101,119,45,62,115,101,116,66,111,117,110,100,115,32,40,49,48,44,32,52,53,44,32,103,101,116,87,105,100,116,104,40,41,32,45,32,50,
+  48,44,32,103,101,116,72,101,105,103,104,116,40,41,32,45,32,53,53,41,59,13,10,32,32,32,32,32,32,32,32,103,111,66,117,116,116,111,110,45,
+  62,115,101,116,66,111,117,110,100,115,32,40,103,101,116,87,105,100,116,104,40,41,32,45,32,52,53,44,32,49,48,44,32,51,53,44,32,50,53,41,
+  59,13,10,32,32,32,32,32,32,32,32,97,100,100,114,101,115,115,84,101,120,116,66,111,120,45,62,115,101,116,66,111,117,110,100,115,32,40,49,48,
+  48,44,32,49,48,44,32,103,101,116,87,105,100,116,104,40,41,32,45,32,49,53,53,44,32,50,53,41,59,13,10,32,32,32,32,32,32,32,32,98,
+  97,99,107,66,117,116,116,111,110,45,62,115,101,116,66,111,117,110,100,115,32,40,49,48,44,32,49,48,44,32,51,53,44,32,50,53,41,59,13,10,
+  32,32,32,32,32,32,32,32,102,111,114,119,97,114,100,66,117,116,116,111,110,45,62,115,101,116,66,111,117,110,100,115,32,40,53,53,44,32,49,48,
+  44,32,51,53,44,32,50,53,41,59,13,10,32,32,32,32,125,13,10,13,10,32,32,32,32,118,111,105,100,32,116,101,120,116,69,100,105,116,111,114,
+  84,101,120,116,67,104,97,110,103,101,100,32,40,84,101,120,116,69,100,105,116,111,114,38,32,101,100,105,116,111,114,41,32,32,32,32,32,32,32,32,
+  32,32,32,32,32,123,125,13,10,32,32,32,32,118,111,105,100,32,116,101,120,116,69,100,105,116,111,114,69,115,99,97,112,101,75,101,121,80,114,101,
+  115,115,101,100,32,40,84,101,120,116,69,100,105,116,111,114,38,32,101,100,105,116,111,114,41,32,32,32,32,32,32,32,32,123,125,13,10,32,32,32,
+  32,118,111,105,100,32,116,101,120,116,69,100,105,116,111,114,70,111,99,117,115,76,111,115,116,32,40,84,101,120,116,69,100,105,116,111,114,38,32,101,
+  100,105,116,111,114,41,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,123,125,13,10,13,10,32,32,32,32,118,111,105,100,32,116,101,120,116,
+  69,100,105,116,111,114,82,101,116,117,114,110,75,101,121,80,114,101,115,115,101,100,32,40,84,101,120,116,69,100,105,116,111,114,38,41,13,10,32,32,
+  32,32,123,13,10,32,32,32,32,32,32,32,32,119,101,98,86,105,101,119,45,62,103,111,84,111,85,82,76,32,40,97,100,100,114,101,115,115,84,101,
+  120,116,66,111,120,45,62,103,101,116,84,101,120,116,40,41,41,59,13,10,32,32,32,32,125,13,10,13,10,32,32,32,32,118,111,105,100,32,98,117,
+  116,116,111,110,67,108,105,99,107,101,100,32,40,66,117,116,116,111,110,42,32,98,41,13,10,32,32,32,32,123,13,10,32,32,32,32,32,32,32,32,
+  105,102,32,40,98,32,61,61,32,98,97,99,107,66,117,116,116,111,110,41,13,10,32,32,32,32,32,32,32,32,32,32,32,32,119,101,98,86,105,101,
+  119,45,62,103,111,66,97,99,107,40,41,59,13,10,32,32,32,32,32,32,32,32,101,108,115,101,32,105,102,32,40,98,32,61,61,32,102,111,114,119,
+  97,114,100,66,117,116,116,111,110,41,13,10,32,32,32,32,32,32,32,32,32,32,32,32,119,101,98,86,105,101,119,45,62,103,111,70,111,114,119,97,
+  114,100,40,41,59,13,10,32,32,32,32,32,32,32,32,101,108,115,101,32,105,102,32,40,98,32,61,61,32,103,111,66,117,116,116,111,110,41,13,10,
+  32,32,32,32,32,32,32,32,32,32,32,32,119,101,98,86,105,101,119,45,62,103,111,84,111,85,82,76,32,40,97,100,100,114,101,115,115,84,101,120,
+  116,66,111,120,45,62,103,101,116,84,101,120,116,40,41,41,59,13,10,32,32,32,32,125,13,10,13,10,32,32,32,32,106,117,99,101,95,85,115,101,
+  68,101,98,117,103,103,105,110,103,78,101,119,79,112,101,114,97,116,111,114,13,10,13,10,112,114,105,118,97,116,101,58,13,10,32,32,32,32,68,101,
+  109,111,66,114,111,119,115,101,114,67,111,109,112,111,110,101,110,116,42,32,119,101,98,86,105,101,119,59,13,10,13,10,32,32,32,32,84,101,120,116,
+  69,100,105,116,111,114,42,32,97,100,100,114,101,115,115,84,101,120,116,66,111,120,59,13,10,32,32,32,32,84,101,120,116,66,117,116,116,111,110,42,
+  32,103,111,66,117,116,116,111,110,59,13,10,32,32,32,32,84,101,120,116,66,117,116,116,111,110,42,32,98,97,99,107,66,117,116,116,111,110,59,13,
+  10,32,32,32,32,84,101,120,116,66,117,116,116,111,110,42,32,102,111,114,119,97,114,100,66,117,116,116,111,110,59,13,10,125,59,13,10,13,10,13,
+  10,47,47,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
   61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
-  13,10,32,32,32,32,87,101,98,66,114,111,119,115,101,114,68,101,109,111,40,41,13,10,32,32,32,32,123,13,10,32,32,32,32,32,32,32,32,115,
-  101,116,78,97,109,101,32,40,34,87,101,98,32,66,114,111,119,115,101,114,34,41,59,13,10,13,10,32,32,32,32,32,32,32,32,47,47,32,67,114,
-  101,97,116,101,32,97,110,32,97,100,100,114,101,115,115,32,98,111,120,46,46,13,10,32,32,32,32,32,32,32,32,97,100,100,65,110,100,77,97,107,
-  101,86,105,115,105,98,108,101,32,40,97,100,100,114,101,115,115,84,101,120,116,66,111,120,32,61,32,110,101,119,32,84,101,120,116,69,100,105,116,111,
-  114,40,41,41,59,13,10,32,32,32,32,32,32,32,32,97,100,100,114,101,115,115,84,101,120,116,66,111,120,45,62,115,101,116,84,101,120,116,84,111,
-  83,104,111,119,87,104,101,110,69,109,112,116,121,32,40,34,69,110,116,101,114,32,97,32,119,101,98,32,97,100,100,114,101,115,115,44,32,101,46,103,
-  46,32,104,116,116,112,58,47,47,119,119,119,46,114,97,119,109,97,116,101,114,105,97,108,115,111,102,116,119,97,114,101,46,99,111,109,34,44,32,67,
-  111,108,111,117,114,115,58,58,103,114,101,121,41,59,13,10,32,32,32,32,32,32,32,32,97,100,100,114,101,115,115,84,101,120,116,66,111,120,45,62,
-  97,100,100,76,105,115,116,101,110,101,114,32,40,116,104,105,115,41,59,13,10,13,10,32,32,32,32,32,32,32,32,47,47,32,99,114,101,97,116,101,
-  32,116,104,101,32,97,99,116,117,97,108,32,98,114,111,119,115,101,114,32,99,111,109,112,111,110,101,110,116,13,10,32,32,32,32,32,32,32,32,97,
-  100,100,65,110,100,77,97,107,101,86,105,115,105,98,108,101,32,40,119,101,98,86,105,101,119,32,61,32,110,101,119,32,68,101,109,111,66,114,111,119,
-  115,101,114,67,111,109,112,111,110,101,110,116,32,40,97,100,100,114,101,115,115,84,101,120,116,66,111,120,41,41,59,13,10,13,10,32,32,32,32,32,
-  32,32,32,47,47,32,97,100,100,32,115,111,109,101,32,98,117,116,116,111,110,115,46,46,13,10,32,32,32,32,32,32,32,32,97,100,100,65,110,100,
-  77,97,107,101,86,105,115,105,98,108,101,32,40,103,111,66,117,116,116,111,110,32,61,32,110,101,119,32,84,101,120,116,66,117,116,116,111,110,32,40,
-  34,71,111,34,44,32,34,71,111,32,116,111,32,85,82,76,34,41,41,59,13,10,32,32,32,32,32,32,32,32,103,111,66,117,116,116,111,110,45,62,
-  97,100,100,66,117,116,116,111,110,76,105,115,116,101,110,101,114,32,40,116,104,105,115,41,59,13,10,32,32,32,32,32,32,32,32,97,100,100,65,110,
-  100,77,97,107,101,86,105,115,105,98,108,101,32,40,98,97,99,107,66,117,116,116,111,110,32,61,32,110,101,119,32,84,101,120,116,66,117,116,116,111,
-  110,32,40,34,60,60,34,44,32,34,66,97,99,107,34,41,41,59,13,10,32,32,32,32,32,32,32,32,98,97,99,107,66,117,116,116,111,110,45,62,
-  97,100,100,66,117,116,116,111,110,76,105,115,116,101,110,101,114,32,40,116,104,105,115,41,59,13,10,32,32,32,32,32,32,32,32,97,100,100,65,110,
-  100,77,97,107,101,86,105,115,105,98,108,101,32,40,102,111,114,119,97,114,100,66,117,116,116,111,110,32,61,32,110,101,119,32,84,101,120,116,66,117,
-  116,116,111,110,32,40,34,62,62,34,44,32,34,70,111,114,119,97,114,100,34,41,41,59,13,10,32,32,32,32,32,32,32,32,102,111,114,119,97,114,
-  100,66,117,116,116,111,110,45,62,97,100,100,66,117,116,116,111,110,76,105,115,116,101,110,101,114,32,40,116,104,105,115,41,59,13,10,13,10,32,32,
-  32,32,32,32,32,32,47,47,32,115,101,110,100,32,116,104,101,32,98,114,111,119,115,101,114,32,116,111,32,97,32,115,116,97,114,116,32,112,97,103,
-  101,46,46,13,10,32,32,32,32,32,32,32,32,119,101,98,86,105,101,119,45,62,103,111,84,111,85,82,76,32,40,34,104,116,116,112,58,47,47,119,
-  119,119,46,103,111,111,103,108,101,46,99,111,109,34,41,59,13,10,32,32,32,32,125,13,10,13,10,32,32,32,32,126,87,101,98,66,114,111,119,115,
-  101,114,68,101,109,111,40,41,13,10,32,32,32,32,123,13,10,32,32,32,32,32,32,32,32,100,101,108,101,116,101,65,108,108,67,104,105,108,100,114,
-  101,110,40,41,59,13,10,32,32,32,32,125,13,10,13,10,32,32,32,32,118,111,105,100,32,114,101,115,105,122,101,100,40,41,13,10,32,32,32,32,
-  123,13,10,32,32,32,32,32,32,32,32,119,101,98,86,105,101,119,45,62,115,101,116,66,111,117,110,100,115,32,40,49,48,44,32,52,53,44,32,103,
-  101,116,87,105,100,116,104,40,41,32,45,32,50,48,44,32,103,101,116,72,101,105,103,104,116,40,41,32,45,32,53,53,41,59,13,10,32,32,32,32,
-  32,32,32,32,103,111,66,117,116,116,111,110,45,62,115,101,116,66,111,117,110,100,115,32,40,103,101,116,87,105,100,116,104,40,41,32,45,32,52,53,
-  44,32,49,48,44,32,51,53,44,32,50,53,41,59,13,10,32,32,32,32,32,32,32,32,97,100,100,114,101,115,115,84,101,120,116,66,111,120,45,62,
-  115,101,116,66,111,117,110,100,115,32,40,49,48,48,44,32,49,48,44,32,103,101,116,87,105,100,116,104,40,41,32,45,32,49,53,53,44,32,50,53,
-  41,59,13,10,32,32,32,32,32,32,32,32,98,97,99,107,66,117,116,116,111,110,45,62,115,101,116,66,111,117,110,100,115,32,40,49,48,44,32,49,
-  48,44,32,51,53,44,32,50,53,41,59,13,10,32,32,32,32,32,32,32,32,102,111,114,119,97,114,100,66,117,116,116,111,110,45,62,115,101,116,66,
-  111,117,110,100,115,32,40,53,53,44,32,49,48,44,32,51,53,44,32,50,53,41,59,13,10,32,32,32,32,125,13,10,13,10,32,32,32,32,118,111,
-  105,100,32,116,101,120,116,69,100,105,116,111,114,84,101,120,116,67,104,97,110,103,101,100,32,40,84,101,120,116,69,100,105,116,111,114,38,32,101,100,
-  105,116,111,114,41,32,32,32,32,32,32,32,32,32,32,32,32,32,123,125,13,10,32,32,32,32,118,111,105,100,32,116,101,120,116,69,100,105,116,111,
-  114,69,115,99,97,112,101,75,101,121,80,114,101,115,115,101,100,32,40,84,101,120,116,69,100,105,116,111,114,38,32,101,100,105,116,111,114,41,32,32,
-  32,32,32,32,32,32,123,125,13,10,32,32,32,32,118,111,105,100,32,116,101,120,116,69,100,105,116,111,114,70,111,99,117,115,76,111,115,116,32,40,
-  84,101,120,116,69,100,105,116,111,114,38,32,101,100,105,116,111,114,41,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,123,125,13,10,32,32,
-  32,32,13,10,32,32,32,32,118,111,105,100,32,116,101,120,116,69,100,105,116,111,114,82,101,116,117,114,110,75,101,121,80,114,101,115,115,101,100,32,
-  40,84,101,120,116,69,100,105,116,111,114,38,41,13,10,32,32,32,32,123,13,10,32,32,32,32,32,32,32,32,119,101,98,86,105,101,119,45,62,103,
-  111,84,111,85,82,76,32,40,97,100,100,114,101,115,115,84,101,120,116,66,111,120,45,62,103,101,116,84,101,120,116,40,41,41,59,13,10,32,32,32,
-  32,125,13,10,13,10,32,32,32,32,118,111,105,100,32,98,117,116,116,111,110,67,108,105,99,107,101,100,32,40,66,117,116,116,111,110,42,32,98,41,
-  13,10,32,32,32,32,123,13,10,32,32,32,32,32,32,32,32,105,102,32,40,98,32,61,61,32,98,97,99,107,66,117,116,116,111,110,41,13,10,32,
-  32,32,32,32,32,32,32,32,32,32,32,119,101,98,86,105,101,119,45,62,103,111,66,97,99,107,40,41,59,13,10,32,32,32,32,32,32,32,32,101,
-  108,115,101,32,105,102,32,40,98,32,61,61,32,102,111,114,119,97,114,100,66,117,116,116,111,110,41,13,10,32,32,32,32,32,32,32,32,32,32,32,
-  32,119,101,98,86,105,101,119,45,62,103,111,70,111,114,119,97,114,100,40,41,59,13,10,32,32,32,32,32,32,32,32,101,108,115,101,32,105,102,32,
-  40,98,32,61,61,32,103,111,66,117,116,116,111,110,41,13,10,32,32,32,32,32,32,32,32,32,32,32,32,119,101,98,86,105,101,119,45,62,103,111,
-  84,111,85,82,76,32,40,97,100,100,114,101,115,115,84,101,120,116,66,111,120,45,62,103,101,116,84,101,120,116,40,41,41,59,13,10,32,32,32,32,
-  125,13,10,13,10,32,32,32,32,106,117,99,101,95,85,115,101,68,101,98,117,103,103,105,110,103,78,101,119,79,112,101,114,97,116,111,114,13,10,13,
-  10,112,114,105,118,97,116,101,58,13,10,32,32,32,32,68,101,109,111,66,114,111,119,115,101,114,67,111,109,112,111,110,101,110,116,42,32,119,101,98,
-  86,105,101,119,59,13,10,13,10,32,32,32,32,84,101,120,116,69,100,105,116,111,114,42,32,97,100,100,114,101,115,115,84,101,120,116,66,111,120,59,
-  13,10,32,32,32,32,84,101,120,116,66,117,116,116,111,110,42,32,103,111,66,117,116,116,111,110,59,13,10,32,32,32,32,84,101,120,116,66,117,116,
-  116,111,110,42,32,98,97,99,107,66,117,116,116,111,110,59,13,10,32,32,32,32,84,101,120,116,66,117,116,116,111,110,42,32,102,111,114,119,97,114,
-  100,66,117,116,116,111,110,59,13,10,125,59,13,10,13,10,13,10,47,47,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
-  61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
-  61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,13,10,67,111,109,112,111,110,101,110,116,42,32,99,114,101,97,116,101,87,101,98,
-  66,114,111,119,115,101,114,68,101,109,111,40,41,13,10,123,13,10,32,32,32,32,114,101,116,117,114,110,32,110,101,119,32,87,101,98,66,114,111,119,
-  115,101,114,68,101,109,111,40,41,59,13,10,125,13,10,13,10,35,101,110,100,105,102,13,10,0,0};
+  61,13,10,67,111,109,112,111,110,101,110,116,42,32,99,114,101,97,116,101,87,101,98,66,114,111,119,115,101,114,68,101,109,111,40,41,13,10,123,13,
+  10,32,32,32,32,114,101,116,117,114,110,32,110,101,119,32,87,101,98,66,114,111,119,115,101,114,68,101,109,111,40,41,59,13,10,125,13,10,13,10,
+  35,101,110,100,105,102,13,10,0,0};
 const char* BinaryData::webbrowserdemo_cpp = (const char*) temp5;
 
 static const unsigned char temp6[] = {80,75,3,4,20,0,2,0,8,0,128,122,250,52,23,17,234,255,206,13,0,0,219,67,0,0,16,0,0,0,100,111,99,117,109,101,110,116,45,110,
@@ -6051,16 +6052,7 @@ static const unsigned char temp9[] = {47,42,13,10,32,32,61,61,61,61,61,61,61,61,
   10,125,13,10,0,0};
 const char* BinaryData::threadingdemo_cpp = (const char*) temp9;
 
-static const unsigned char temp10[] = {13,10,70,89,73,46,46,13,10,13,10,84,111,32,101,109,98,101,100,32,116,104,101,32,102,105,108,101,115,32,97,110,100,32,116,104,105,110,103,115,
-  32,116,104,97,116,32,116,104,101,32,100,101,109,111,32,110,101,101,100,115,32,105,110,116,111,32,105,116,115,32,101,120,101,99,117,116,97,98,108,101,
-  44,32,13,10,73,39,118,101,32,117,115,101,100,32,109,121,32,66,105,110,97,114,121,66,117,105,108,100,101,114,32,117,116,105,108,105,116,121,32,45,
-  32,116,104,101,32,102,105,108,101,115,32,105,110,32,116,104,105,115,32,100,105,114,101,99,116,111,114,121,32,97,114,101,32,116,104,101,13,10,111,110,
-  101,115,32,116,104,97,116,32,103,101,116,32,101,110,99,111,100,101,100,32,105,110,116,111,32,66,105,110,97,114,121,68,97,116,97,46,99,112,112,32,
-  97,110,100,32,66,105,110,97,114,121,68,97,116,97,46,104,44,32,119,104,105,99,104,32,103,101,116,32,98,117,105,108,116,32,13,10,105,110,116,111,
-  32,116,104,101,32,97,112,112,108,105,99,97,116,105,111,110,46,13,10,0,0};
-const char* BinaryData::readme__what_this_directory_is_for_txt = (const char*) temp10;
-
-static const unsigned char temp11[] = {47,42,13,10,32,32,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
+static const unsigned char temp10[] = {47,42,13,10,32,32,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
   61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
   61,61,61,61,13,10,13,10,32,32,32,84,104,105,115,32,102,105,108,101,32,105,115,32,112,97,114,116,32,111,102,32,116,104,101,32,74,85,67,69,
   32,108,105,98,114,97,114,121,32,45,32,34,74,117,108,101,115,39,32,85,116,105,108,105,116,121,32,67,108,97,115,115,32,69,120,116,101,110,115,105,
@@ -6650,40 +6642,9 @@ static const unsigned char temp11[] = {47,42,13,10,32,32,61,61,61,61,61,61,61,61
   61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
   61,61,61,13,10,67,111,109,112,111,110,101,110,116,42,32,99,114,101,97,116,101,65,117,100,105,111,68,101,109,111,40,41,13,10,123,13,10,32,32,
   32,32,114,101,116,117,114,110,32,110,101,119,32,65,117,100,105,111,68,101,109,111,40,41,59,13,10,125,13,10,0,0};
-const char* BinaryData::audiodemo_cpp = (const char*) temp11;
-
-static const unsigned char temp12[] = {60,116,114,101,101,62,13,10,32,32,32,32,60,105,116,101,109,49,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,32,99,111,
-  108,111,117,114,61,34,102,102,102,102,48,48,48,48,34,32,119,105,100,116,104,61,34,56,48,48,34,32,47,62,13,10,32,32,32,32,32,32,32,32,
-  60,115,117,98,110,111,100,101,32,99,111,108,111,117,114,61,34,102,102,51,51,98,98,48,48,34,32,119,105,100,116,104,61,34,53,48,34,32,47,62,
-  13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,32,99,111,108,111,117,114,61,34,51,51,48,48,48,48,48,48,34,32,47,62,13,
-  10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,32,119,105,100,116,104,61,34,49,48,48,34,32,47,62,13,10,32,32,32,32,32,32,
-  32,32,60,115,117,98,110,111,100,101,32,99,111,108,111,117,114,61,34,102,102,56,56,54,54,101,101,34,32,47,62,13,10,32,32,32,32,32,32,32,
-  32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,32,99,111,108,111,117,114,61,34,51,51,
-  48,48,48,48,48,48,34,32,47,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,
-  60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,60,47,105,116,101,109,49,62,13,10,13,10,32,32,32,32,60,105,116,101,109,50,32,99,
-  111,108,111,117,114,61,34,102,102,55,55,55,55,55,55,34,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,
-  32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,
-  32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,32,119,105,100,116,
-  104,61,34,56,48,48,34,47,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,32,119,105,100,116,104,61,34,56,48,48,34,47,
-  62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,
-  62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,60,105,116,101,109,51,62,13,10,
-  32,32,32,32,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,62,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,
-  115,117,98,110,111,100,101,32,119,105,100,116,104,61,34,53,48,34,47,62,13,10,32,32,32,32,32,32,32,32,32,32,32,32,60,47,115,117,98,110,
-  111,100,101,62,13,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,32,32,
-  32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,
-  32,32,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,117,98,110,111,
-  100,101,47,62,13,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,32,32,
-  32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,
-  32,32,32,32,32,32,60,47,105,116,101,109,51,62,13,10,32,32,32,32,60,47,105,116,101,109,50,62,13,10,13,10,32,32,32,32,60,105,116,101,
-  109,52,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,
-  101,47,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,
-  101,47,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,
-  101,47,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,
-  101,47,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,60,47,105,116,101,109,52,62,13,10,60,
-  47,116,114,101,101,62,0,0};
-const char* BinaryData::treedemo_xml = (const char*) temp12;
+const char* BinaryData::audiodemo_cpp = (const char*) temp10;
 
-static const unsigned char temp13[] = {47,42,13,10,32,32,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
+static const unsigned char temp11[] = {47,42,13,10,32,32,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
   61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
   61,61,61,61,13,10,13,10,32,32,32,84,104,105,115,32,102,105,108,101,32,105,115,32,112,97,114,116,32,111,102,32,116,104,101,32,74,85,67,69,
   32,108,105,98,114,97,114,121,32,45,32,34,74,117,108,101,115,39,32,85,116,105,108,105,116,121,32,67,108,97,115,115,32,69,120,116,101,110,115,105,
@@ -6923,9 +6884,18 @@ static const unsigned char temp13[] = {47,42,13,10,32,32,61,61,61,61,61,61,61,61
   61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,13,10,67,111,109,112,111,110,101,110,116,42,32,99,114,101,97,116,101,79,112,101,110,71,
   76,68,101,109,111,40,41,13,10,123,13,10,32,32,32,32,114,101,116,117,114,110,32,110,101,119,32,79,112,101,110,71,76,68,101,109,111,40,41,59,
   13,10,125,13,10,13,10,35,101,110,100,105,102,13,10,0,0};
-const char* BinaryData::opengldemo_cpp = (const char*) temp13;
+const char* BinaryData::opengldemo_cpp = (const char*) temp11;
+
+static const unsigned char temp12[] = {13,10,70,89,73,46,46,13,10,13,10,84,111,32,101,109,98,101,100,32,116,104,101,32,102,105,108,101,115,32,97,110,100,32,116,104,105,110,103,115,
+  32,116,104,97,116,32,116,104,101,32,100,101,109,111,32,110,101,101,100,115,32,105,110,116,111,32,105,116,115,32,101,120,101,99,117,116,97,98,108,101,
+  44,32,13,10,73,39,118,101,32,117,115,101,100,32,109,121,32,66,105,110,97,114,121,66,117,105,108,100,101,114,32,117,116,105,108,105,116,121,32,45,
+  32,116,104,101,32,102,105,108,101,115,32,105,110,32,116,104,105,115,32,100,105,114,101,99,116,111,114,121,32,97,114,101,32,116,104,101,13,10,111,110,
+  101,115,32,116,104,97,116,32,103,101,116,32,101,110,99,111,100,101,100,32,105,110,116,111,32,66,105,110,97,114,121,68,97,116,97,46,99,112,112,32,
+  97,110,100,32,66,105,110,97,114,121,68,97,116,97,46,104,44,32,119,104,105,99,104,32,103,101,116,32,98,117,105,108,116,32,13,10,105,110,116,111,
+  32,116,104,101,32,97,112,112,108,105,99,97,116,105,111,110,46,13,10,0,0};
+const char* BinaryData::readme__what_this_directory_is_for_txt = (const char*) temp12;
 
-static const unsigned char temp14[] = {47,42,13,10,32,32,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
+static const unsigned char temp13[] = {47,42,13,10,32,32,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
   61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
   61,61,61,61,13,10,13,10,32,32,32,84,104,105,115,32,102,105,108,101,32,105,115,32,112,97,114,116,32,111,102,32,116,104,101,32,74,85,67,69,
   32,108,105,98,114,97,114,121,32,45,32,34,74,117,108,101,115,39,32,85,116,105,108,105,116,121,32,67,108,97,115,115,32,69,120,116,101,110,115,105,
@@ -7281,7 +7251,38 @@ static const unsigned char temp14[] = {47,42,13,10,32,32,61,61,61,61,61,61,61,61
   101,40,41,41,59,13,10,32,32,32,32,125,13,10,125,59,13,10,13,10,67,111,109,112,111,110,101,110,116,42,32,99,114,101,97,116,101,80,97,116,
   104,115,65,110,100,84,114,97,110,115,102,111,114,109,115,68,101,109,111,40,41,13,10,123,13,10,32,32,32,32,114,101,116,117,114,110,32,110,101,119,
   32,80,97,116,104,115,65,110,100,84,114,97,110,115,102,111,114,109,115,68,101,109,111,40,41,59,13,10,125,13,10,0,0};
-const char* BinaryData::pathsandtransformsdemo_cpp = (const char*) temp14;
+const char* BinaryData::pathsandtransformsdemo_cpp = (const char*) temp13;
+
+static const unsigned char temp14[] = {60,116,114,101,101,62,13,10,32,32,32,32,60,105,116,101,109,49,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,32,99,111,
+  108,111,117,114,61,34,102,102,102,102,48,48,48,48,34,32,119,105,100,116,104,61,34,56,48,48,34,32,47,62,13,10,32,32,32,32,32,32,32,32,
+  60,115,117,98,110,111,100,101,32,99,111,108,111,117,114,61,34,102,102,51,51,98,98,48,48,34,32,119,105,100,116,104,61,34,53,48,34,32,47,62,
+  13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,32,99,111,108,111,117,114,61,34,51,51,48,48,48,48,48,48,34,32,47,62,13,
+  10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,32,119,105,100,116,104,61,34,49,48,48,34,32,47,62,13,10,32,32,32,32,32,32,
+  32,32,60,115,117,98,110,111,100,101,32,99,111,108,111,117,114,61,34,102,102,56,56,54,54,101,101,34,32,47,62,13,10,32,32,32,32,32,32,32,
+  32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,32,99,111,108,111,117,114,61,34,51,51,
+  48,48,48,48,48,48,34,32,47,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,
+  60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,60,47,105,116,101,109,49,62,13,10,13,10,32,32,32,32,60,105,116,101,109,50,32,99,
+  111,108,111,117,114,61,34,102,102,55,55,55,55,55,55,34,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,
+  32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,
+  32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,32,119,105,100,116,
+  104,61,34,56,48,48,34,47,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,32,119,105,100,116,104,61,34,56,48,48,34,47,
+  62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,
+  62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,60,105,116,101,109,51,62,13,10,
+  32,32,32,32,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,62,13,10,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,32,60,
+  115,117,98,110,111,100,101,32,119,105,100,116,104,61,34,53,48,34,47,62,13,10,32,32,32,32,32,32,32,32,32,32,32,32,60,47,115,117,98,110,
+  111,100,101,62,13,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,32,32,
+  32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,
+  32,32,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,117,98,110,111,
+  100,101,47,62,13,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,32,32,
+  32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,
+  32,32,32,32,32,32,60,47,105,116,101,109,51,62,13,10,32,32,32,32,60,47,105,116,101,109,50,62,13,10,13,10,32,32,32,32,60,105,116,101,
+  109,52,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,
+  101,47,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,
+  101,47,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,
+  101,47,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,
+  101,47,62,13,10,32,32,32,32,32,32,32,32,60,115,117,98,110,111,100,101,47,62,13,10,32,32,32,32,60,47,105,116,101,109,52,62,13,10,60,
+  47,116,114,101,101,62,0,0};
+const char* BinaryData::treedemo_xml = (const char*) temp14;
 
 static const unsigned char temp15[] = {47,42,13,10,32,32,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
   61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,61,
@@ -8334,4 +8335,3 @@ static const unsigned char temp19[] = {47,42,13,10,32,32,61,61,61,61,61,61,61,61
   13,10,123,13,10,32,32,32,32,114,101,116,117,114,110,32,110,101,119,32,67,97,109,101,114,97,68,101,109,111,40,41,59,13,10,125,13,10,13,10,
   35,101,110,100,105,102,13,10,0,0};
 const char* BinaryData::camerademo_cpp = (const char*) temp19;
-

extras/juce demo/src/BinaryData.h

@@ -18,7 +18,7 @@ namespace BinaryData
     const int           treeviewdemo_cppSize = 8715;
 
     extern const char*  webbrowserdemo_cpp;
-    const int           webbrowserdemo_cppSize = 5385;
+    const int           webbrowserdemo_cppSize = 5408;
 
     extern const char*  icons_zip;
     const int           icons_zipSize = 83876;
@@ -32,21 +32,21 @@ namespace BinaryData
     extern const char*  threadingdemo_cpp;
     const int           threadingdemo_cppSize = 10484;
 
-    extern const char*  readme__what_this_directory_is_for_txt;
-    const int           readme__what_this_directory_is_for_txtSize = 259;
-
     extern const char*  audiodemo_cpp;
     const int           audiodemo_cppSize = 23590;
 
-    extern const char*  treedemo_xml;
-    const int           treedemo_xmlSize = 1126;
-
     extern const char*  opengldemo_cpp;
     const int           opengldemo_cppSize = 9575;
 
+    extern const char*  readme__what_this_directory_is_for_txt;
+    const int           readme__what_this_directory_is_for_txtSize = 259;
+
     extern const char*  pathsandtransformsdemo_cpp;
     const int           pathsandtransformsdemo_cppSize = 14231;
 
+    extern const char*  treedemo_xml;
+    const int           treedemo_xmlSize = 1126;
+
     extern const char*  quicktimedemo_cpp;
     const int           quicktimedemo_cppSize = 4576;
 

extras/juce demo/src/binarydata/WebBrowserDemo.cpp

@@ -1,33 +1,33 @@
 /*
- ==============================================================================
- 
- This file is part of the JUCE library - "Jules' Utility Class Extensions"
- Copyright 2004-7 by Raw Material Software ltd.
- 
- ------------------------------------------------------------------------------
- 
- JUCE can be redistributed and/or modified under the terms of the
- GNU General Public License, as published by the Free Software Foundation;
- either version 2 of the License, or (at your option) any later version.
- 
- JUCE is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License
- along with JUCE; if not, visit www.gnu.org/licenses or write to the
- Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- Boston, MA 02111-1307 USA
- 
- ------------------------------------------------------------------------------
- 
- If you'd like to release a closed-source product which uses JUCE, commercial
- licenses are also available: visit www.rawmaterialsoftware.com/juce for
- more information.
- 
- ==============================================================================
- */
+  ==============================================================================
+
+   This file is part of the JUCE library - "Jules' Utility Class Extensions"
+   Copyright 2004-7 by Raw Material Software ltd.
+
+  ------------------------------------------------------------------------------
+
+   JUCE can be redistributed and/or modified under the terms of the
+   GNU General Public License, as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later version.
+
+   JUCE is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with JUCE; if not, visit www.gnu.org/licenses or write to the
+   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+   Boston, MA 02111-1307 USA
+
+  ------------------------------------------------------------------------------
+
+   If you'd like to release a closed-source product which uses JUCE, commercial
+   licenses are also available: visit www.rawmaterialsoftware.com/juce for
+   more information.
+
+  ==============================================================================
+*/
 
 #include "../jucedemo_headers.h"
 
@@ -117,7 +117,7 @@ public:
     void textEditorTextChanged (TextEditor& editor)             {}
     void textEditorEscapeKeyPressed (TextEditor& editor)        {}
     void textEditorFocusLost (TextEditor& editor)               {}
-    
+
     void textEditorReturnKeyPressed (TextEditor&)
     {
         webView->goToURL (addressTextBox->getText());

extras/juce demo/src/demos/WebBrowserDemo.cpp

@@ -1,33 +1,33 @@
 /*
- ==============================================================================
- 
- This file is part of the JUCE library - "Jules' Utility Class Extensions"
- Copyright 2004-7 by Raw Material Software ltd.
- 
- ------------------------------------------------------------------------------
- 
- JUCE can be redistributed and/or modified under the terms of the
- GNU General Public License, as published by the Free Software Foundation;
- either version 2 of the License, or (at your option) any later version.
- 
- JUCE is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- 
- You should have received a copy of the GNU General Public License
- along with JUCE; if not, visit www.gnu.org/licenses or write to the
- Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- Boston, MA 02111-1307 USA
- 
- ------------------------------------------------------------------------------
- 
- If you'd like to release a closed-source product which uses JUCE, commercial
- licenses are also available: visit www.rawmaterialsoftware.com/juce for
- more information.
- 
- ==============================================================================
- */
+  ==============================================================================
+
+   This file is part of the JUCE library - "Jules' Utility Class Extensions"
+   Copyright 2004-7 by Raw Material Software ltd.
+
+  ------------------------------------------------------------------------------
+
+   JUCE can be redistributed and/or modified under the terms of the
+   GNU General Public License, as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later version.
+
+   JUCE is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with JUCE; if not, visit www.gnu.org/licenses or write to the
+   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+   Boston, MA 02111-1307 USA
+
+  ------------------------------------------------------------------------------
+
+   If you'd like to release a closed-source product which uses JUCE, commercial
+   licenses are also available: visit www.rawmaterialsoftware.com/juce for
+   more information.
+
+  ==============================================================================
+*/
 
 #include "../jucedemo_headers.h"
 
@@ -117,7 +117,7 @@ public:
     void textEditorTextChanged (TextEditor& editor)             {}
     void textEditorEscapeKeyPressed (TextEditor& editor)        {}
     void textEditorFocusLost (TextEditor& editor)               {}
-    
+
     void textEditorReturnKeyPressed (TextEditor&)
     {
         webView->goToURL (addressTextBox->getText());

extras/juce demo/src/juce_AppConfig.h

@@ -31,10 +31,17 @@
 
 /*
     This file contains settings that you might want to explicitly apply to
-    the your build.
+    your Juce build.
 
-    Most of these are turned on or off by default, but you can override
-    that setting here by un-commenting it and giving it a 1 or 0 value.
+    These flags enable or disable juce features - if you're linking to juce as
+    a library, then to change them, you'd need to alter your juce_Config.h file and
+    recompile the juce lib. But because we're using the amalgamated file, you can
+    just include this file before including your juce_amalgamated.cpp file to
+    have the same effect.
+
+    If you leave any of these commented-out, they'll take on the default value
+    assigned to them in juce_Config.h, so to force them on or off, just set them
+    to an explicit 0 or 1 in here.
 */
 
 //#define JUCE_ONLY_BUILD_CORE_LIBRARY   1

extras/juce demo/src/jucedemo_headers.h

@@ -1,77 +1,77 @@
-/*
-  ==============================================================================
-
-   This file is part of the JUCE library - "Jules' Utility Class Extensions"
-   Copyright 2004-7 by Raw Material Software ltd.
-
-  ------------------------------------------------------------------------------
-
-   JUCE can be redistributed and/or modified under the terms of the
-   GNU General Public License, as published by the Free Software Foundation;
-   either version 2 of the License, or (at your option) any later version.
-
-   JUCE is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with JUCE; if not, visit www.gnu.org/licenses or write to the
-   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
-   Boston, MA 02111-1307 USA
-
-  ------------------------------------------------------------------------------
-
-   If you'd like to release a closed-source product which uses JUCE, commercial
-   licenses are also available: visit www.rawmaterialsoftware.com/juce for
-   more information.
-
-  ==============================================================================
-*/
-
-#ifndef __JUCEDEMO_HEADERS_JUCEHEADER__
-#define __JUCEDEMO_HEADERS_JUCEHEADER__
-
-// include the JUCE headers..
-#include "juce_AppConfig.h"
-
-#if (defined(_MSC_VER) && (_MSC_VER <= 1200))
- // (in VC6, there are problems with the amalgamated version...)
- #include "../../../juce.h"
-#else
- #include "../../../juce_amalgamated.h"
-#endif
-
-// this declares the binary resources that we're building into the
-// application - i.e. images, sounds, etc that the demos use
-#include "BinaryData.h"
-
-// Pre-declare the functions that create each of the demo components..
-Component* createFontsAndTextDemo();
-Component* createPathsAndTransformsDemo();
-Component* createWidgetsDemo (ApplicationCommandManager* commandManager);
-Component* createThreadingDemo();
-Component* createTreeViewDemo();
-Component* createTableDemo();
-Component* createAudioDemo();
-Component* createDragAndDropDemo();
-Component* createInterprocessCommsDemo();
-
-#if JUCE_QUICKTIME && ! JUCE_LINUX
- Component* createQuickTimeDemo();
-#endif
-
-#if JUCE_OPENGL
- Component* createOpenGLDemo();
-#endif
-
-#if JUCE_WEB_BROWSER
-  Component* createWebBrowserDemo();
-#endif
-
-#if JUCE_USE_CAMERA
-  Component* createCameraDemo();
-#endif
-
-
-#endif   // __JUCEDEMO_HEADERS_JUCEHEADER__
+/*
+  ==============================================================================
+
+   This file is part of the JUCE library - "Jules' Utility Class Extensions"
+   Copyright 2004-7 by Raw Material Software ltd.
+
+  ------------------------------------------------------------------------------
+
+   JUCE can be redistributed and/or modified under the terms of the
+   GNU General Public License, as published by the Free Software Foundation;
+   either version 2 of the License, or (at your option) any later version.
+
+   JUCE is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with JUCE; if not, visit www.gnu.org/licenses or write to the
+   Free Software Foundation, Inc., 59 Temple Place, Suite 330,
+   Boston, MA 02111-1307 USA
+
+  ------------------------------------------------------------------------------
+
+   If you'd like to release a closed-source product which uses JUCE, commercial
+   licenses are also available: visit www.rawmaterialsoftware.com/juce for
+   more information.
+
+  ==============================================================================
+*/
+
+#ifndef __JUCEDEMO_HEADERS_JUCEHEADER__
+#define __JUCEDEMO_HEADERS_JUCEHEADER__
+
+// include the JUCE headers..
+#include "juce_AppConfig.h"
+
+#if (defined(_MSC_VER) && (_MSC_VER <= 1200))
+ // (in VC6, there are problems with the amalgamated version...)
+ #include "../../../juce.h"
+#else
+ #include "../../../juce_amalgamated.h"
+#endif
+
+// this declares the binary resources that we're building into the
+// application - i.e. images, sounds, etc that the demos use
+#include "BinaryData.h"
+
+// Pre-declare the functions that create each of the demo components..
+Component* createFontsAndTextDemo();
+Component* createPathsAndTransformsDemo();
+Component* createWidgetsDemo (ApplicationCommandManager* commandManager);
+Component* createThreadingDemo();
+Component* createTreeViewDemo();
+Component* createTableDemo();
+Component* createAudioDemo();
+Component* createDragAndDropDemo();
+Component* createInterprocessCommsDemo();
+
+#if JUCE_QUICKTIME && ! JUCE_LINUX
+ Component* createQuickTimeDemo();
+#endif
+
+#if JUCE_OPENGL
+ Component* createOpenGLDemo();
+#endif
+
+#if JUCE_WEB_BROWSER
+  Component* createWebBrowserDemo();
+#endif
+
+#if JUCE_USE_CAMERA
+  Component* createCameraDemo();
+#endif
+
+
+#endif   // __JUCEDEMO_HEADERS_JUCEHEADER__

extras/the jucer/build/linux/Jucer.make

@@ -5,19 +5,22 @@ ifndef CONFIG
   CONFIG=Debug
 endif
 
+# if multiple archs are defined turn off automated dependency generation
+DEPFLAGS := $(if $(word 2, $(TARGET_ARCH)), , -MMD)
+
 ifeq ($(CONFIG),Debug)
   BINDIR := build
   LIBDIR := build
   OBJDIR := build/intermediate/Debug
   OUTDIR := build
-  CPPFLAGS := -MMD -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2"
+  CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2"
   CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -D_DEBUG -ggdb
-  CXXFLAGS := $(CFLAGS)
+  CXXFLAGS += $(CFLAGS)
   LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -mwindows -L"/usr/X11R6/lib/" -L"../../../../bin" -lfreetype -lpthread -lX11 -lGL -lGLU -lXinerama -lasound
   LDDEPS :=
   RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2"
   TARGET := jucer
-  BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
+ BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
 endif
 
 ifeq ($(CONFIG),Release)
@@ -25,14 +28,14 @@ ifeq ($(CONFIG),Release)
   LIBDIR := build
   OBJDIR := build/intermediate/Release
   OUTDIR := build
-  CPPFLAGS := -MMD -D "LINUX=1" -D "NDEBUG=1" -I "/usr/include" -I "/usr/include/freetype2"
+  CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -I "/usr/include" -I "/usr/include/freetype2"
   CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O2
-  CXXFLAGS := $(CFLAGS)
+  CXXFLAGS += $(CFLAGS)
   LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -mwindows -s -L"/usr/X11R6/lib/" -L"../../../../bin" -lfreetype -lpthread -lX11 -lGL -lGLU -lXinerama -lasound
   LDDEPS :=
   RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -I "/usr/include" -I "/usr/include/freetype2"
   TARGET := jucer
-  BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
+ BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
 endif
 
 OBJECTS := \
@@ -55,18 +58,18 @@ OBJECTS := \
 	$(OBJDIR)/jucer_UtilityFunctions.o \
 	$(OBJDIR)/jucer_FilePropertyComponent.o \
 	$(OBJDIR)/jucer_FontPropertyComponent.o \
-	$(OBJDIR)/jucer_BinaryResources.o \
 	$(OBJDIR)/jucer_ComponentLayout.o \
-	$(OBJDIR)/jucer_GeneratedCode.o \
-	$(OBJDIR)/jucer_JucerDocument.o \
+	$(OBJDIR)/jucer_BinaryResources.o \
 	$(OBJDIR)/jucer_ObjectTypes.o \
 	$(OBJDIR)/jucer_PaintRoutine.o \
+	$(OBJDIR)/jucer_GeneratedCode.o \
+	$(OBJDIR)/jucer_JucerDocument.o \
 	$(OBJDIR)/jucer_ComponentTypeHandler.o \
 	$(OBJDIR)/jucer_ButtonDocument.o \
 	$(OBJDIR)/jucer_ComponentDocument.o \
 	$(OBJDIR)/jucer_ColouredElement.o \
-	$(OBJDIR)/jucer_FillType.o \
 	$(OBJDIR)/jucer_PaintElement.o \
+	$(OBJDIR)/jucer_FillType.o \
 	$(OBJDIR)/jucer_PaintElementPath.o \
 	$(OBJDIR)/jucer_StrokeType.o \
 
@@ -75,7 +78,7 @@ CMD := $(subst \,\\,$(ComSpec)$(COMSPEC))
 ifeq (,$(CMD))
   MKDIR_TYPE := posix
 endif
-ifeq (/bin/sh.exe,$(SHELL))
+ifeq (/bin,$(findstring /bin,$(SHELL)))
   MKDIR_TYPE := posix
 endif
 ifeq ($(MKDIR_TYPE),posix)
@@ -102,7 +105,8 @@ $(OUTDIR)/$(TARGET): $(OBJECTS) $(LDDEPS) $(RESOURCES)
 clean:
 	@echo Cleaning Jucer
 ifeq ($(MKDIR_TYPE),posix)
-	-@rm -rf $(OUTDIR)/$(TARGET) $(OBJDIR)
+	-@rm -f $(OUTDIR)/$(TARGET)
+	-@rm -rf $(OBJDIR)
 else
 	-@if exist $(subst /,\,$(OUTDIR)/$(TARGET)) del /q $(subst /,\,$(OUTDIR)/$(TARGET))
 	-@if exist $(subst /,\,$(OBJDIR)) del /q $(subst /,\,$(OBJDIR))
@@ -112,167 +116,167 @@ endif
 $(OBJDIR)/BinaryData.o: ../../src/BinaryData.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 $(OBJDIR)/jucer_Main.o: ../../src/jucer_Main.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 $(OBJDIR)/juce_LibrarySource.o: ../../src/juce_LibrarySource.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 $(OBJDIR)/jucer_ComponentLayoutEditor.o: ../../src/ui/jucer_ComponentLayoutEditor.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 $(OBJDIR)/jucer_ComponentLayoutPanel.o: ../../src/ui/jucer_ComponentLayoutPanel.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 $(OBJDIR)/jucer_ComponentOverlayComponent.o: ../../src/ui/jucer_ComponentOverlayComponent.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 $(OBJDIR)/jucer_EditingPanelBase.o: ../../src/ui/jucer_EditingPanelBase.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 $(OBJDIR)/jucer_JucerDocumentHolder.o: ../../src/ui/jucer_JucerDocumentHolder.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 $(OBJDIR)/jucer_MainWindow.o: ../../src/ui/jucer_MainWindow.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 $(OBJDIR)/jucer_PaintRoutineEditor.o: ../../src/ui/jucer_PaintRoutineEditor.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 $(OBJDIR)/jucer_PaintRoutinePanel.o: ../../src/ui/jucer_PaintRoutinePanel.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 $(OBJDIR)/jucer_PrefsPanel.o: ../../src/ui/jucer_PrefsPanel.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 $(OBJDIR)/jucer_ResourceEditorPanel.o: ../../src/ui/jucer_ResourceEditorPanel.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 $(OBJDIR)/jucer_SnapGridPainter.o: ../../src/ui/jucer_SnapGridPainter.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 $(OBJDIR)/jucer_TestComponent.o: ../../src/ui/jucer_TestComponent.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 $(OBJDIR)/jucer_StoredSettings.o: ../../src/utility/jucer_StoredSettings.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 $(OBJDIR)/jucer_UtilityFunctions.o: ../../src/utility/jucer_UtilityFunctions.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 $(OBJDIR)/jucer_FilePropertyComponent.o: ../../src/properties/jucer_FilePropertyComponent.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 $(OBJDIR)/jucer_FontPropertyComponent.o: ../../src/properties/jucer_FontPropertyComponent.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/jucer_BinaryResources.o: ../../src/model/jucer_BinaryResources.cpp
+$(OBJDIR)/jucer_ComponentLayout.o: ../../src/model/jucer_ComponentLayout.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/jucer_ComponentLayout.o: ../../src/model/jucer_ComponentLayout.cpp
+$(OBJDIR)/jucer_BinaryResources.o: ../../src/model/jucer_BinaryResources.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/jucer_GeneratedCode.o: ../../src/model/jucer_GeneratedCode.cpp
+$(OBJDIR)/jucer_ObjectTypes.o: ../../src/model/jucer_ObjectTypes.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/jucer_JucerDocument.o: ../../src/model/jucer_JucerDocument.cpp
+$(OBJDIR)/jucer_PaintRoutine.o: ../../src/model/jucer_PaintRoutine.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/jucer_ObjectTypes.o: ../../src/model/jucer_ObjectTypes.cpp
+$(OBJDIR)/jucer_GeneratedCode.o: ../../src/model/jucer_GeneratedCode.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/jucer_PaintRoutine.o: ../../src/model/jucer_PaintRoutine.cpp
+$(OBJDIR)/jucer_JucerDocument.o: ../../src/model/jucer_JucerDocument.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 $(OBJDIR)/jucer_ComponentTypeHandler.o: ../../src/model/components/jucer_ComponentTypeHandler.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 $(OBJDIR)/jucer_ButtonDocument.o: ../../src/model/documents/jucer_ButtonDocument.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 $(OBJDIR)/jucer_ComponentDocument.o: ../../src/model/documents/jucer_ComponentDocument.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 $(OBJDIR)/jucer_ColouredElement.o: ../../src/model/paintelements/jucer_ColouredElement.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/jucer_FillType.o: ../../src/model/paintelements/jucer_FillType.cpp
+$(OBJDIR)/jucer_PaintElement.o: ../../src/model/paintelements/jucer_PaintElement.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/jucer_PaintElement.o: ../../src/model/paintelements/jucer_PaintElement.cpp
+$(OBJDIR)/jucer_FillType.o: ../../src/model/paintelements/jucer_FillType.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 $(OBJDIR)/jucer_PaintElementPath.o: ../../src/model/paintelements/jucer_PaintElementPath.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 $(OBJDIR)/jucer_StrokeType.o: ../../src/model/paintelements/jucer_StrokeType.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
-	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 -include $(OBJECTS:%.o=%.d)
 

extras/the jucer/src/juce_AppConfig.h

@@ -31,10 +31,17 @@
 
 /*
     This file contains settings that you might want to explicitly apply to
-    the your build.
+    your Juce build.
 
-    Most of these are turned on or off by default, but you can override
-    that setting here by un-commenting it and giving it a 1 or 0 value.
+    These flags enable or disable juce features - if you're linking to juce as
+    a library, then to change them, you'd need to alter your juce_Config.h file and
+    recompile the juce lib. But because we're using the amalgamated file, you can
+    just include this file before including your juce_amalgamated.cpp file to
+    have the same effect.
+
+    If you leave any of these commented-out, they'll take on the default value
+    assigned to them in juce_Config.h, so to force them on or off, just set them
+    to an explicit 0 or 1 in here.
 */
 
 //#define JUCE_ONLY_BUILD_CORE_LIBRARY   1

extras/the jucer/src/juce_LibrarySource.cpp

@@ -9,4 +9,13 @@
 */
 
 #include "juce_AppConfig.h"
+
+// This is where all the juce code gets included, via this amalgamated file..
 #include "../../../juce_amalgamated.cpp"
+
+
+/* NB. A handy tip is that if you're doing a lot of debugging into the juce code, then stepping through
+   the amalgamated file can be slow or impossible for the debugger. But if you use the following line
+   instead of the one above, then it makes it a lot easier..
+*/
+//#include "../../../src/juce_amalgamated_template.cpp"

juce_Config.h

@@ -30,7 +30,7 @@
 */
 
 #ifndef __JUCE_CONFIG_JUCEHEADER__
-#define __JUCE_CONFIG_JUCEHEADER__ // (this comment is here to force the amalgamator to reinclude this file)
+#define __JUCE_CONFIG_JUCEHEADER__
 
 //==============================================================================
 /*

juce_amalgamated.h

@@ -80,7 +80,7 @@
 
 /********* Start of inlined file: juce_Config.h *********/
 #ifndef __JUCE_CONFIG_JUCEHEADER__
-#define __JUCE_CONFIG_JUCEHEADER__ // (this comment is here to force the amalgamator to reinclude this file)
+#define __JUCE_CONFIG_JUCEHEADER__
 
 /*
     This file contains macros that enable/disable various JUCE features.
@@ -638,10 +638,6 @@
 #include <cstring>
 #include <cstdio>
 
-#if JUCE_MAC || JUCE_LINUX
-  #include <pthread.h>
-#endif
-
 #if JUCE_USE_INTRINSICS
   #include <intrin.h>
 #endif
@@ -2742,9 +2738,6 @@ BEGIN_JUCE_NAMESPACE
 #endif   // __JUCE_ATOMIC_JUCEHEADER__
 /********* End of inlined file: juce_Atomic.h *********/
 
-#endif
-#ifndef __JUCE_STANDARDHEADER_JUCEHEADER__
-
 #endif
 #ifndef __JUCE_FILELOGGER_JUCEHEADER__
 
@@ -7465,6 +7458,9 @@ private:
 #endif   // __JUCE_RANDOM_JUCEHEADER__
 /********* End of inlined file: juce_Random.h *********/
 
+#endif
+#ifndef __JUCE_TIME_JUCEHEADER__
+
 #endif
 #ifndef __JUCE_RELATIVETIME_JUCEHEADER__
 
@@ -7996,10 +7992,10 @@ public:
 /********* End of inlined file: juce_SystemStats.h *********/
 
 #endif
-#ifndef __JUCE_TIME_JUCEHEADER__
+#ifndef __JUCE_DATACONVERSIONS_JUCEHEADER__
 
 #endif
-#ifndef __JUCE_DATACONVERSIONS_JUCEHEADER__
+#ifndef __JUCE_STANDARDHEADER_JUCEHEADER__
 
 #endif
 #ifndef __JUCE_ARRAYALLOCATIONBASE_JUCEHEADER__

src/juce_amalgamated_template.cpp

@@ -44,13 +44,13 @@
  #error
 #endif
 
-#include "../juce_Config.h"
+#include "../juce_Config.h"  // FORCE_AMALGAMATOR_INCLUDE
 
 //==============================================================================
 #ifdef _WIN32
  #include "../build/win32/platform_specific_code/juce_win32_NativeIncludes.h"
 #elif defined (LINUX)
- //
+ #include "../build/linux/platform_specific_code/juce_linux_NativeIncludes.h"
 #else
  #include "../build/macosx/platform_specific_code/juce_mac_NativeIncludes.h"
 #endif
@@ -333,46 +333,24 @@
 #include "juce_core/io/streams/juce_GZIPDecompressorInputStream.cpp"
 
 #if ! JUCE_ONLY_BUILD_CORE_LIBRARY
-#include "juce_appframework/audio/audio_file_formats/juce_FlacAudioFormat.cpp"
-#include "juce_appframework/audio/audio_file_formats/juce_OggVorbisAudioFormat.cpp"
-#include "juce_appframework/gui/graphics/imaging/image_file_formats/juce_JPEGLoader.cpp"
-#include "juce_appframework/gui/graphics/imaging/image_file_formats/juce_PNGLoader.cpp"
+ #include "juce_appframework/audio/audio_file_formats/juce_FlacAudioFormat.cpp"
+ #include "juce_appframework/audio/audio_file_formats/juce_OggVorbisAudioFormat.cpp"
+ #include "juce_appframework/gui/graphics/imaging/image_file_formats/juce_JPEGLoader.cpp"
+ #include "juce_appframework/gui/graphics/imaging/image_file_formats/juce_PNGLoader.cpp"
 #endif
 
 //==============================================================================
 #if JUCE_WIN32
-
-#include "../build/win32/platform_specific_code/juce_win32_NativeCode.cpp"
-#include "../build/win32/platform_specific_code/juce_win32_AutoLinkLibraries.h"
-
+ #include "../build/win32/platform_specific_code/juce_win32_NativeCode.cpp"
+ #include "../build/win32/platform_specific_code/juce_win32_AutoLinkLibraries.h"
 #endif
 
 //==============================================================================
 #if JUCE_LINUX
-
-#include "../build/linux/platform_specific_code/juce_linux_Files.cpp"
-#include "../build/linux/platform_specific_code/juce_linux_NamedPipe.cpp"
-#include "../build/linux/platform_specific_code/juce_linux_Network.cpp"
-#include "../build/linux/platform_specific_code/juce_linux_SystemStats.cpp"
-#include "../build/linux/platform_specific_code/juce_linux_Threads.cpp"
-
-#if ! JUCE_ONLY_BUILD_CORE_LIBRARY
- #include "../build/linux/platform_specific_code/juce_linux_Audio.cpp"
- #include "../build/linux/platform_specific_code/juce_linux_AudioCDReader.cpp"
- #include "../build/linux/platform_specific_code/juce_linux_FileChooser.cpp"
- #include "../build/linux/platform_specific_code/juce_linux_Fonts.cpp"
- #include "../build/linux/platform_specific_code/juce_linux_Messaging.cpp"
- #include "../build/linux/platform_specific_code/juce_linux_Midi.cpp"
- #include "../build/linux/platform_specific_code/juce_linux_WebBrowserComponent.cpp"
- #include "../build/linux/platform_specific_code/juce_linux_Windowing.cpp"
-#endif
-
+ #include "../build/linux/platform_specific_code/juce_linux_NativeCode.cpp"
 #endif
 
 //==============================================================================
 #if JUCE_MAC
-
-#include "../build/macosx/platform_specific_code/juce_mac_NativeCode.mm"
-#include "../build/macosx/platform_specific_code/juce_mac_NamedPipe.cpp"
-
+ #include "../build/macosx/platform_specific_code/juce_mac_NativeCode.mm"
 #endif

src/juce_appframework/audio/audio_file_formats/oggvorbis/codec.h

@@ -168,7 +168,7 @@ extern int      vorbis_info_blocksize(vorbis_info *vi,int zo);
 extern void     vorbis_comment_init(vorbis_comment *vc);
 extern void     vorbis_comment_add(vorbis_comment *vc, char *comment);
 extern void     vorbis_comment_add_tag(vorbis_comment *vc,
-				       char *tag, char *contents);
+				       const char *tag, char *contents);
 extern char    *vorbis_comment_query(vorbis_comment *vc, char *tag, int count);
 extern int      vorbis_comment_query_count(vorbis_comment *vc, char *tag);
 extern void     vorbis_comment_clear(vorbis_comment *vc);

src/juce_appframework/audio/audio_file_formats/oggvorbis/libvorbis-1.1.2/lib/analysis.c

@@ -69,7 +69,7 @@ int vorbis_analysis(vorbis_block *vb, ogg_packet *op){
 }
 
 /* there was no great place to put this.... */
-void _analysis_output_always(char *base,int i,float *v,int n,int bark,int dB,ogg_int64_t off){
+void _analysis_output_always(const char *base,int i,float *v,int n,int bark,int dB,ogg_int64_t off){
   int j;
   FILE *of;
   char buffer[80];

src/juce_appframework/audio/audio_file_formats/oggvorbis/libvorbis-1.1.2/lib/info.c

@@ -35,7 +35,7 @@
 #include "os.h"
 
 
-static void _v_writestring(oggpack_buffer *o,char *s, int bytes){
+static void _v_writestring(oggpack_buffer *o, const char *s, int bytes){
 
   while(bytes--){
     oggpack_write(o,*s++,8);
@@ -64,7 +64,7 @@ void vorbis_comment_add(vorbis_comment *vc,char *comment){
   vc->user_comments[vc->comments]=NULL;
 }
 
-void vorbis_comment_add_tag(vorbis_comment *vc, char *tag, char *contents){
+void vorbis_comment_add_tag(vorbis_comment *vc, const char *tag, char *contents){
   char *comment=(char*)alloca(strlen(tag)+strlen(contents)+2); /* +2 for = and \0 */
   strcpy(comment, tag);
   strcat(comment, "=");

src/juce_appframework/audio/audio_file_formats/oggvorbis/libvorbis-1.1.2/lib/vorbisfile.c

@@ -1704,7 +1704,7 @@ long ov_read_float(OggVorbis_File *vf,float ***pcm_channels,int length,
 }
 
 extern float *vorbis_window(vorbis_dsp_state *v,int W);
-extern void _analysis_output_always(char *base,int i,float *v,int n,int bark,int dB,
+extern void _analysis_output_always(const char *base,int i,float *v,int n,int bark,int dB,
 			     ogg_int64_t off);
 
 static void _ov_splice(float **pcm,float **lappcm,

src/juce_core/basics/juce_StandardHeader.h

@@ -83,10 +83,6 @@
 #include <cstring>
 #include <cstdio>
 
-#if JUCE_MAC || JUCE_LINUX
-  #include <pthread.h>
-#endif
-
 #if JUCE_USE_INTRINSICS
   #include <intrin.h>
 #endif

src/juce_core/io/streams/zlib/zutil.c

@@ -119,7 +119,7 @@ uLong ZEXPORT zlibCompileFlags()
 #  endif
 int z_verbose = verbose;
 
-void z_error (char *m)
+void z_error (const char *m)
 {
     fprintf(stderr, "%s\n", m);
     exit(1);

src/juce_core/io/streams/zlib/zutil.h

@@ -241,7 +241,7 @@ extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */
 #ifdef DEBUG
 #  include <stdio.h>
    extern int z_verbose;
-   extern void z_error    OF((char *m));
+   extern void z_error    OF((const char *m));
 #  define Assert(cond,msg) {if(!(cond)) z_error(msg);}
 #  define Trace(x) {if (z_verbose>=0) fprintf x ;}
 #  define Tracev(x) {if (z_verbose>0) fprintf x ;}

src/juce_core_includes.h

@@ -35,9 +35,6 @@
 #ifndef __JUCE_ATOMIC_JUCEHEADER__
  #include "juce_core/basics/juce_Atomic.h"
 #endif
-#ifndef __JUCE_STANDARDHEADER_JUCEHEADER__
- #include "juce_core/basics/juce_StandardHeader.h"
-#endif
 #ifndef __JUCE_FILELOGGER_JUCEHEADER__
  #include "juce_core/basics/juce_FileLogger.h"
 #endif
@@ -59,6 +56,9 @@
 #ifndef __JUCE_RANDOM_JUCEHEADER__
  #include "juce_core/basics/juce_Random.h"
 #endif
+#ifndef __JUCE_TIME_JUCEHEADER__
+ #include "juce_core/basics/juce_Time.h"
+#endif
 #ifndef __JUCE_RELATIVETIME_JUCEHEADER__
  #include "juce_core/basics/juce_RelativeTime.h"
 #endif
@@ -68,12 +68,12 @@
 #ifndef __JUCE_SYSTEMSTATS_JUCEHEADER__
  #include "juce_core/basics/juce_SystemStats.h"
 #endif
-#ifndef __JUCE_TIME_JUCEHEADER__
- #include "juce_core/basics/juce_Time.h"
-#endif
 #ifndef __JUCE_DATACONVERSIONS_JUCEHEADER__
  #include "juce_core/basics/juce_DataConversions.h"
 #endif
+#ifndef __JUCE_STANDARDHEADER_JUCEHEADER__
+ #include "juce_core/basics/juce_StandardHeader.h"
+#endif
 #ifndef __JUCE_ARRAYALLOCATIONBASE_JUCEHEADER__
  #include "juce_core/containers/juce_ArrayAllocationBase.h"
 #endif