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

@@ -10,12 +10,12 @@ ifeq ($(CONFIG),Debug)
   LIBDIR := build
   OBJDIR := build/intermediate/Debug
   OUTDIR := build
-  CPPFLAGS := -MMD -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include"
+  CPPFLAGS := -MMD -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)
-  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -mwindows -L"/usr/X11R6/lib/" -L"../../../../bin" -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -ljuce_debug
+  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -mwindows -L"/usr/X11R6/lib/" -L"../../../../bin" -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound
   LDDEPS :=
-  RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include"
+  RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2"
   TARGET := jucedemo
   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
 endif
@@ -25,12 +25,12 @@ ifeq ($(CONFIG),Release)
   LIBDIR := build
   OBJDIR := build/intermediate/Release
   OUTDIR := build
-  CPPFLAGS := -MMD -D "LINUX=1" -D "NDEBUG=1" -I "/usr/include"
+  CPPFLAGS := -MMD -D "LINUX=1" -D "NDEBUG=1" -I "/usr/include" -I "/usr/include/freetype2"
   CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O2
   CXXFLAGS := $(CFLAGS)
-  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -mwindows -s -L"/usr/X11R6/lib/" -L"../../../../bin" -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound -ljuce
+  LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -mwindows -s -L"/usr/X11R6/lib/" -L"../../../../bin" -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound
   LDDEPS :=
-  RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -I "/usr/include"
+  RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -I "/usr/include" -I "/usr/include/freetype2"
   TARGET := jucedemo
   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
 endif
@@ -38,7 +38,9 @@ endif
 OBJECTS := \
 	$(OBJDIR)/ApplicationStartup.o \
 	$(OBJDIR)/BinaryData.o \
+	$(OBJDIR)/juce_LibrarySource.o \
 	$(OBJDIR)/MainDemoWindow.o \
+	$(OBJDIR)/._QuickTimeDemo.o \
 	$(OBJDIR)/AudioDemo.o \
 	$(OBJDIR)/DragAndDropDemo.o \
 	$(OBJDIR)/FontsAndTextDemo.o \
@@ -100,11 +102,21 @@ $(OBJDIR)/BinaryData.o: ../../src/BinaryData.cpp
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
+$(OBJDIR)/juce_LibrarySource.o: ../../src/juce_LibrarySource.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+
 $(OBJDIR)/MainDemoWindow.o: ../../src/MainDemoWindow.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)
 	@$(CXX) $(CXXFLAGS) -o $@ -c $<
 
+$(OBJDIR)/._QuickTimeDemo.o: ../../src/demos/._QuickTimeDemo.cpp
+	-@$(CMD_MKOBJDIR)
+	@echo $(notdir $<)
+	@$(CXX) $(CXXFLAGS) -o $@ -c $<
+
 $(OBJDIR)/AudioDemo.o: ../../src/demos/AudioDemo.cpp
 	-@$(CMD_MKOBJDIR)
 	@echo $(notdir $<)

extras/juce demo/build/linux/jucedemo_premake.lua

@@ -22,7 +22,8 @@ package.config["Release"].defines   = { "LINUX=1", "NDEBUG=1" };
 package.target = "jucedemo"
 
 package.includepaths = { 
-    "/usr/include"
+    "/usr/include",
+    "/usr/include/freetype2"
 }
 
 package.libpaths = { 
@@ -31,11 +32,11 @@ package.libpaths = {
 }
 
 package.config["Debug"].links = { 
-    "freetype", "pthread", "rt", "X11", "GL", "GLU", "Xinerama", "asound", "juce_debug"
+    "freetype", "pthread", "rt", "X11", "GL", "GLU", "Xinerama", "asound"
 }
 
 package.config["Release"].links = { 
-    "freetype", "pthread", "rt", "X11", "GL", "GLU", "Xinerama", "asound", "juce"
+    "freetype", "pthread", "rt", "X11", "GL", "GLU", "Xinerama", "asound"
 }
 
 package.linkflags = { "static-runtime" }

extras/juce demo/build/macosx/jucedemo.xcodeproj/project.pbxproj

@@ -7,12 +7,26 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		8402D4D608CC934C00E06580 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4A9504CAFFE6A41611CA0CBA /* CoreServices.framework */; };
 		8417EE7A0A6E7EB90058E04E /* TableDemo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8417EE790A6E7EB90058E04E /* TableDemo.cpp */; };
 		842A97B8081060FB0059DBCC /* DragAndDropDemo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 842A97B6081060FB0059DBCC /* DragAndDropDemo.cpp */; };
 		842A97B9081060FB0059DBCC /* OpenGLDemo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 842A97B7081060FB0059DBCC /* OpenGLDemo.cpp */; };
 		846929270A49DDE100314975 /* juce.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 846929260A49DDE100314975 /* juce.xcconfig */; };
-		848DE90A0DDDA682002E5D55 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 848DE9090DDDA682002E5D55 /* Cocoa.framework */; };
+		846C10970DE32E6E00E8CCE8 /* juce_AppConfig.h in Headers */ = {isa = PBXBuildFile; fileRef = 846C10960DE32E6D00E8CCE8 /* juce_AppConfig.h */; };
+		846C10B20DE32EB500E8CCE8 /* juce_LibrarySource.mm in Sources */ = {isa = PBXBuildFile; fileRef = 846C10B10DE32EB500E8CCE8 /* juce_LibrarySource.mm */; };
+		8480BC1C0DE0BB8200478E44 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8480BC0E0DE0BB8200478E44 /* AGL.framework */; };
+		8480BC1D0DE0BB8200478E44 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8480BC0F0DE0BB8200478E44 /* AudioUnit.framework */; };
+		8480BC1E0DE0BB8200478E44 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8480BC100DE0BB8200478E44 /* IOKit.framework */; };
+		8480BC1F0DE0BB8200478E44 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8480BC110DE0BB8200478E44 /* Cocoa.framework */; };
+		8480BC200DE0BB8200478E44 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8480BC120DE0BB8200478E44 /* CoreAudio.framework */; };
+		8480BC210DE0BB8200478E44 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8480BC130DE0BB8200478E44 /* CoreFoundation.framework */; };
+		8480BC220DE0BB8200478E44 /* CoreMIDI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8480BC140DE0BB8200478E44 /* CoreMIDI.framework */; };
+		8480BC230DE0BB8200478E44 /* DiscRecording.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8480BC150DE0BB8200478E44 /* DiscRecording.framework */; };
+		8480BC240DE0BB8200478E44 /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8480BC160DE0BB8200478E44 /* OpenGL.framework */; };
+		8480BC250DE0BB8200478E44 /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8480BC170DE0BB8200478E44 /* QuickTime.framework */; };
+		8480BC260DE0BB8200478E44 /* WebKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8480BC180DE0BB8200478E44 /* WebKit.framework */; };
+		8480BC270DE0BB8200478E44 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8480BC190DE0BB8200478E44 /* Carbon.framework */; };
+		8480BC280DE0BB8200478E44 /* CoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8480BC1A0DE0BB8200478E44 /* CoreServices.framework */; };
+		8480BC290DE0BB8200478E44 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8480BC1B0DE0BB8200478E44 /* ApplicationServices.framework */; };
 		849E1BF706C15C330002E024 /* BinaryData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 849E1BF506C15C330002E024 /* BinaryData.cpp */; };
 		849E1BF806C15C330002E024 /* BinaryData.h in Headers */ = {isa = PBXBuildFile; fileRef = 849E1BF606C15C330002E024 /* BinaryData.h */; };
 		84A06BA809CAD661006A43BD /* InterprocessCommsDemo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84A06BA709CAD661006A43BD /* InterprocessCommsDemo.cpp */; };
@@ -26,37 +40,32 @@
 		84C49E5C06C0EE8C0066071B /* jucedemo_headers.h in Headers */ = {isa = PBXBuildFile; fileRef = 84C49E5206C0EE8C0066071B /* jucedemo_headers.h */; };
 		84C49E5D06C0EE8C0066071B /* MainDemoWindow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84C49E5306C0EE8C0066071B /* MainDemoWindow.cpp */; };
 		84C49E5E06C0EE8C0066071B /* MainDemoWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 84C49E5406C0EE8C0066071B /* MainDemoWindow.h */; };
-		84C49F2606C0F3200066071B /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C49F2506C0F3200066071B /* CoreAudio.framework */; };
-		84C4A41106C0F9A00066071B /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84C4A41006C0F9A00066071B /* IOKit.framework */; };
-		84D67A2B0802CAFF003B9EFE /* QuickTime.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84D67A2A0802CAFF003B9EFE /* QuickTime.framework */; };
-		84E8209909729D760097675B /* CoreMIDI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84E8209809729D760097675B /* CoreMIDI.framework */; };
-		84EAE2F309DAAF0B00288D0A /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84EAE2F109DAAF0B00288D0A /* AGL.framework */; };
-		84EAE2F409DAAF0B00288D0A /* OpenGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 84EAE2F209DAAF0B00288D0A /* OpenGL.framework */; };
 		84F8DB0B099CA8DD00E911ED /* QuickTimeDemo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84F8DB0A099CA8DD00E911ED /* QuickTimeDemo.cpp */; };
-		84FDB0950C15BDDD00CD0087 /* libjucedebug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 84FDB0940C15BDCE00CD0087 /* libjucedebug.a */; };
 		8D0C4E8D0486CD37000505A6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 0867D6AAFE840B52C02AAC07 /* InfoPlist.strings */; };
-		8D0C4E920486CD37000505A6 /* Carbon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20286C33FDCF999611CA2CEA /* Carbon.framework */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXContainerItemProxy section */
-		84FDB0930C15BDCE00CD0087 /* PBXContainerItemProxy */ = {
-			isa = PBXContainerItemProxy;
-			containerPortal = 84EAE2F909DAAF2F00288D0A /* Juce.xcodeproj */;
-			proxyType = 2;
-			remoteGlobalIDString = D2AAC046055464E500DB518D;
-			remoteInfo = Juce;
-		};
-/* End PBXContainerItemProxy section */
-
 /* Begin PBXFileReference section */
 		0867D6ABFE840B52C02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		20286C33FDCF999611CA2CEA /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
-		4A9504CAFFE6A41611CA0CBA /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
 		8417EE790A6E7EB90058E04E /* TableDemo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TableDemo.cpp; sourceTree = "<group>"; };
 		842A97B6081060FB0059DBCC /* DragAndDropDemo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = DragAndDropDemo.cpp; sourceTree = "<group>"; };
 		842A97B7081060FB0059DBCC /* OpenGLDemo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = OpenGLDemo.cpp; sourceTree = "<group>"; };
 		846929260A49DDE100314975 /* juce.xcconfig */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xcconfig; name = juce.xcconfig; path = ../../../../build/macosx/juce.xcconfig; sourceTree = SOURCE_ROOT; };
-		848DE9090DDDA682002E5D55 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+		846C10960DE32E6D00E8CCE8 /* juce_AppConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = juce_AppConfig.h; path = ../../src/juce_AppConfig.h; sourceTree = SOURCE_ROOT; };
+		846C10B10DE32EB500E8CCE8 /* juce_LibrarySource.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = juce_LibrarySource.mm; path = ../../src/juce_LibrarySource.mm; sourceTree = SOURCE_ROOT; };
+		8480BC0E0DE0BB8200478E44 /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = "<absolute>"; };
+		8480BC0F0DE0BB8200478E44 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = /System/Library/Frameworks/AudioUnit.framework; sourceTree = "<absolute>"; };
+		8480BC100DE0BB8200478E44 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
+		8480BC110DE0BB8200478E44 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
+		8480BC120DE0BB8200478E44 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = "<absolute>"; };
+		8480BC130DE0BB8200478E44 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = /System/Library/Frameworks/CoreFoundation.framework; sourceTree = "<absolute>"; };
+		8480BC140DE0BB8200478E44 /* CoreMIDI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = /System/Library/Frameworks/CoreMIDI.framework; sourceTree = "<absolute>"; };
+		8480BC150DE0BB8200478E44 /* DiscRecording.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = DiscRecording.framework; path = /System/Library/Frameworks/DiscRecording.framework; sourceTree = "<absolute>"; };
+		8480BC160DE0BB8200478E44 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
+		8480BC170DE0BB8200478E44 /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = "<absolute>"; };
+		8480BC180DE0BB8200478E44 /* WebKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = WebKit.framework; path = /System/Library/Frameworks/WebKit.framework; sourceTree = "<absolute>"; };
+		8480BC190DE0BB8200478E44 /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
+		8480BC1A0DE0BB8200478E44 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
+		8480BC1B0DE0BB8200478E44 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
 		849E1BF506C15C330002E024 /* BinaryData.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = BinaryData.cpp; path = ../../src/BinaryData.cpp; sourceTree = SOURCE_ROOT; };
 		849E1BF606C15C330002E024 /* BinaryData.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = BinaryData.h; path = ../../src/BinaryData.h; sourceTree = SOURCE_ROOT; };
 		84A06BA709CAD661006A43BD /* InterprocessCommsDemo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = InterprocessCommsDemo.cpp; sourceTree = "<group>"; };
@@ -70,13 +79,6 @@
 		84C49E5206C0EE8C0066071B /* jucedemo_headers.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = jucedemo_headers.h; path = ../../src/jucedemo_headers.h; sourceTree = SOURCE_ROOT; };
 		84C49E5306C0EE8C0066071B /* MainDemoWindow.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = MainDemoWindow.cpp; path = ../../src/MainDemoWindow.cpp; sourceTree = SOURCE_ROOT; };
 		84C49E5406C0EE8C0066071B /* MainDemoWindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = MainDemoWindow.h; path = ../../src/MainDemoWindow.h; sourceTree = SOURCE_ROOT; };
-		84C49F2506C0F3200066071B /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = "<absolute>"; };
-		84C4A41006C0F9A00066071B /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = /System/Library/Frameworks/IOKit.framework; sourceTree = "<absolute>"; };
-		84D67A2A0802CAFF003B9EFE /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = "<absolute>"; };
-		84E8209809729D760097675B /* CoreMIDI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMIDI.framework; path = /System/Library/Frameworks/CoreMIDI.framework; sourceTree = "<absolute>"; };
-		84EAE2F109DAAF0B00288D0A /* AGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AGL.framework; path = /System/Library/Frameworks/AGL.framework; sourceTree = "<absolute>"; };
-		84EAE2F209DAAF0B00288D0A /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
-		84EAE2F909DAAF2F00288D0A /* Juce.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Juce.xcodeproj; path = ../../../../build/macosx/Juce.xcodeproj; sourceTree = SOURCE_ROOT; };
 		84F8DB0A099CA8DD00E911ED /* QuickTimeDemo.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = QuickTimeDemo.cpp; sourceTree = "<group>"; };
 		8D0C4E960486CD37000505A6 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
 		8D0C4E970486CD37000505A6 /* jucedemo.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = jucedemo.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -87,16 +89,20 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				84FDB0950C15BDDD00CD0087 /* libjucedebug.a in Frameworks */,
-				8D0C4E920486CD37000505A6 /* Carbon.framework in Frameworks */,
-				84C49F2606C0F3200066071B /* CoreAudio.framework in Frameworks */,
-				84C4A41106C0F9A00066071B /* IOKit.framework in Frameworks */,
-				84D67A2B0802CAFF003B9EFE /* QuickTime.framework in Frameworks */,
-				8402D4D608CC934C00E06580 /* CoreServices.framework in Frameworks */,
-				84E8209909729D760097675B /* CoreMIDI.framework in Frameworks */,
-				84EAE2F309DAAF0B00288D0A /* AGL.framework in Frameworks */,
-				84EAE2F409DAAF0B00288D0A /* OpenGL.framework in Frameworks */,
-				848DE90A0DDDA682002E5D55 /* Cocoa.framework in Frameworks */,
+				8480BC1C0DE0BB8200478E44 /* AGL.framework in Frameworks */,
+				8480BC1D0DE0BB8200478E44 /* AudioUnit.framework in Frameworks */,
+				8480BC1E0DE0BB8200478E44 /* IOKit.framework in Frameworks */,
+				8480BC1F0DE0BB8200478E44 /* Cocoa.framework in Frameworks */,
+				8480BC200DE0BB8200478E44 /* CoreAudio.framework in Frameworks */,
+				8480BC210DE0BB8200478E44 /* CoreFoundation.framework in Frameworks */,
+				8480BC220DE0BB8200478E44 /* CoreMIDI.framework in Frameworks */,
+				8480BC230DE0BB8200478E44 /* DiscRecording.framework in Frameworks */,
+				8480BC240DE0BB8200478E44 /* OpenGL.framework in Frameworks */,
+				8480BC250DE0BB8200478E44 /* QuickTime.framework in Frameworks */,
+				8480BC260DE0BB8200478E44 /* WebKit.framework in Frameworks */,
+				8480BC270DE0BB8200478E44 /* Carbon.framework in Frameworks */,
+				8480BC280DE0BB8200478E44 /* CoreServices.framework in Frameworks */,
+				8480BC290DE0BB8200478E44 /* ApplicationServices.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -114,8 +120,8 @@
 		20286C29FDCF999611CA2CEA /* jucedemo */ = {
 			isa = PBXGroup;
 			children = (
-				841084950DB3759400AB8583 /* Build settings */,
 				20286C2AFDCF999611CA2CEA /* Sources */,
+				841084950DB3759400AB8583 /* Build settings */,
 				20286C2CFDCF999611CA2CEA /* Resources */,
 				20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */,
 				195DF8CFFE9D517E11CA2CBB /* Products */,
@@ -127,12 +133,14 @@
 			isa = PBXGroup;
 			children = (
 				84C49E4B06C0EE8C0066071B /* demos */,
-				84C49E5206C0EE8C0066071B /* jucedemo_headers.h */,
 				84C49E4A06C0EE8C0066071B /* ApplicationStartup.cpp */,
 				84C49E5306C0EE8C0066071B /* MainDemoWindow.cpp */,
 				84C49E5406C0EE8C0066071B /* MainDemoWindow.h */,
 				849E1BF506C15C330002E024 /* BinaryData.cpp */,
 				849E1BF606C15C330002E024 /* BinaryData.h */,
+				84C49E5206C0EE8C0066071B /* jucedemo_headers.h */,
+				846C10960DE32E6D00E8CCE8 /* juce_AppConfig.h */,
+				846C10B10DE32EB500E8CCE8 /* juce_LibrarySource.mm */,
 			);
 			name = Sources;
 			sourceTree = "<group>";
@@ -149,16 +157,20 @@
 		20286C32FDCF999611CA2CEA /* External Frameworks and Libraries */ = {
 			isa = PBXGroup;
 			children = (
-				848DE9090DDDA682002E5D55 /* Cocoa.framework */,
-				84EAE2F909DAAF2F00288D0A /* Juce.xcodeproj */,
-				84EAE2F109DAAF0B00288D0A /* AGL.framework */,
-				84EAE2F209DAAF0B00288D0A /* OpenGL.framework */,
-				84D67A2A0802CAFF003B9EFE /* QuickTime.framework */,
-				84C4A41006C0F9A00066071B /* IOKit.framework */,
-				84C49F2506C0F3200066071B /* CoreAudio.framework */,
-				20286C33FDCF999611CA2CEA /* Carbon.framework */,
-				4A9504CAFFE6A41611CA0CBA /* CoreServices.framework */,
-				84E8209809729D760097675B /* CoreMIDI.framework */,
+				8480BC0E0DE0BB8200478E44 /* AGL.framework */,
+				8480BC1B0DE0BB8200478E44 /* ApplicationServices.framework */,
+				8480BC0F0DE0BB8200478E44 /* AudioUnit.framework */,
+				8480BC190DE0BB8200478E44 /* Carbon.framework */,
+				8480BC110DE0BB8200478E44 /* Cocoa.framework */,
+				8480BC120DE0BB8200478E44 /* CoreAudio.framework */,
+				8480BC130DE0BB8200478E44 /* CoreFoundation.framework */,
+				8480BC140DE0BB8200478E44 /* CoreMIDI.framework */,
+				8480BC1A0DE0BB8200478E44 /* CoreServices.framework */,
+				8480BC150DE0BB8200478E44 /* DiscRecording.framework */,
+				8480BC100DE0BB8200478E44 /* IOKit.framework */,
+				8480BC160DE0BB8200478E44 /* OpenGL.framework */,
+				8480BC170DE0BB8200478E44 /* QuickTime.framework */,
+				8480BC180DE0BB8200478E44 /* WebKit.framework */,
 			);
 			name = "External Frameworks and Libraries";
 			sourceTree = "<group>";
@@ -190,14 +202,6 @@
 			path = ../../src/demos;
 			sourceTree = SOURCE_ROOT;
 		};
-		84FDB0900C15BDCE00CD0087 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				84FDB0940C15BDCE00CD0087 /* libjucedebug.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -208,6 +212,7 @@
 				84C49E5C06C0EE8C0066071B /* jucedemo_headers.h in Headers */,
 				84C49E5E06C0EE8C0066071B /* MainDemoWindow.h in Headers */,
 				849E1BF806C15C330002E024 /* BinaryData.h in Headers */,
+				846C10970DE32E6E00E8CCE8 /* juce_AppConfig.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -244,12 +249,6 @@
 			hasScannedForEncodings = 1;
 			mainGroup = 20286C29FDCF999611CA2CEA /* jucedemo */;
 			projectDirPath = "";
-			projectReferences = (
-				{
-					ProductGroup = 84FDB0900C15BDCE00CD0087 /* Products */;
-					ProjectRef = 84EAE2F909DAAF2F00288D0A /* Juce.xcodeproj */;
-				},
-			);
 			projectRoot = "";
 			targets = (
 				8D0C4E890486CD37000505A6 /* jucedemo */,
@@ -257,16 +256,6 @@
 		};
 /* End PBXProject section */
 
-/* Begin PBXReferenceProxy section */
-		84FDB0940C15BDCE00CD0087 /* libjucedebug.a */ = {
-			isa = PBXReferenceProxy;
-			fileType = archive.ar;
-			path = libjucedebug.a;
-			remoteRef = 84FDB0930C15BDCE00CD0087 /* PBXContainerItemProxy */;
-			sourceTree = BUILT_PRODUCTS_DIR;
-		};
-/* End PBXReferenceProxy section */
-
 /* Begin PBXResourcesBuildPhase section */
 		8D0C4E8C0486CD37000505A6 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
@@ -308,6 +297,7 @@
 				84F8DB0B099CA8DD00E911ED /* QuickTimeDemo.cpp in Sources */,
 				84A06BA809CAD661006A43BD /* InterprocessCommsDemo.cpp in Sources */,
 				8417EE7A0A6E7EB90058E04E /* TableDemo.cpp in Sources */,
+				846C10B20DE32EB500E8CCE8 /* juce_LibrarySource.mm in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -354,7 +344,6 @@
 				);
 				HEADER_SEARCH_PATHS = "$(SYSTEM_DEVELOPER_DIR)/Headers/FlatCarbon";
 				INFOPLIST_FILE = Info.plist;
-				LIBRARY_SEARCH_PATHS = ../../../../bin;
 				ONLY_LINK_ESSENTIAL_SYMBOLS = YES;
 				PRODUCT_NAME = jucedemo;
 				WRAPPER_EXTENSION = app;

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

@@ -2,11 +2,6 @@
 Microsoft Visual Studio Solution File, Format Version 9.00
 # Visual Studio 2005
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jucedemo", "jucedemo.vcproj", "{050D65C2-17C4-4EE1-ABCE-BEA9DA83D77A}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AE232C11-D91C-4CA1-B24E-8B11A52EFF26} = {AE232C11-D91C-4CA1-B24E-8B11A52EFF26}
-	EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "JUCE", "..\..\..\..\build\win32\vc8\JUCE.vcproj", "{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -24,14 +19,6 @@ Global
 		{050D65C2-17C4-4EE1-ABCE-BEA9DA83D77A}.DLL Release|Win32.Build.0 = Release|Win32
 		{050D65C2-17C4-4EE1-ABCE-BEA9DA83D77A}.Release|Win32.ActiveCfg = Release|Win32
 		{050D65C2-17C4-4EE1-ABCE-BEA9DA83D77A}.Release|Win32.Build.0 = Release|Win32
-		{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.Debug|Win32.ActiveCfg = Debug|Win32
-		{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.Debug|Win32.Build.0 = Debug|Win32
-		{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.DLL Debug|Win32.ActiveCfg = DLL Debug|Win32
-		{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.DLL Debug|Win32.Build.0 = DLL Debug|Win32
-		{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.DLL Release|Win32.ActiveCfg = DLL Release|Win32
-		{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.DLL Release|Win32.Build.0 = DLL Release|Win32
-		{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.Release|Win32.ActiveCfg = Release|Win32
-		{AE232C11-D91C-4CA1-B24E-8B11A52EFF26}.Release|Win32.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

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

@@ -264,6 +264,14 @@
 					/>
 				</FileConfiguration>
 			</File>
+			<File
+				RelativePath="..\..\src\juce_AppConfig.h"
+				>
+			</File>
+			<File
+				RelativePath="..\..\src\juce_LibrarySource.cpp"
+				>
+			</File>
 			<File
 				RelativePath="..\..\src\jucedemo_headers.h"
 				>

extras/juce demo/src/BinaryData.h

@@ -6,7 +6,7 @@
 namespace BinaryData
 {
     extern const char*  audiodemo_cpp;
-    const int           audiodemo_cppSize = 22793;
+    const int           audiodemo_cppSize = 23434;
 
     extern const char*  cello_wav;
     const int           cello_wavSize = 46348;
@@ -30,7 +30,7 @@ namespace BinaryData
     const int           juce_pngSize = 15290;
 
     extern const char*  opengldemo_cpp;
-    const int           opengldemo_cppSize = 9771;
+    const int           opengldemo_cppSize = 9667;
 
     extern const char*  pathsandtransformsdemo_cpp;
     const int           pathsandtransformsdemo_cppSize = 14231;

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

@@ -43,10 +43,6 @@
 #ifdef _WIN32
  #include <gl/gl.h>
  #include <gl/glu.h>
- #ifdef _MSC_VER
-  #pragma comment(lib, "OpenGL32.Lib")
-  #pragma comment(lib, "GlU32.Lib")
- #endif
 #elif defined (LINUX)
  #include <GL/gl.h>
  #include <GL/glut.h>

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

@@ -1,129 +1,129 @@
-/*
-  ==============================================================================
-
-   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"
-
-#if JUCE_QUICKTIME && ! JUCE_LINUX
-
-//==============================================================================
-// so that we can easily have two QT windows each with a file browser, wrap this up as a class..
-class QuickTimeWindowWithFileBrowser  : public Component,
-                                        public FilenameComponentListener
-{
-public:
-    QuickTimeWindowWithFileBrowser()
-    {
-        addAndMakeVisible (qtComp = new QuickTimeMovieComponent());
-
-        // and a file-chooser..
-        addAndMakeVisible (fileChooser = new FilenameComponent (T("movie"),
-                                                                File::nonexistent,
-                                                                true, false, false,
-                                                                T("*.*"),
-                                                                String::empty,
-                                                                T("(choose a video file to play)")));
-        fileChooser->addListener (this);
-        fileChooser->setBrowseButtonText (T("browse"));
-    }
-
-    ~QuickTimeWindowWithFileBrowser()
-    {
-        deleteAllChildren();
-    }
-
-    void resized()
-    {
-        qtComp->setBounds (0, 0, getWidth(), getHeight() - 30);
-        fileChooser->setBounds (0, getHeight() - 24, getWidth(), 24);
-    }
-
-    void filenameComponentChanged (FilenameComponent*)
-    {
-        // this is called when the user changes the filename in the file chooser box
-        if (qtComp->loadMovie (fileChooser->getCurrentFile(), true))
-        {
-            // loaded the file ok, so let's start it playing..
-
-            qtComp->play();
-        }
-        else
-        {
-            AlertWindow::showMessageBox (AlertWindow::WarningIcon,
-                                         T("Couldn't load the file!"),
-                                         T("Sorry, QuickTime didn't manage to load that file!"));
-        }
-    }
-
-private:
-    QuickTimeMovieComponent* qtComp;
-    FilenameComponent* fileChooser;
-};
-
-
-//==============================================================================
-class QuickTimeDemo  : public Component
-{
-public:
-    //==============================================================================
-    QuickTimeDemo()
-    {
-        setName (T("QuickTime"));
-
-        // add a movie component..
-        addAndMakeVisible (qtComp1 = new QuickTimeWindowWithFileBrowser());
-        addAndMakeVisible (qtComp2 = new QuickTimeWindowWithFileBrowser());
-    }
-
-    ~QuickTimeDemo()
-    {
-        deleteAllChildren();
-    }
-
-    void resized()
-    {
-        qtComp1->setBoundsRelative (0.05f, 0.05f, 0.425f, 0.9f);
-        qtComp2->setBoundsRelative (0.525f, 0.05f, 0.425f, 0.9f);
-    }
-
-private:
-    //==============================================================================
-    QuickTimeWindowWithFileBrowser* qtComp1;
-    QuickTimeWindowWithFileBrowser* qtComp2;
-};
-
-
-//==============================================================================
-Component* createQuickTimeDemo()
-{
-    return new QuickTimeDemo();
-}
-
-#endif
+/*
+  ==============================================================================
+
+   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"
+
+#if JUCE_QUICKTIME && ! JUCE_LINUX
+
+//==============================================================================
+// so that we can easily have two QT windows each with a file browser, wrap this up as a class..
+class QuickTimeWindowWithFileBrowser  : public Component,
+                                        public FilenameComponentListener
+{
+public:
+    QuickTimeWindowWithFileBrowser()
+    {
+        addAndMakeVisible (qtComp = new QuickTimeMovieComponent());
+
+        // and a file-chooser..
+        addAndMakeVisible (fileChooser = new FilenameComponent (T("movie"),
+                                                                File::nonexistent,
+                                                                true, false, false,
+                                                                T("*.*"),
+                                                                String::empty,
+                                                                T("(choose a video file to play)")));
+        fileChooser->addListener (this);
+        fileChooser->setBrowseButtonText (T("browse"));
+    }
+
+    ~QuickTimeWindowWithFileBrowser()
+    {
+        deleteAllChildren();
+    }
+
+    void resized()
+    {
+        qtComp->setBounds (0, 0, getWidth(), getHeight() - 30);
+        fileChooser->setBounds (0, getHeight() - 24, getWidth(), 24);
+    }
+
+    void filenameComponentChanged (FilenameComponent*)
+    {
+        // this is called when the user changes the filename in the file chooser box
+        if (qtComp->loadMovie (fileChooser->getCurrentFile(), true))
+        {
+            // loaded the file ok, so let's start it playing..
+
+            qtComp->play();
+        }
+        else
+        {
+            AlertWindow::showMessageBox (AlertWindow::WarningIcon,
+                                         T("Couldn't load the file!"),
+                                         T("Sorry, QuickTime didn't manage to load that file!"));
+        }
+    }
+
+private:
+    QuickTimeMovieComponent* qtComp;
+    FilenameComponent* fileChooser;
+};
+
+
+//==============================================================================
+class QuickTimeDemo  : public Component
+{
+public:
+    //==============================================================================
+    QuickTimeDemo()
+    {
+        setName (T("QuickTime"));
+
+        // add a movie component..
+        addAndMakeVisible (qtComp1 = new QuickTimeWindowWithFileBrowser());
+        addAndMakeVisible (qtComp2 = new QuickTimeWindowWithFileBrowser());
+    }
+
+    ~QuickTimeDemo()
+    {
+        deleteAllChildren();
+    }
+
+    void resized()
+    {
+        qtComp1->setBoundsRelative (0.05f, 0.05f, 0.425f, 0.9f);
+        qtComp2->setBoundsRelative (0.525f, 0.05f, 0.425f, 0.9f);
+    }
+
+private:
+    //==============================================================================
+    QuickTimeWindowWithFileBrowser* qtComp1;
+    QuickTimeWindowWithFileBrowser* qtComp2;
+};
+
+
+//==============================================================================
+Component* createQuickTimeDemo()
+{
+    return new QuickTimeDemo();
+}
+
+#endif

extras/juce demo/src/juce_AppConfig.h

@@ -0,0 +1,58 @@
+/*
+  ==============================================================================
+
+   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 contains settings that you might want to explicitly apply to 
+    the your 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.
+*/
+
+//#define JUCE_ONLY_BUILD_CORE_LIBRARY   1
+//#define JUCE_FORCE_DEBUG  1
+//#define JUCE_LOG_ASSERTIONS  1
+//#define JUCE_ASIO  1
+//#define JUCE_ALSA  1
+//#define JUCE_QUICKTIME  1
+//#define JUCE_OPENGL  1
+//#define JUCE_USE_FLAC  1
+//#define JUCE_USE_OGGVORBIS  1
+//#define JUCE_USE_CDBURNER  1
+//#define JUCE_ENABLE_REPAINT_DEBUGGING  1
+//#define JUCE_USE_XINERAMA  1
+//#define JUCE_USE_XSHM  1
+//#define JUCE_PLUGINHOST_VST  1
+//#define JUCE_PLUGINHOST_AU  1
+//#define JUCE_BUILD_GUI_CLASSES  1
+//#define JUCE_CHECK_MEMORY_LEAKS  1
+//#define JUCE_CATCH_UNHANDLED_EXCEPTIONS  1
+//#define JUCE_STRINGS_ARE_UNICODE  1

extras/juce demo/src/juce_LibrarySource.cpp

@@ -0,0 +1,12 @@
+
+/* 
+    This file includes the entire juce source tree via the amalgamated file.
+
+    You could add the amalgamated file directly to your project, but doing it
+    like this allows you to put your app's config settings in the 
+    juce_AppConfig.h file and have them applied to both the juce headers and 
+    the source code.
+*/
+
+#include "juce_AppConfig.h"
+#include "../../../juce_amalgamated.cpp"

extras/juce demo/src/juce_LibrarySource.mm

@@ -0,0 +1,12 @@
+
+/* 
+    This file includes the entire juce source tree via the amalgamated file.
+
+    You could add the amalgamated file directly to your project, but doing it
+    like this allows you to put your app's config settings in the 
+    juce_AppConfig.h file and have them applied to both the juce headers and 
+    the source code.
+*/
+
+#include "juce_AppConfig.h"
+#include "../../../juce_amalgamated.mm"

extras/juce demo/src/jucedemo_headers.h

@@ -32,9 +32,15 @@
 #ifndef __JUCEDEMO_HEADERS_JUCEHEADER__
 #define __JUCEDEMO_HEADERS_JUCEHEADER__
 
-
 // include the JUCE headers..
-#include "../../../juce.h"
+#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