Changed the way module code is wrapped by the Introjucer.

extras/Introjucer/Builds/Linux/Makefile

@@ -17,12 +17,12 @@ ifeq ($(CONFIG),Debug)
   LIBDIR := build
   OBJDIR := build/intermediate/Debug
   OUTDIR := build
-  CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "/usr/include" -I "/usr/include/freetype2"
+  CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "/usr/include" -I "/usr/include/freetype2" -I "../../JuceLibraryCode"
   CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0
   CXXFLAGS += $(CFLAGS) 
   LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L"/usr/X11R6/lib/" -L"../../../../../juce/bin" -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound 
   LDDEPS :=
-  RESFLAGS :=  -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "/usr/include" -I "/usr/include/freetype2"
+  RESFLAGS :=  -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "/usr/include" -I "/usr/include/freetype2" -I "../../JuceLibraryCode"
   TARGET := Introjucer
   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
 endif
@@ -32,12 +32,12 @@ ifeq ($(CONFIG),Release)
   LIBDIR := build
   OBJDIR := build/intermediate/Release
   OUTDIR := build
-  CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "/usr/include" -I "/usr/include/freetype2"
+  CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "/usr/include" -I "/usr/include/freetype2" -I "../../JuceLibraryCode"
   CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3
   CXXFLAGS += $(CFLAGS) 
   LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L"/usr/X11R6/lib/" -L"../../../../../juce/bin" -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound 
   LDDEPS :=
-  RESFLAGS :=  -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "/usr/include" -I "/usr/include/freetype2"
+  RESFLAGS :=  -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "/usr/include" -I "/usr/include/freetype2" -I "../../JuceLibraryCode"
   TARGET := Introjucer
   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
 endif
@@ -68,14 +68,14 @@ OBJECTS := \
   $(OBJDIR)/jucer_MiscUtilities_25b68c82.o \
   $(OBJDIR)/jucer_StoredSettings_26078d2c.o \
   $(OBJDIR)/BinaryData_ce4232d4.o \
-  $(OBJDIR)/juce_audio_basics_wrapper_e4aa31f5.o \
-  $(OBJDIR)/juce_core_wrapper_b07ed786.o \
-  $(OBJDIR)/juce_cryptography_wrapper_8b556353.o \
-  $(OBJDIR)/juce_data_structures_wrapper_4f7fd480.o \
-  $(OBJDIR)/juce_events_wrapper_a8dc8280.o \
-  $(OBJDIR)/juce_graphics_wrapper_a0e77172.o \
-  $(OBJDIR)/juce_gui_basics_wrapper_e00f2ff0.o \
-  $(OBJDIR)/juce_gui_extra_wrapper_b6e18277.o \
+  $(OBJDIR)/juce_audio_basics_399a455e.o \
+  $(OBJDIR)/juce_core_1ee54a40.o \
+  $(OBJDIR)/juce_cryptography_3b1f489a.o \
+  $(OBJDIR)/juce_data_structures_84790dfc.o \
+  $(OBJDIR)/juce_events_584896b4.o \
+  $(OBJDIR)/juce_graphics_f9afc18.o \
+  $(OBJDIR)/juce_gui_basics_90929794.o \
+  $(OBJDIR)/juce_gui_extra_b81d9e1c.o \
 
 .PHONY: clean
 
@@ -217,44 +217,44 @@ $(OBJDIR)/BinaryData_ce4232d4.o: ../../JuceLibraryCode/BinaryData.cpp
 	@echo "Compiling BinaryData.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_audio_basics_wrapper_e4aa31f5.o: ../../JuceLibraryCode/juce_audio_basics_wrapper.cpp
+$(OBJDIR)/juce_audio_basics_399a455e.o: ../../../../modules/juce_audio_basics/juce_audio_basics.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_audio_basics_wrapper.cpp"
+	@echo "Compiling juce_audio_basics.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_core_wrapper_b07ed786.o: ../../JuceLibraryCode/juce_core_wrapper.cpp
+$(OBJDIR)/juce_core_1ee54a40.o: ../../../../modules/juce_core/juce_core.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_core_wrapper.cpp"
+	@echo "Compiling juce_core.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_cryptography_wrapper_8b556353.o: ../../JuceLibraryCode/juce_cryptography_wrapper.cpp
+$(OBJDIR)/juce_cryptography_3b1f489a.o: ../../../../modules/juce_cryptography/juce_cryptography.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_cryptography_wrapper.cpp"
+	@echo "Compiling juce_cryptography.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_data_structures_wrapper_4f7fd480.o: ../../JuceLibraryCode/juce_data_structures_wrapper.cpp
+$(OBJDIR)/juce_data_structures_84790dfc.o: ../../../../modules/juce_data_structures/juce_data_structures.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_data_structures_wrapper.cpp"
+	@echo "Compiling juce_data_structures.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_events_wrapper_a8dc8280.o: ../../JuceLibraryCode/juce_events_wrapper.cpp
+$(OBJDIR)/juce_events_584896b4.o: ../../../../modules/juce_events/juce_events.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_events_wrapper.cpp"
+	@echo "Compiling juce_events.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_graphics_wrapper_a0e77172.o: ../../JuceLibraryCode/juce_graphics_wrapper.cpp
+$(OBJDIR)/juce_graphics_f9afc18.o: ../../../../modules/juce_graphics/juce_graphics.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_graphics_wrapper.cpp"
+	@echo "Compiling juce_graphics.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_gui_basics_wrapper_e00f2ff0.o: ../../JuceLibraryCode/juce_gui_basics_wrapper.cpp
+$(OBJDIR)/juce_gui_basics_90929794.o: ../../../../modules/juce_gui_basics/juce_gui_basics.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_gui_basics_wrapper.cpp"
+	@echo "Compiling juce_gui_basics.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_gui_extra_wrapper_b6e18277.o: ../../JuceLibraryCode/juce_gui_extra_wrapper.cpp
+$(OBJDIR)/juce_gui_extra_b81d9e1c.o: ../../../../modules/juce_gui_extra/juce_gui_extra.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_gui_extra_wrapper.cpp"
+	@echo "Compiling juce_gui_extra.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 -include $(OBJECTS:%.o=%.d)

extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj

@@ -32,7 +32,7 @@
             Optimization="0"
             BufferSecurityCheck=""
             DebugInformationFormat="4"
-            AdditionalIncludeDirectories=""
+            AdditionalIncludeDirectories="..\..\JuceLibraryCode"
             PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2005_78A5003=1"
             RuntimeLibrary="1"
             RuntimeTypeInfo="true"
@@ -88,7 +88,7 @@
             Optimization="3"
             InlineFunctionExpansion="1"
             StringPooling="true"
-            AdditionalIncludeDirectories=""
+            AdditionalIncludeDirectories="..\..\JuceLibraryCode"
             PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2005_78A5003=1"
             RuntimeLibrary="0"
             RuntimeTypeInfo="true"
@@ -153,7 +153,6 @@
         <File RelativePath="..\..\Source\Project\jucer_AudioPluginModule.h"/>
         <File RelativePath="..\..\Source\Project\jucer_GroupInformationComponent.cpp"/>
         <File RelativePath="..\..\Source\Project\jucer_GroupInformationComponent.h"/>
-        <File RelativePath="..\..\Source\Project\jucer_JuceLibraryModule.h"/>
         <File RelativePath="..\..\Source\Project\jucer_Module.cpp"/>
         <File RelativePath="..\..\Source\Project\jucer_Module.h"/>
         <File RelativePath="..\..\Source\Project\jucer_NewFileWizard.cpp"/>
@@ -3744,14 +3743,14 @@
       <File RelativePath="..\..\JuceLibraryCode\AppConfig.h"/>
       <File RelativePath="..\..\JuceLibraryCode\BinaryData.cpp"/>
       <File RelativePath="..\..\JuceLibraryCode\BinaryData.h"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_audio_basics_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_core_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_cryptography_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_data_structures_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_events_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_graphics_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_gui_basics_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_gui_extra_wrapper.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_audio_basics\juce_audio_basics.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_core\juce_core.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_cryptography\juce_cryptography.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_data_structures\juce_data_structures.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_events\juce_events.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_graphics\juce_graphics.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_gui_basics\juce_gui_basics.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_gui_extra\juce_gui_extra.cpp"/>
       <File RelativePath="..\..\JuceLibraryCode\JuceHeader.h"/>
       <File RelativePath="icon.ico"/>
       <File RelativePath="resources.rc"/>

extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj

@@ -32,7 +32,7 @@
             Optimization="0"
             BufferSecurityCheck=""
             DebugInformationFormat="4"
-            AdditionalIncludeDirectories=""
+            AdditionalIncludeDirectories="..\..\JuceLibraryCode"
             PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2008_78A5006=1"
             RuntimeLibrary="1"
             RuntimeTypeInfo="true"
@@ -88,7 +88,7 @@
             Optimization="3"
             InlineFunctionExpansion="1"
             StringPooling="true"
-            AdditionalIncludeDirectories=""
+            AdditionalIncludeDirectories="..\..\JuceLibraryCode"
             PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2008_78A5006=1"
             RuntimeLibrary="0"
             RuntimeTypeInfo="true"
@@ -153,7 +153,6 @@
         <File RelativePath="..\..\Source\Project\jucer_AudioPluginModule.h"/>
         <File RelativePath="..\..\Source\Project\jucer_GroupInformationComponent.cpp"/>
         <File RelativePath="..\..\Source\Project\jucer_GroupInformationComponent.h"/>
-        <File RelativePath="..\..\Source\Project\jucer_JuceLibraryModule.h"/>
         <File RelativePath="..\..\Source\Project\jucer_Module.cpp"/>
         <File RelativePath="..\..\Source\Project\jucer_Module.h"/>
         <File RelativePath="..\..\Source\Project\jucer_NewFileWizard.cpp"/>
@@ -3744,14 +3743,14 @@
       <File RelativePath="..\..\JuceLibraryCode\AppConfig.h"/>
       <File RelativePath="..\..\JuceLibraryCode\BinaryData.cpp"/>
       <File RelativePath="..\..\JuceLibraryCode\BinaryData.h"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_audio_basics_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_core_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_cryptography_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_data_structures_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_events_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_graphics_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_gui_basics_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_gui_extra_wrapper.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_audio_basics\juce_audio_basics.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_core\juce_core.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_cryptography\juce_cryptography.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_data_structures\juce_data_structures.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_events\juce_events.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_graphics\juce_graphics.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_gui_basics\juce_gui_basics.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_gui_extra\juce_gui_extra.cpp"/>
       <File RelativePath="..\..\JuceLibraryCode\JuceHeader.h"/>
       <File RelativePath="icon.ico"/>
       <File RelativePath="resources.rc"/>

extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj

@@ -53,7 +53,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\JuceLibraryCode;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2010_78A501D=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -91,7 +91,7 @@
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\JuceLibraryCode;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;JUCER_VS2010_78A501D=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -1014,14 +1014,14 @@
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\JuceLibraryCode\BinaryData.cpp"/>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_audio_basics_wrapper.cpp"/>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_core_wrapper.cpp"/>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_cryptography_wrapper.cpp"/>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_data_structures_wrapper.cpp"/>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_events_wrapper.cpp"/>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_graphics_wrapper.cpp"/>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_gui_basics_wrapper.cpp"/>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_gui_extra_wrapper.cpp"/>
+    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\juce_audio_basics.cpp"/>
+    <ClCompile Include="..\..\..\..\modules\juce_core\juce_core.cpp"/>
+    <ClCompile Include="..\..\..\..\modules\juce_cryptography\juce_cryptography.cpp"/>
+    <ClCompile Include="..\..\..\..\modules\juce_data_structures\juce_data_structures.cpp"/>
+    <ClCompile Include="..\..\..\..\modules\juce_events\juce_events.cpp"/>
+    <ClCompile Include="..\..\..\..\modules\juce_graphics\juce_graphics.cpp"/>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\juce_gui_basics.cpp"/>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_extra\juce_gui_extra.cpp"/>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Source\Application\jucer_Application.h"/>
@@ -1036,7 +1036,6 @@
     <ClInclude Include="..\..\Source\Code Editor\jucer_SourceCodeEditor.h"/>
     <ClInclude Include="..\..\Source\Project\jucer_AudioPluginModule.h"/>
     <ClInclude Include="..\..\Source\Project\jucer_GroupInformationComponent.h"/>
-    <ClInclude Include="..\..\Source\Project\jucer_JuceLibraryModule.h"/>
     <ClInclude Include="..\..\Source\Project\jucer_Module.h"/>
     <ClInclude Include="..\..\Source\Project\jucer_NewFileWizard.h"/>
     <ClInclude Include="..\..\Source\Project\jucer_NewProjectWizard.h"/>

extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters

@@ -1282,28 +1282,28 @@
     <ClCompile Include="..\..\JuceLibraryCode\BinaryData.cpp">
       <Filter>Juce Library Code</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_audio_basics_wrapper.cpp">
+    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\juce_audio_basics.cpp">
       <Filter>Juce Library Code</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_core_wrapper.cpp">
+    <ClCompile Include="..\..\..\..\modules\juce_core\juce_core.cpp">
       <Filter>Juce Library Code</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_cryptography_wrapper.cpp">
+    <ClCompile Include="..\..\..\..\modules\juce_cryptography\juce_cryptography.cpp">
       <Filter>Juce Library Code</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_data_structures_wrapper.cpp">
+    <ClCompile Include="..\..\..\..\modules\juce_data_structures\juce_data_structures.cpp">
       <Filter>Juce Library Code</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_events_wrapper.cpp">
+    <ClCompile Include="..\..\..\..\modules\juce_events\juce_events.cpp">
       <Filter>Juce Library Code</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_graphics_wrapper.cpp">
+    <ClCompile Include="..\..\..\..\modules\juce_graphics\juce_graphics.cpp">
       <Filter>Juce Library Code</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_gui_basics_wrapper.cpp">
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\juce_gui_basics.cpp">
       <Filter>Juce Library Code</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_gui_extra_wrapper.cpp">
+    <ClCompile Include="..\..\..\..\modules\juce_gui_extra\juce_gui_extra.cpp">
       <Filter>Juce Library Code</Filter>
     </ClCompile>
   </ItemGroup>
@@ -1344,9 +1344,6 @@
     <ClInclude Include="..\..\Source\Project\jucer_GroupInformationComponent.h">
       <Filter>The Introjucer\Project</Filter>
     </ClInclude>
-    <ClInclude Include="..\..\Source\Project\jucer_JuceLibraryModule.h">
-      <Filter>The Introjucer\Project</Filter>
-    </ClInclude>
     <ClInclude Include="..\..\Source\Project\jucer_Module.h">
       <Filter>The Introjucer\Project</Filter>
     </ClInclude>

extras/Introjucer/Introjucer.jucer

@@ -74,8 +74,6 @@
             resource="0" file="Source/Project/jucer_GroupInformationComponent.cpp"/>
       <FILE id="sQjHbVN" name="jucer_GroupInformationComponent.h" compile="0"
             resource="0" file="Source/Project/jucer_GroupInformationComponent.h"/>
-      <FILE id="HXGcY" name="jucer_JuceLibraryModule.h" compile="0" resource="0"
-            file="Source/Project/jucer_JuceLibraryModule.h"/>
       <FILE id="MJkOAX" name="jucer_Module.cpp" compile="1" resource="0"
             file="Source/Project/jucer_Module.cpp"/>
       <FILE id="VZmQQ6" name="jucer_Module.h" compile="0" resource="0" file="Source/Project/jucer_Module.h"/>

extras/Introjucer/JuceLibraryCode/AppConfig.h

@@ -10,6 +10,16 @@
 
 */
 
+//==============================================================================
+#define JUCE_MODULE_AVAILABLE_juce_audio_basics         1
+#define JUCE_MODULE_AVAILABLE_juce_core                 1
+#define JUCE_MODULE_AVAILABLE_juce_cryptography         1
+#define JUCE_MODULE_AVAILABLE_juce_data_structures      1
+#define JUCE_MODULE_AVAILABLE_juce_events               1
+#define JUCE_MODULE_AVAILABLE_juce_graphics             1
+#define JUCE_MODULE_AVAILABLE_juce_gui_basics           1
+#define JUCE_MODULE_AVAILABLE_juce_gui_extra            1
+
 //==============================================================================
 // juce_core flags:
 

extras/Introjucer/JuceLibraryCode/JuceHeader.h

@@ -27,7 +27,7 @@
 #if ! DONT_SET_USING_JUCE_NAMESPACE
  // If your code uses a lot of JUCE classes, then this will obviously save you
  // a lot of typing, but can be disabled by setting DONT_SET_USING_JUCE_NAMESPACE.
- using namespace JUCE_NAMESPACE;
+ using namespace juce;
 #endif
 
 namespace ProjectInfo

extras/Introjucer/JuceLibraryCode/juce_audio_basics_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_basics/juce_audio_basics.cpp"

extras/Introjucer/JuceLibraryCode/juce_audio_basics_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_basics/juce_audio_basics.cpp"

extras/Introjucer/JuceLibraryCode/juce_core_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_core/juce_core.cpp"

extras/Introjucer/JuceLibraryCode/juce_core_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_core/juce_core.cpp"

extras/Introjucer/JuceLibraryCode/juce_cryptography_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_cryptography/juce_cryptography.cpp"

extras/Introjucer/JuceLibraryCode/juce_cryptography_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_cryptography/juce_cryptography.cpp"

extras/Introjucer/JuceLibraryCode/juce_data_structures_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_data_structures/juce_data_structures.cpp"

extras/Introjucer/JuceLibraryCode/juce_data_structures_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_data_structures/juce_data_structures.cpp"

extras/Introjucer/JuceLibraryCode/juce_events_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_events/juce_events.cpp"

extras/Introjucer/JuceLibraryCode/juce_events_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_events/juce_events.cpp"

extras/Introjucer/JuceLibraryCode/juce_graphics_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_graphics/juce_graphics.cpp"

extras/Introjucer/JuceLibraryCode/juce_graphics_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_graphics/juce_graphics.cpp"

extras/Introjucer/JuceLibraryCode/juce_gui_basics_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_gui_basics/juce_gui_basics.cpp"

extras/Introjucer/JuceLibraryCode/juce_gui_basics_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_gui_basics/juce_gui_basics.cpp"

extras/Introjucer/JuceLibraryCode/juce_gui_extra_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_gui_extra/juce_gui_extra.cpp"

extras/Introjucer/JuceLibraryCode/juce_gui_extra_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_gui_extra/juce_gui_extra.cpp"

extras/Introjucer/Source/Project/jucer_AudioPluginModule.h

@@ -226,7 +226,7 @@ namespace RTASHelpers
                                 "xplat/AVX/avx2/avx2sdk/inc" };
 
             for (int i = 0; i < numElementsInArray (p); ++i)
-                exporter.extraSearchPaths.add (exporter.rebaseFromProjectFolderToBuildTarget (rtasFolder.getChildFile (p[i])).toWindowsStyle());
+                exporter.addToExtraSearchPaths (rtasFolder.getChildFile (p[i]));
         }
         else if (exporter.isXcode())
         {
@@ -263,7 +263,7 @@ namespace RTASHelpers
                                 "xplat/AVX/avx2/avx2sdk/utils" };
 
             for (int i = 0; i < numElementsInArray (p); ++i)
-                exporter.extraSearchPaths.add (exporter.rebaseFromProjectFolderToBuildTarget (rtasFolder.getChildFile (p[i])).toUnixStyle());
+                exporter.addToExtraSearchPaths (rtasFolder.getChildFile (p[i]));
         }
     }
 

extras/Introjucer/Source/Project/jucer_JuceLibraryModule.h

@@ -1,355 +0,0 @@
-/*
-  ==============================================================================
-
-   This file is part of the JUCE library - "Jules' Utility Class Extensions"
-   Copyright 2004-11 by Raw Material Software Ltd.
-
-  ------------------------------------------------------------------------------
-
-   JUCE can be redistributed and/or modified under the terms of the GNU General
-   Public License (Version 2), as published by the Free Software Foundation.
-   A copy of the license is included in the JUCE distribution, or can be found
-   online at www.gnu.org/licenses.
-
-   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.
-
-  ------------------------------------------------------------------------------
-
-   To release a closed-source product which uses JUCE, commercial licenses are
-   available: visit www.rawmaterialsoftware.com/juce for more information.
-
-  ==============================================================================
-*/
-
-#ifndef __JUCER_JUCELIBRARYMODULE_JUCEHEADER__
-#define __JUCER_JUCELIBRARYMODULE_JUCEHEADER__
-
-
-//==============================================================================
-class JuceLibraryModule  : public LibraryModule
-{
-public:
-    JuceLibraryModule (const File& file)
-        : moduleInfo (JSON::parse (file)),
-          moduleFile (file),
-          moduleFolder (file.getParentDirectory())
-    {
-        jassert (isValid());
-    }
-
-    String getID() const    { return moduleInfo ["id"].toString(); };
-    bool isValid() const    { return getID().isNotEmpty(); }
-
-    void writeIncludes (Project& project, OutputStream& out)
-    {
-        File header (getInclude());
-
-        StringArray paths, guards;
-        createMultipleIncludes (project, getPathToModuleFile (header),
-                                paths, guards);
-
-        ProjectSaver::writeGuardedInclude (out, paths, guards);
-    }
-
-    void prepareExporter (ProjectExporter& exporter, ProjectSaver& projectSaver) const
-    {
-        Project& project = exporter.getProject();
-
-        {
-            Array<File> compiled;
-            findAndAddCompiledCode (exporter, projectSaver, compiled);
-
-            if (project.shouldShowAllModuleFilesInProject (getID()).getValue())
-                addIncludedCode (exporter, compiled);
-        }
-
-        if (isVSTPluginHost (project))
-            VSTHelpers::addVSTFolderToPath (exporter, exporter.extraSearchPaths);
-
-        if (isAUPluginHost (project))
-            exporter.xcodeFrameworks.addTokens ("AudioUnit CoreAudioKit", false);
-
-        if (isPluginClient())
-        {
-            if (shouldBuildVST (project).getValue())   VSTHelpers::prepareExporter (exporter, projectSaver);
-            if (shouldBuildRTAS (project).getValue())  RTASHelpers::prepareExporter (exporter, projectSaver, moduleFolder);
-            if (shouldBuildAU (project).getValue())    AUHelpers::prepareExporter (exporter, projectSaver);
-        }
-    }
-
-    void createPropertyEditors (const ProjectExporter& exporter, Array <PropertyComponent*>& props) const
-    {
-        if (isVSTPluginHost (exporter.getProject()))
-            VSTHelpers::createVSTPathEditor (exporter, props);
-
-        if (isPluginClient())
-        {
-            if (shouldBuildVST (exporter.getProject()).getValue())   VSTHelpers::createPropertyEditors (exporter, props);
-            if (shouldBuildRTAS (exporter.getProject()).getValue())  RTASHelpers::createPropertyEditors (exporter, props);
-        }
-    }
-
-    void getConfigFlags (Project& project, OwnedArray<Project::ConfigFlag>& flags) const
-    {
-        const File header (getInclude());
-        jassert (header.exists());
-
-        StringArray lines;
-        header.readLines (lines);
-
-        for (int i = 0; i < lines.size(); ++i)
-        {
-            String line (lines[i].trim());
-
-            if (line.startsWith ("/**") && line.containsIgnoreCase ("Config:"))
-            {
-                ScopedPointer <Project::ConfigFlag> config (new Project::ConfigFlag());
-                config->sourceModuleID = getID();
-                config->symbol = line.fromFirstOccurrenceOf (":", false, false).trim();
-
-                if (config->symbol.length() > 2)
-                {
-                    ++i;
-
-                    while (! (lines[i].contains ("*/") || lines[i].contains ("@see")))
-                    {
-                        if (lines[i].trim().isNotEmpty())
-                            config->description = config->description.trim() + " " + lines[i].trim();
-
-                        ++i;
-                    }
-
-                    config->description = config->description.upToFirstOccurrenceOf ("*/", false, false);
-                    config->value.referTo (project.getConfigFlag (config->symbol));
-                    flags.add (config.release());
-                }
-            }
-        }
-    }
-
-    var moduleInfo;
-    File moduleFile, moduleFolder;
-
-private:
-    mutable Array<File> sourceFiles;
-
-    File getInclude() const
-    {
-        return moduleFolder.getChildFile (moduleInfo ["include"]);
-    }
-
-    String getPathToModuleFile (const File& file) const
-    {
-        return file.getRelativePathFrom (moduleFolder.getParentDirectory().getParentDirectory());
-    }
-
-    static bool fileTargetMatches (ProjectExporter& exporter, const String& target)
-    {
-        if (target == "xcode" && ! exporter.isXcode())
-            return false;
-
-        if (target == "msvc" && ! exporter.isVisualStudio())
-            return false;
-
-        return true;
-    }
-
-    struct FileSorter
-    {
-        static int compareElements (const File& f1, const File& f2)
-        {
-            return f1.getFileName().compareIgnoreCase (f2.getFileName());
-        }
-    };
-
-    void findWildcardMatches (const String& wildcardPath, Array<File>& result) const
-    {
-        String path (wildcardPath.upToLastOccurrenceOf ("/", false, false));
-        String wildCard (wildcardPath.fromLastOccurrenceOf ("/", false, false));
-
-        DirectoryIterator iter (moduleFolder.getChildFile (path), false, wildCard);
-
-        Array<File> tempList;
-
-        FileSorter sorter;
-        while (iter.next())
-            tempList.addSorted (sorter, iter.getFile());
-
-        result.addArray (tempList);
-    }
-
-    void getAllSourceFiles (Array<File>& result) const
-    {
-        const var filesArray (moduleInfo ["browse"]);
-        const Array<var>* const files = filesArray.getArray();
-
-        for (int i = 0; i < files->size(); ++i)
-            findWildcardMatches (files->getReference(i), result);
-    }
-
-    void addFileWithGroups (Project::Item group, const File& file, const String& path) const
-    {
-        const int slash = path.indexOfChar ('/');
-
-        if (slash >= 0)
-        {
-            const String topLevelGroup (path.substring (0, slash));
-            const String remainingPath (path.substring (slash + 1));
-
-            addFileWithGroups (group.getOrCreateSubGroup (topLevelGroup), file, remainingPath);
-        }
-        else
-        {
-            if (! group.findItemForFile (file).isValid())
-                group.addFileUnchecked (file, -1, false);
-        }
-    }
-
-    Project::Item addCompiledFile (const File& compiledFile, ProjectExporter& exporter, ProjectSaver& projectSaver) const
-    {
-        if (compiledFile.hasFileExtension ("cpp;cc;cxx;mm;m"))
-        {
-            MemoryOutputStream mem;
-            writeSourceWrapper (mem, exporter.getProject(),
-                                getPathToModuleFile (compiledFile));
-
-            String wrapperName (compiledFile.getFileNameWithoutExtension());
-            wrapperName << "_wrapper" << (exporter.usesMMFiles() ? ".mm" : ".cpp");
-
-            return projectSaver.saveGeneratedFile (wrapperName, mem);
-        }
-
-        return projectSaver.addFileToGeneratedGroup (compiledFile);
-    }
-
-    void findAndAddCompiledCode (ProjectExporter& exporter, ProjectSaver& projectSaver, Array<File>& result) const
-    {
-        const var compileArray (moduleInfo ["compile"]); // careful to keep this alive while the array is in use!
-        const Array<var>* const files = compileArray.getArray();
-
-        if (files != nullptr)
-        {
-            for (int i = 0; i < files->size(); ++i)
-            {
-                const var& file = files->getReference(i);
-                const String filename (file ["file"].toString());
-
-                if (filename.isNotEmpty()
-                     && fileTargetMatches (exporter, file ["target"].toString()))
-                {
-                    const File compiledFile (moduleFolder.getChildFile (filename));
-                    result.add (compiledFile);
-
-                    Project::Item item (addCompiledFile (compiledFile, exporter, projectSaver));
-
-                    if (file ["warnings"].toString().equalsIgnoreCase ("disabled"))
-                        item.getShouldInhibitWarningsValue() = true;
-
-                    if (file ["stdcall"])
-                        item.getShouldUseStdCallValue() = true;
-                }
-            }
-        }
-    }
-
-    void addIncludedCode (ProjectExporter& exporter, const Array<File>& compiled) const
-    {
-        if (sourceFiles.size() == 0)
-            getAllSourceFiles (sourceFiles);
-
-        Project::Item sourceGroup (Project::Item::createGroup (exporter.getProject(), getID(), "__mainsourcegroup" + getID()));
-
-        int i;
-        for (i = 0; i < sourceFiles.size(); ++i)
-            addFileWithGroups (sourceGroup, sourceFiles.getReference(i),
-                               sourceFiles.getReference(i).getRelativePathFrom (moduleFolder));
-
-        sourceGroup.addFile (moduleFile, -1, false);
-        sourceGroup.addFile (getInclude(), -1, false);
-
-        for (i = 0; i < compiled.size(); ++i)
-            addFileWithGroups (sourceGroup, compiled.getReference(i),
-                               compiled.getReference(i).getRelativePathFrom (moduleFolder));
-
-        exporter.getModulesGroup().getNode().addChild (sourceGroup.getNode().createCopy(), -1, nullptr);
-    }
-
-    static void writeSourceWrapper (OutputStream& out, Project& project, const String& pathFromJuceFolder)
-    {
-        const String appConfigFileName (project.getAppConfigFilename());
-
-        ProjectSaver::writeAutoGenWarningComment (out);
-
-        out << "    This file pulls in a module's source code, and builds it using the settings" << newLine
-            << "    defined in " << appConfigFileName << "." << newLine
-            << newLine
-            << "*/"
-            << newLine
-            << newLine
-            << "#define JUCE_WRAPPED_FILE 1" << newLine
-            << newLine
-            << CodeHelpers::createIncludeStatement (appConfigFileName) << newLine;
-
-        writeInclude (project, out, pathFromJuceFolder);
-    }
-
-    static void createMultipleIncludes (Project& project, const String& pathFromLibraryFolder,
-                                        StringArray& paths, StringArray& guards)
-    {
-        for (int i = project.getNumExporters(); --i >= 0;)
-        {
-            ScopedPointer <ProjectExporter> exporter (project.createExporter (i));
-
-            if (exporter != nullptr)
-            {
-                paths.add (exporter->getIncludePathForFileInJuceFolder (pathFromLibraryFolder, project.getAppIncludeFile()));
-                guards.add ("defined (" + exporter->getExporterIdentifierMacro() + ")");
-            }
-        }
-    }
-
-    static void writeInclude (Project& project, OutputStream& out, const String& pathFromJuceFolder)
-    {
-        StringArray paths, guards;
-        createMultipleIncludes (project, pathFromJuceFolder, paths, guards);
-
-        StringArray uniquePaths (paths);
-        uniquePaths.removeDuplicates (false);
-
-        if (uniquePaths.size() == 1)
-        {
-            out << "#include " << paths[0] << newLine;
-        }
-        else
-        {
-            int i = paths.size();
-            for (; --i >= 0;)
-            {
-                for (int j = i; --j >= 0;)
-                {
-                    if (paths[i] == paths[j] && guards[i] == guards[j])
-                    {
-                        paths.remove (i);
-                        guards.remove (i);
-                    }
-                }
-            }
-
-            for (i = 0; i < paths.size(); ++i)
-            {
-                out << (i == 0 ? "#if " : "#elif ") << guards[i] << newLine
-                    << " #include " << paths[i] << newLine;
-            }
-
-            out << "#endif" << newLine;
-        }
-    }
-
-    bool isPluginClient() const                          { return getID() == "juce_audio_plugin_client"; }
-    bool isAUPluginHost (const Project& project) const   { return getID() == "juce_audio_processors" && project.isConfigFlagEnabled ("JUCE_PLUGINHOST_AU"); }
-    bool isVSTPluginHost (const Project& project) const  { return getID() == "juce_audio_processors" && project.isConfigFlagEnabled ("JUCE_PLUGINHOST_VST"); }
-};
-
-#endif   // __JUCER_JUCELIBRARYMODULE_JUCEHEADER__

extras/Introjucer/Source/Project/jucer_Module.cpp

@@ -28,7 +28,6 @@
 #include "jucer_ProjectExporter.h"
 #include "jucer_ProjectSaver.h"
 #include "jucer_AudioPluginModule.h"
-#include "jucer_JuceLibraryModule.h"
 
 
 //==============================================================================
@@ -65,7 +64,7 @@ void ModuleList::rescan()
 
         if (moduleDef.exists())
         {
-            ScopedPointer<JuceLibraryModule> m (new JuceLibraryModule (moduleDef));
+            ScopedPointer<LibraryModule> m (new LibraryModule (moduleDef));
             jassert (m->isValid());
 
             if (m->isValid())
@@ -87,7 +86,7 @@ void ModuleList::rescan()
 
 LibraryModule* ModuleList::Module::create() const
 {
-    return new JuceLibraryModule (file);
+    return new LibraryModule (file);
 }
 
 LibraryModule* ModuleList::loadModule (const String& uid) const
@@ -108,8 +107,7 @@ const ModuleList::Module* ModuleList::findModuleInfo (const String& uid) const
 
 void ModuleList::getDependencies (const String& moduleID, StringArray& dependencies) const
 {
-    ScopedPointer<LibraryModule> lib (loadModule (moduleID));
-    JuceLibraryModule* m = dynamic_cast<JuceLibraryModule*> (static_cast <LibraryModule*> (lib));
+    ScopedPointer<LibraryModule> m (loadModule (moduleID));
 
     if (m != nullptr)
     {
@@ -134,8 +132,7 @@ void ModuleList::getDependencies (const String& moduleID, StringArray& dependenc
 
 void ModuleList::createDependencies (const String& moduleID, OwnedArray<LibraryModule>& modules) const
 {
-    ScopedPointer<LibraryModule> lib (loadModule (moduleID));
-    JuceLibraryModule* m = dynamic_cast<JuceLibraryModule*> (static_cast <LibraryModule*> (lib));
+    ScopedPointer<LibraryModule> m (loadModule (moduleID));
 
     if (m != nullptr)
     {
@@ -155,3 +152,305 @@ void ModuleList::createDependencies (const String& moduleID, OwnedArray<LibraryM
         }
     }
 }
+
+//==============================================================================
+LibraryModule::LibraryModule (const File& file)
+    : moduleInfo (JSON::parse (file)),
+      moduleFile (file),
+      moduleFolder (file.getParentDirectory())
+{
+    jassert (isValid());
+}
+
+String LibraryModule::getID() const    { return moduleInfo ["id"].toString(); };
+bool LibraryModule::isValid() const    { return getID().isNotEmpty(); }
+
+bool LibraryModule::isPluginClient() const                          { return getID() == "juce_audio_plugin_client"; }
+bool LibraryModule::isAUPluginHost (const Project& project) const   { return getID() == "juce_audio_processors" && project.isConfigFlagEnabled ("JUCE_PLUGINHOST_AU"); }
+bool LibraryModule::isVSTPluginHost (const Project& project) const  { return getID() == "juce_audio_processors" && project.isConfigFlagEnabled ("JUCE_PLUGINHOST_VST"); }
+
+void LibraryModule::writeIncludes (ProjectSaver& projectSaver, OutputStream& out)
+{
+    File header (getInclude (getModuleTargetFolder (projectSaver)));
+
+    StringArray paths, guards;
+    createMultipleIncludes (projectSaver.getProject(), getPathToModuleFile (projectSaver, header),
+                            paths, guards);
+
+    ProjectSaver::writeGuardedInclude (out, paths, guards);
+}
+
+void LibraryModule::prepareExporter (ProjectExporter& exporter, ProjectSaver& projectSaver) const
+{
+    Project& project = exporter.getProject();
+
+    File localFolder (getModuleTargetFolder (projectSaver));
+
+    if (localFolder != moduleFolder && ! localFolder.isDirectory())
+        moduleFolder.copyDirectoryTo (localFolder);
+    
+    {
+        Array<File> compiled;
+        findAndAddCompiledCode (exporter, projectSaver, localFolder, compiled);
+
+        if (project.shouldShowAllModuleFilesInProject (getID()).getValue())
+            addBrowsableCode (exporter, compiled, localFolder);
+    }
+
+    if (isVSTPluginHost (project))
+        VSTHelpers::addVSTFolderToPath (exporter, exporter.extraSearchPaths);
+
+    if (isAUPluginHost (project))
+        exporter.xcodeFrameworks.addTokens ("AudioUnit CoreAudioKit", false);
+
+    if (isPluginClient())
+    {
+        if (shouldBuildVST  (project).getValue())  VSTHelpers::prepareExporter (exporter, projectSaver);
+        if (shouldBuildRTAS (project).getValue())  RTASHelpers::prepareExporter (exporter, projectSaver, localFolder);
+        if (shouldBuildAU   (project).getValue())  AUHelpers::prepareExporter (exporter, projectSaver);
+    }
+}
+
+void LibraryModule::createPropertyEditors (const ProjectExporter& exporter, Array <PropertyComponent*>& props) const
+{
+    if (isVSTPluginHost (exporter.getProject()))
+        VSTHelpers::createVSTPathEditor (exporter, props);
+
+    if (isPluginClient())
+    {
+        if (shouldBuildVST  (exporter.getProject()).getValue())  VSTHelpers::createPropertyEditors (exporter, props);
+        if (shouldBuildRTAS (exporter.getProject()).getValue())  RTASHelpers::createPropertyEditors (exporter, props);
+    }
+}
+
+void LibraryModule::getConfigFlags (Project& project, OwnedArray<Project::ConfigFlag>& flags) const
+{
+    const File header (getInclude (moduleFolder));
+    jassert (header.exists());
+
+    StringArray lines;
+    header.readLines (lines);
+
+    for (int i = 0; i < lines.size(); ++i)
+    {
+        String line (lines[i].trim());
+
+        if (line.startsWith ("/**") && line.containsIgnoreCase ("Config:"))
+        {
+            ScopedPointer <Project::ConfigFlag> config (new Project::ConfigFlag());
+            config->sourceModuleID = getID();
+            config->symbol = line.fromFirstOccurrenceOf (":", false, false).trim();
+
+            if (config->symbol.length() > 2)
+            {
+                ++i;
+
+                while (! (lines[i].contains ("*/") || lines[i].contains ("@see")))
+                {
+                    if (lines[i].trim().isNotEmpty())
+                        config->description = config->description.trim() + " " + lines[i].trim();
+
+                    ++i;
+                }
+
+                config->description = config->description.upToFirstOccurrenceOf ("*/", false, false);
+                config->value.referTo (project.getConfigFlag (config->symbol));
+                flags.add (config.release());
+            }
+        }
+    }
+}
+
+File LibraryModule::getModuleTargetFolder (ProjectSaver& projectSaver) const
+{
+    if (projectSaver.getProject().shouldCopyModuleFilesLocally (getID()).getValue())
+        return projectSaver.getGeneratedCodeFolder().getChildFile (getID());
+    
+    return moduleFolder;
+}
+
+File LibraryModule::getInclude (const File& folder) const
+{
+    return folder.getChildFile (moduleInfo ["include"]);
+}
+
+String LibraryModule::getPathToModuleFile (ProjectSaver& projectSaver, const File& file) const
+{
+    return file.getRelativePathFrom (getModuleTargetFolder (projectSaver).getParentDirectory().getParentDirectory());
+}
+
+bool LibraryModule::fileTargetMatches (ProjectExporter& exporter, const String& target)
+{
+    if (target.startsWithChar ('!'))
+        return ! fileTargetMatches (exporter, target.substring (1).trim());
+        
+    if (target == "xcode")  return exporter.isXcode();
+    if (target == "msvc")   return exporter.isVisualStudio();
+    if (target == "linux")  return exporter.isLinux();
+
+    return true;
+}
+
+void LibraryModule::findWildcardMatches (const File& localModuleFolder, const String& wildcardPath, Array<File>& result) const
+{
+    String path (wildcardPath.upToLastOccurrenceOf ("/", false, false));
+    String wildCard (wildcardPath.fromLastOccurrenceOf ("/", false, false));
+
+    Array<File> tempList;
+    FileSorter sorter;
+
+    DirectoryIterator iter (localModuleFolder.getChildFile (path), false, wildCard);
+    while (iter.next())
+        tempList.addSorted (sorter, iter.getFile());
+
+    result.addArray (tempList);
+}
+
+void LibraryModule::addFileWithGroups (Project::Item& group, const File& file, const String& path) const
+{
+    const int slash = path.indexOfChar ('/');
+
+    if (slash >= 0)
+    {
+        const String topLevelGroup (path.substring (0, slash));
+        const String remainingPath (path.substring (slash + 1));
+
+        Project::Item newGroup (group.getOrCreateSubGroup (topLevelGroup));
+        addFileWithGroups (newGroup, file, remainingPath);
+    }
+    else
+    {
+        if (! group.findItemForFile (file).isValid())
+            group.addFileUnchecked (file, -1, false);
+    }
+}
+
+void LibraryModule::findAndAddCompiledCode (ProjectExporter& exporter, ProjectSaver& projectSaver, 
+                                            const File& localModuleFolder, Array<File>& result) const
+{
+    const var compileArray (moduleInfo ["compile"]); // careful to keep this alive while the array is in use!
+    const Array<var>* const files = compileArray.getArray();
+
+    if (files != nullptr)
+    {
+        for (int i = 0; i < files->size(); ++i)
+        {
+            const var& file = files->getReference(i);
+            const String filename (file ["file"].toString());
+
+            if (filename.isNotEmpty()
+                 && fileTargetMatches (exporter, file ["target"].toString()))
+            {
+                const File compiledFile (localModuleFolder.getChildFile (filename));
+                result.add (compiledFile);
+
+                Project::Item item (projectSaver.addFileToGeneratedGroup (compiledFile));
+
+                if (file ["warnings"].toString().equalsIgnoreCase ("disabled"))
+                    item.getShouldInhibitWarningsValue() = true;
+
+                if (file ["stdcall"])
+                    item.getShouldUseStdCallValue() = true;
+            }
+        }
+    }
+}
+
+void LibraryModule::addBrowsableCode (ProjectExporter& exporter, const Array<File>& compiled, const File& localModuleFolder) const
+{
+    if (sourceFiles.size() == 0)
+    {
+        const var filesArray (moduleInfo ["browse"]);
+        const Array<var>* const files = filesArray.getArray();
+
+        for (int i = 0; i < files->size(); ++i)
+            findWildcardMatches (localModuleFolder, files->getReference(i), sourceFiles);
+    }
+
+    Project::Item sourceGroup (Project::Item::createGroup (exporter.getProject(), getID(), "__mainsourcegroup" + getID()));
+
+    int i;
+    for (i = 0; i < sourceFiles.size(); ++i)
+        addFileWithGroups (sourceGroup, sourceFiles.getReference(i),
+                           sourceFiles.getReference(i).getRelativePathFrom (localModuleFolder));
+
+    sourceGroup.addFile (localModuleFolder.getChildFile (moduleFile.getRelativePathFrom (moduleFolder)), -1, false);
+    sourceGroup.addFile (getInclude (localModuleFolder), -1, false);
+
+    for (i = 0; i < compiled.size(); ++i)
+        addFileWithGroups (sourceGroup, compiled.getReference(i),
+                           compiled.getReference(i).getRelativePathFrom (localModuleFolder));
+
+    exporter.getModulesGroup().getNode().addChild (sourceGroup.getNode().createCopy(), -1, nullptr);
+}
+
+void LibraryModule::writeSourceWrapper (OutputStream& out, Project& project, const String& pathFromJuceFolder)
+{
+    const String appConfigFileName (project.getAppConfigFilename());
+
+    ProjectSaver::writeAutoGenWarningComment (out);
+
+    out << "    This file pulls in a module's source code, and builds it using the settings" << newLine
+        << "    defined in " << appConfigFileName << "." << newLine
+        << newLine
+        << "*/"
+        << newLine
+        << newLine
+        << "#define JUCE_WRAPPED_FILE 1" << newLine
+        << newLine
+        << CodeHelpers::createIncludeStatement (appConfigFileName) << newLine;
+
+    writeInclude (project, out, pathFromJuceFolder);
+}
+
+void LibraryModule::createMultipleIncludes (Project& project, const String& pathFromLibraryFolder,
+                                            StringArray& paths, StringArray& guards)
+{
+    for (int i = project.getNumExporters(); --i >= 0;)
+    {
+        ScopedPointer <ProjectExporter> exporter (project.createExporter (i));
+
+        if (exporter != nullptr)
+        {
+            paths.add (exporter->getIncludePathForFileInJuceFolder (pathFromLibraryFolder, project.getAppIncludeFile()));
+            guards.add ("defined (" + exporter->getExporterIdentifierMacro() + ")");
+        }
+    }
+}
+
+void LibraryModule::writeInclude (Project& project, OutputStream& out, const String& pathFromJuceFolder)
+{
+    StringArray paths, guards;
+    createMultipleIncludes (project, pathFromJuceFolder, paths, guards);
+
+    StringArray uniquePaths (paths);
+    uniquePaths.removeDuplicates (false);
+
+    if (uniquePaths.size() == 1)
+    {
+        out << "#include " << paths[0] << newLine;
+    }
+    else
+    {
+        int i = paths.size();
+        for (; --i >= 0;)
+        {
+            for (int j = i; --j >= 0;)
+            {
+                if (paths[i] == paths[j] && guards[i] == guards[j])
+                {
+                    paths.remove (i);
+                    guards.remove (i);
+                }
+            }
+        }
+
+        for (i = 0; i < paths.size(); ++i)
+        {
+            out << (i == 0 ? "#if " : "#elif ") << guards[i] << newLine
+                << " #include " << paths[i] << newLine;
+        }
+
+        out << "#endif" << newLine;
+    }
+}

extras/Introjucer/Source/Project/jucer_Module.h

@@ -35,14 +35,47 @@ class ProjectSaver;
 class LibraryModule
 {
 public:
-    LibraryModule() {}
-    virtual ~LibraryModule() {}
-
-    virtual String getID() const = 0;
-    virtual void prepareExporter (ProjectExporter&, ProjectSaver&) const = 0;
-    virtual void writeIncludes (Project&, OutputStream& out) = 0;
-    virtual void createPropertyEditors (const ProjectExporter&, Array <PropertyComponent*>&) const = 0;
-    virtual void getConfigFlags (Project&, OwnedArray<Project::ConfigFlag>&) const = 0;
+    LibraryModule (const File& file);
+
+    String getID() const; 
+    bool isValid() const;
+
+    void writeIncludes (ProjectSaver& projectSaver, OutputStream& out);
+    void prepareExporter (ProjectExporter& exporter, ProjectSaver& projectSaver) const;
+    void createPropertyEditors (const ProjectExporter& exporter, Array <PropertyComponent*>& props) const;
+    void getConfigFlags (Project& project, OwnedArray<Project::ConfigFlag>& flags) const;
+
+    var moduleInfo;
+
+private:
+    File moduleFile, moduleFolder;
+    mutable Array<File> sourceFiles;
+
+    File getInclude (const File& folder) const;
+    File getModuleTargetFolder (ProjectSaver& projectSaver) const;
+    String getPathToModuleFile (ProjectSaver& projectSaver, const File& file) const;
+    static bool fileTargetMatches (ProjectExporter& exporter, const String& target);
+
+    struct FileSorter
+    {
+        static int compareElements (const File& f1, const File& f2)
+        {
+            return f1.getFileName().compareIgnoreCase (f2.getFileName());
+        }
+    };
+
+    void findWildcardMatches (const File& localModuleFolder, const String& wildcardPath, Array<File>& result) const;
+    void addFileWithGroups (Project::Item& group, const File& file, const String& path) const;
+    void findAndAddCompiledCode (ProjectExporter& exporter, ProjectSaver& projectSaver, const File& localModuleFolder, Array<File>& result) const;
+    void addBrowsableCode (ProjectExporter& exporter, const Array<File>& compiled, const File& localModuleFolder) const;
+
+    static void writeSourceWrapper (OutputStream& out, Project& project, const String& pathFromJuceFolder);
+    static void createMultipleIncludes (Project& project, const String& pathFromLibraryFolder, StringArray& paths, StringArray& guards);
+    static void writeInclude (Project& project, OutputStream& out, const String& pathFromJuceFolder);
+
+    bool isPluginClient() const;
+    bool isAUPluginHost (const Project& project) const;
+    bool isVSTPluginHost (const Project& project) const;
 };
 
 //==============================================================================

extras/Introjucer/Source/Project/jucer_Project.cpp

@@ -494,8 +494,8 @@ bool Project::Item::shouldBeAddedToTargetProject() const
     return isFile();
 }
 
-bool Project::Item::shouldBeCompiled() const        { return getShouldCompileValue().getValue(); }
-Value Project::Item::getShouldCompileValue() const  { return node.getPropertyAsValue (Ids::compile, getUndoManager()); }
+bool Project::Item::shouldBeCompiled() const                { return getShouldCompileValue().getValue(); }
+Value Project::Item::getShouldCompileValue() const          { return node.getPropertyAsValue (Ids::compile, getUndoManager()); }
 
 bool Project::Item::shouldBeAddedToBinaryResources() const  { return getShouldAddToResourceValue().getValue(); }
 Value Project::Item::getShouldAddToResourceValue() const    { return node.getPropertyAsValue (Ids::resource, getUndoManager()); }
@@ -503,7 +503,6 @@ Value Project::Item::getShouldAddToResourceValue() const    { return node.getPro
 Value Project::Item::getShouldInhibitWarningsValue() const  { return node.getPropertyAsValue (Ids::noWarnings, getUndoManager()); }
 Value Project::Item::getShouldUseStdCallValue() const       { return node.getPropertyAsValue (Ids::useStdCall, nullptr); }
 
-
 String Project::Item::getFilePath() const
 {
     if (isFile())
@@ -838,6 +837,12 @@ Value Project::shouldShowAllModuleFilesInProject (const String& moduleID)
                            .getPropertyAsValue (Ids::showAllCode, getUndoManagerFor (getModulesNode()));
 }
 
+Value Project::shouldCopyModuleFilesLocally (const String& moduleID)
+{
+    return getModulesNode().getChildWithProperty (Ids::id_, moduleID)
+                           .getPropertyAsValue (Ids::useLocalCopy, getUndoManagerFor (getModulesNode()));
+}
+
 void Project::addModule (const String& moduleID)
 {
     if (! isModuleEnabled (moduleID))

extras/Introjucer/Source/Project/jucer_Project.h

@@ -270,6 +270,7 @@ public:
     //==============================================================================
     bool isModuleEnabled (const String& moduleID) const;
     Value shouldShowAllModuleFilesInProject (const String& moduleID);
+    Value shouldCopyModuleFilesLocally (const String& moduleID);
 
     void addModule (const String& moduleID);
     void removeModule (const String& moduleID);

extras/Introjucer/Source/Project/jucer_ProjectExport_XCode.h

@@ -725,7 +725,7 @@ private:
             sourceTree = "<absolute>";
         }
 
-        const String fileRefID (createID (pathString));
+        const String fileRefID (createFileRefID (pathString));
 
         ValueTree* v = new ValueTree (fileRefID);
         v->setProperty ("isa", "PBXFileReference", 0);
@@ -734,7 +734,7 @@ private:
         v->setProperty ("path", sanitisePath (pathString), 0);
         v->setProperty ("sourceTree", sourceTree, 0);
         pbxFileReferences.add (v);
-
+        
         return fileRefID;
     }
 
@@ -760,15 +760,18 @@ private:
 
     String addFile (const RelativePath& path, bool shouldBeCompiled, bool inhibitWarnings)
     {
+        const String pathAsString (path.toUnixStyle());
+        const String refID (addFileReference (path.toUnixStyle()));
+
         if (shouldBeCompiled)
         {
             if (path.hasFileExtension (".r"))
-                rezFileIDs.add (addBuildFile (path, false, inhibitWarnings));
+                rezFileIDs.add (addBuildFile (pathAsString, refID, false, inhibitWarnings));
             else
-                addBuildFile (path, true, inhibitWarnings);
+                addBuildFile (pathAsString, refID, true, inhibitWarnings);
         }
 
-        return addFileReference (path.toUnixStyle());
+        return refID;
     }
 
     String addProjectItem (const Project::Item& projectItem)
@@ -812,7 +815,7 @@ private:
     void addFramework (const String& frameworkName)
     {
         const String path ("System/Library/Frameworks/" + frameworkName + ".framework");
-        const String fileRefID (createID (path));
+        const String fileRefID (createFileRefID (path));
         addFileReference ("${SDKROOT}/" + path);
         frameworkIDs.add (addBuildFile (path, fileRefID, false, false));
         frameworkFileIDs.add (fileRefID);
@@ -990,6 +993,11 @@ private:
         return String (n, numElementsInArray (n));
     }
 
+    String createFileRefID (const String& path)
+    {
+        return createID ("__fileref_" + path);
+    }
+    
     String getIDForGroup (const Project::Item& item) const
     {
         return createID (item.getID());

extras/Introjucer/Source/Project/jucer_ProjectExporter.cpp

@@ -290,3 +290,11 @@ Project::Item& ProjectExporter::getModulesGroup()
 
     return *modulesGroup;
 }
+
+void ProjectExporter::addToExtraSearchPaths (const RelativePath& pathFromProjectFolder)
+{
+    RelativePath localPath (rebaseFromProjectFolderToBuildTarget (pathFromProjectFolder));
+
+    const String path (isVisualStudio() ? localPath.toWindowsStyle() : localPath.toUnixStyle());
+    extraSearchPaths.addIfNotAlreadyThere (path, false);
+}

extras/Introjucer/Source/Project/jucer_ProjectExporter.h

@@ -94,6 +94,7 @@ public:
     String getIncludePathForFileInJuceFolder (const String& pathFromJuceFolder, const File& targetIncludeFile) const;
 
     RelativePath rebaseFromProjectFolderToBuildTarget (const RelativePath& path) const;
+    void addToExtraSearchPaths (const RelativePath& pathFromProjectFolder);
 
     String getExporterIdentifierMacro() const
     {

extras/Introjucer/Source/Project/jucer_ProjectInformationComponent.cpp

@@ -145,11 +145,17 @@ public:
             }
 
             props.add (new BooleanPropertyComponent (project.shouldShowAllModuleFilesInProject (moduleID),
-                                                     "Show All Code", "Add entire module tree to target projects"));
+                                                     "Add source to project", "Make module files browsable in projects"));
             props.getLast()->setTooltip ("If this is enabled, then the entire source tree from this module will be shown inside your project, "
                                          "making it easy to browse/edit the module's classes. If disabled, then only the minimum number of files "
                                          "required to compile it will appear inside your project.");
 
+            props.add (new BooleanPropertyComponent (project.shouldCopyModuleFilesLocally (moduleID),
+                                                     "Create local copy", "Copy the module into the project folder"));
+            props.getLast()->setTooltip ("If this is enabled, then a local copy of the entire module will be made inside your project (in the auto-generated JuceLibraryFiles folder), "
+                                         "so that your project will be self-contained, and won't need to contain any references to files in other folders. "
+                                         "This also means that you can check the module into your source-control system to make sure it is always in sync with your own code.");
+    
             StringArray possibleValues;
             possibleValues.add ("(Use Default)");
             possibleValues.add ("Enabled");

extras/Introjucer/Source/Project/jucer_ProjectSaver.h

@@ -63,20 +63,23 @@ public:
 
         writeMainProjectFile();
 
+        OwnedArray<LibraryModule> modules;
+        project.createRequiredModules (ModuleList::getInstance(), modules);
+
         if (errors.size() == 0)
-            writeAppConfigFile();
+            writeAppConfigFile (modules);
 
         if (errors.size() == 0)
             writeBinaryDataFiles();
 
         if (errors.size() == 0)
-            writeAppHeader();
+            writeAppHeader (modules);
 
         if (errors.size() == 0)
-            writeProjects();
+            writeProjects (modules);
 
         if (errors.size() == 0)
-            writeAppConfigFile(); // (this is repeated in case the projects added anything to it)
+            writeAppConfigFile (modules); // (this is repeated in case the projects added anything to it)
 
         if (generatedCodeFolder.exists() && errors.size() == 0)
             writeReadmeFile();
@@ -168,6 +171,8 @@ public:
 
     static String getJuceCodeGroupName()                    { return "Juce Library Code"; }
 
+    File getGeneratedCodeFolder() const                     { return generatedCodeFolder; }
+    
 private:
     Project& project;
     const File projectFile, generatedCodeFolder;
@@ -204,7 +209,17 @@ private:
         }
     }
 
-    bool writeAppConfig (OutputStream& out)
+    static int findLongestModuleName (const OwnedArray<LibraryModule>& modules)
+    {
+        int longest = 0;
+
+        for (int i = modules.size(); --i >= 0;)
+            longest = jmax (longest, modules.getUnchecked(i)->getID().length());
+        
+        return longest;
+    }
+    
+    bool writeAppConfig (OutputStream& out, const OwnedArray<LibraryModule>& modules)
     {
         writeAutoGenWarningComment (out);
         out << "    If you want to change any of these values, use the Introjucer to do so," << newLine
@@ -214,10 +229,21 @@ private:
             << newLine
             << "*/" << newLine << newLine;
 
-        OwnedArray<LibraryModule> modules;
-        project.createRequiredModules (ModuleList::getInstance(), modules);
         bool anyFlags = false;
 
+        out << "//==============================================================================" << newLine;
+
+        const int longestName = findLongestModuleName (modules);
+
+        for (int k = 0; k < modules.size(); ++k)
+        {
+            LibraryModule* const m = modules.getUnchecked(k);
+            out << "#define JUCE_MODULE_AVAILABLE_" << m->getID() 
+                << String::repeatedString (" ", longestName + 5 - m->getID().length()) << " 1" << newLine;
+        }
+        
+        out << newLine;
+
         for (int j = 0; j < modules.size(); ++j)
         {
             LibraryModule* const m = modules.getUnchecked(j);
@@ -263,16 +289,16 @@ private:
         return anyFlags;
     }
 
-    void writeAppConfigFile()
+    void writeAppConfigFile (const OwnedArray<LibraryModule>& modules)
     {
         appConfigFile = generatedCodeFolder.getChildFile (project.getAppConfigFilename());
 
         MemoryOutputStream mem;
-        if (writeAppConfig (mem))
+        if (writeAppConfig (mem, modules))
             saveGeneratedFile (project.getAppConfigFilename(), mem);
     }
 
-    void writeAppHeader (OutputStream& out)
+    void writeAppHeader (OutputStream& out, const OwnedArray<LibraryModule>& modules)
     {
         writeAutoGenWarningComment (out);
 
@@ -290,13 +316,8 @@ private:
         if (appConfigFile.exists())
             out << CodeHelpers::createIncludeStatement (project.getAppConfigFilename()) << newLine;
 
-        {
-            OwnedArray<LibraryModule> modules;
-            project.createRequiredModules (ModuleList::getInstance(), modules);
-
-            for (int i = 0; i < modules.size(); ++i)
-                modules.getUnchecked(i)->writeIncludes (project, out);
-        }
+        for (int i = 0; i < modules.size(); ++i)
+            modules.getUnchecked(i)->writeIncludes (*this, out);
 
         if (binaryDataCpp.exists())
             out << CodeHelpers::createIncludeStatement (binaryDataCpp.withFileExtension (".h"), appConfigFile) << newLine;
@@ -318,10 +339,10 @@ private:
             << "#endif   // " << headerGuard << newLine;
     }
 
-    void writeAppHeader()
+    void writeAppHeader (const OwnedArray<LibraryModule>& modules)
     {
         MemoryOutputStream mem;
-        writeAppHeader (mem);
+        writeAppHeader (mem, modules);
         saveGeneratedFile (project.getJuceSourceHFilename(), mem);
     }
 
@@ -379,14 +400,11 @@ private:
             sortGroupRecursively (group.getChild(i));
     }
 
-    void writeProjects()
+    void writeProjects (const OwnedArray<LibraryModule>& modules)
     {
         // keep a copy of the basic generated files group, as each exporter may modify it.
         const ValueTree originalGeneratedGroup (generatedFilesGroup.getNode().createCopy());
 
-        OwnedArray<LibraryModule> modules;
-        project.createRequiredModules (ModuleList::getInstance(), modules);
-
         for (int i = project.getNumExporters(); --i >= 0;)
         {
             ScopedPointer <ProjectExporter> exporter (project.createExporter (i));
@@ -394,6 +412,8 @@ private:
 
             if (exporter->getTargetFolder().createDirectory())
             {
+                exporter->addToExtraSearchPaths (RelativePath ("JuceLibraryCode", RelativePath::projectFolder));
+
                 generatedFilesGroup.getNode() = originalGeneratedGroup.createCopy();
                 project.getProjectType().prepareExporter (*exporter);
 

extras/Introjucer/Source/Utility/jucer_MiscUtilities.cpp

@@ -256,9 +256,9 @@ void PropertyPanelWithTooltips::paint (Graphics& g)
     if (tl.getNumLines() > 3)
         tl.layout (getWidth() - 10, Justification::left, false); // too big, so just squash it in..
 
-    tl.drawWithin (g, 5, panel.getBottom() + 2, getWidth() - 10,
-                   getHeight() - panel.getBottom() - 4,
-                   Justification::centredLeft);
+    Rectangle<int> r (getTipArea());
+    tl.drawWithin (g, r.getX(), r.getY(), r.getWidth(), r.getHeight(),
+                   Justification::bottomLeft);
 }
 
 void PropertyPanelWithTooltips::resized()
@@ -266,6 +266,12 @@ void PropertyPanelWithTooltips::resized()
     panel.setBounds (0, 0, getWidth(), jmax (getHeight() - 60, proportionOfHeight (0.6f)));
 }
 
+Rectangle<int> PropertyPanelWithTooltips::getTipArea() const
+{
+    return Rectangle<int> (5, panel.getBottom() - 50, getWidth() - 10,
+                           getHeight() - (panel.getBottom() - 50) - 4);
+}
+
 void PropertyPanelWithTooltips::timerCallback()
 {
     Component* newComp = Desktop::getInstance().getMainMouseSource().getComponentUnderMouse();
@@ -282,7 +288,7 @@ void PropertyPanelWithTooltips::timerCallback()
         if (newTip != lastTip)
         {
             lastTip = newTip;
-            repaint (0, panel.getBottom(), getWidth(), getHeight());
+            repaint (getTipArea());
         }
     }
 }

extras/Introjucer/Source/Utility/jucer_MiscUtilities.h

@@ -68,6 +68,7 @@ private:
     Component* lastComp;
     String lastTip;
 
+    Rectangle<int> getTipArea() const;
     String findTip (Component* c);
 };
 

extras/Introjucer/Source/Utility/jucer_PresetIDs.h

@@ -119,6 +119,7 @@ namespace Ids
     DECLARE_ID (hidden);
     DECLARE_ID (useStdCall);
     DECLARE_ID (showAllCode);
+    DECLARE_ID (useLocalCopy);
     DECLARE_ID (androidSDKPath);
     DECLARE_ID (androidNDKPath);
     DECLARE_ID (androidInternetNeeded);

extras/JuceDemo/Builds/Android/jni/Android.mk

@@ -31,20 +31,20 @@ LOCAL_SRC_FILES := \
   ../../../Source/demos/WebBrowserDemo.cpp\
   ../../../Source/demos/WidgetsDemo.cpp\
   ../../../JuceLibraryCode/BinaryData.cpp\
-  ../../../JuceLibraryCode/juce_audio_basics_wrapper.cpp\
-  ../../../JuceLibraryCode/juce_audio_devices_wrapper.cpp\
-  ../../../JuceLibraryCode/juce_audio_formats_wrapper.cpp\
-  ../../../JuceLibraryCode/juce_audio_processors_wrapper.cpp\
-  ../../../JuceLibraryCode/juce_audio_utils_wrapper.cpp\
-  ../../../JuceLibraryCode/juce_core_wrapper.cpp\
-  ../../../JuceLibraryCode/juce_cryptography_wrapper.cpp\
-  ../../../JuceLibraryCode/juce_data_structures_wrapper.cpp\
-  ../../../JuceLibraryCode/juce_events_wrapper.cpp\
-  ../../../JuceLibraryCode/juce_graphics_wrapper.cpp\
-  ../../../JuceLibraryCode/juce_gui_basics_wrapper.cpp\
-  ../../../JuceLibraryCode/juce_gui_extra_wrapper.cpp\
-  ../../../JuceLibraryCode/juce_opengl_wrapper.cpp\
-  ../../../JuceLibraryCode/juce_video_wrapper.cpp\
+  ../../../../../modules/juce_audio_basics/juce_audio_basics.cpp\
+  ../../../../../modules/juce_audio_devices/juce_audio_devices.cpp\
+  ../../../../../modules/juce_audio_formats/juce_audio_formats.cpp\
+  ../../../../../modules/juce_audio_processors/juce_audio_processors.cpp\
+  ../../../../../modules/juce_audio_utils/juce_audio_utils.cpp\
+  ../../../../../modules/juce_core/juce_core.cpp\
+  ../../../../../modules/juce_cryptography/juce_cryptography.cpp\
+  ../../../../../modules/juce_data_structures/juce_data_structures.cpp\
+  ../../../../../modules/juce_events/juce_events.cpp\
+  ../../../../../modules/juce_graphics/juce_graphics.cpp\
+  ../../../../../modules/juce_gui_basics/juce_gui_basics.cpp\
+  ../../../../../modules/juce_gui_extra/juce_gui_extra.cpp\
+  ../../../../../modules/juce_opengl/juce_opengl.cpp\
+  ../../../../../modules/juce_video/juce_video.cpp\
 
 ifeq ($(CONFIG),Debug)
   LOCAL_CPPFLAGS += -fsigned-char -fexceptions -frtti -g -O0 -D "JUCE_ANDROID=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_ANDROID_7F0E4A25=1"

extras/JuceDemo/Builds/Linux/Makefile

@@ -17,12 +17,12 @@ ifeq ($(CONFIG),Debug)
   LIBDIR := build
   OBJDIR := build/intermediate/Debug
   OUTDIR := build
-  CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "/usr/include" -I "/usr/include/freetype2"
+  CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "/usr/include" -I "/usr/include/freetype2" -I "../../JuceLibraryCode"
   CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0
   CXXFLAGS += $(CFLAGS) 
   LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L"/usr/X11R6/lib/" -L"../../../../../juce/bin" -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound 
   LDDEPS :=
-  RESFLAGS :=  -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "/usr/include" -I "/usr/include/freetype2"
+  RESFLAGS :=  -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "/usr/include" -I "/usr/include/freetype2" -I "../../JuceLibraryCode"
   TARGET := JuceDemo
   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
 endif
@@ -32,12 +32,12 @@ ifeq ($(CONFIG),Release)
   LIBDIR := build
   OBJDIR := build/intermediate/Release
   OUTDIR := build
-  CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "/usr/include" -I "/usr/include/freetype2"
+  CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "/usr/include" -I "/usr/include/freetype2" -I "../../JuceLibraryCode"
   CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -Os
   CXXFLAGS += $(CFLAGS) 
   LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L"/usr/X11R6/lib/" -L"../../../../../juce/bin" -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound 
   LDDEPS :=
-  RESFLAGS :=  -D "LINUX=1" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "/usr/include" -I "/usr/include/freetype2"
+  RESFLAGS :=  -D "LINUX=1" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "/usr/include" -I "/usr/include/freetype2" -I "../../JuceLibraryCode"
   TARGET := JuceDemo
   BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH)
 endif
@@ -66,20 +66,20 @@ OBJECTS := \
   $(OBJDIR)/WebBrowserDemo_be24b7bf.o \
   $(OBJDIR)/WidgetsDemo_9419b474.o \
   $(OBJDIR)/BinaryData_ce4232d4.o \
-  $(OBJDIR)/juce_audio_basics_wrapper_e4aa31f5.o \
-  $(OBJDIR)/juce_audio_devices_wrapper_845aeedf.o \
-  $(OBJDIR)/juce_audio_formats_wrapper_994a82de.o \
-  $(OBJDIR)/juce_audio_processors_wrapper_a34d7091.o \
-  $(OBJDIR)/juce_audio_utils_wrapper_e9783ef3.o \
-  $(OBJDIR)/juce_core_wrapper_b07ed786.o \
-  $(OBJDIR)/juce_cryptography_wrapper_8b556353.o \
-  $(OBJDIR)/juce_data_structures_wrapper_4f7fd480.o \
-  $(OBJDIR)/juce_events_wrapper_a8dc8280.o \
-  $(OBJDIR)/juce_graphics_wrapper_a0e77172.o \
-  $(OBJDIR)/juce_gui_basics_wrapper_e00f2ff0.o \
-  $(OBJDIR)/juce_gui_extra_wrapper_b6e18277.o \
-  $(OBJDIR)/juce_opengl_wrapper_74bbb916.o \
-  $(OBJDIR)/juce_video_wrapper_fcc67966.o \
+  $(OBJDIR)/juce_audio_basics_399a455e.o \
+  $(OBJDIR)/juce_audio_devices_c1c9ba9c.o \
+  $(OBJDIR)/juce_audio_formats_f04b043c.o \
+  $(OBJDIR)/juce_audio_processors_eb9ae116.o \
+  $(OBJDIR)/juce_audio_utils_cf18005c.o \
+  $(OBJDIR)/juce_core_1ee54a40.o \
+  $(OBJDIR)/juce_cryptography_3b1f489a.o \
+  $(OBJDIR)/juce_data_structures_84790dfc.o \
+  $(OBJDIR)/juce_events_584896b4.o \
+  $(OBJDIR)/juce_graphics_f9afc18.o \
+  $(OBJDIR)/juce_gui_basics_90929794.o \
+  $(OBJDIR)/juce_gui_extra_b81d9e1c.o \
+  $(OBJDIR)/juce_opengl_1890bee0.o \
+  $(OBJDIR)/juce_video_86a19d3c.o \
 
 .PHONY: clean
 
@@ -211,74 +211,74 @@ $(OBJDIR)/BinaryData_ce4232d4.o: ../../JuceLibraryCode/BinaryData.cpp
 	@echo "Compiling BinaryData.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_audio_basics_wrapper_e4aa31f5.o: ../../JuceLibraryCode/juce_audio_basics_wrapper.cpp
+$(OBJDIR)/juce_audio_basics_399a455e.o: ../../../../modules/juce_audio_basics/juce_audio_basics.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_audio_basics_wrapper.cpp"
+	@echo "Compiling juce_audio_basics.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_audio_devices_wrapper_845aeedf.o: ../../JuceLibraryCode/juce_audio_devices_wrapper.cpp
+$(OBJDIR)/juce_audio_devices_c1c9ba9c.o: ../../../../modules/juce_audio_devices/juce_audio_devices.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_audio_devices_wrapper.cpp"
+	@echo "Compiling juce_audio_devices.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_audio_formats_wrapper_994a82de.o: ../../JuceLibraryCode/juce_audio_formats_wrapper.cpp
+$(OBJDIR)/juce_audio_formats_f04b043c.o: ../../../../modules/juce_audio_formats/juce_audio_formats.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_audio_formats_wrapper.cpp"
+	@echo "Compiling juce_audio_formats.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_audio_processors_wrapper_a34d7091.o: ../../JuceLibraryCode/juce_audio_processors_wrapper.cpp
+$(OBJDIR)/juce_audio_processors_eb9ae116.o: ../../../../modules/juce_audio_processors/juce_audio_processors.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_audio_processors_wrapper.cpp"
+	@echo "Compiling juce_audio_processors.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_audio_utils_wrapper_e9783ef3.o: ../../JuceLibraryCode/juce_audio_utils_wrapper.cpp
+$(OBJDIR)/juce_audio_utils_cf18005c.o: ../../../../modules/juce_audio_utils/juce_audio_utils.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_audio_utils_wrapper.cpp"
+	@echo "Compiling juce_audio_utils.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_core_wrapper_b07ed786.o: ../../JuceLibraryCode/juce_core_wrapper.cpp
+$(OBJDIR)/juce_core_1ee54a40.o: ../../../../modules/juce_core/juce_core.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_core_wrapper.cpp"
+	@echo "Compiling juce_core.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_cryptography_wrapper_8b556353.o: ../../JuceLibraryCode/juce_cryptography_wrapper.cpp
+$(OBJDIR)/juce_cryptography_3b1f489a.o: ../../../../modules/juce_cryptography/juce_cryptography.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_cryptography_wrapper.cpp"
+	@echo "Compiling juce_cryptography.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_data_structures_wrapper_4f7fd480.o: ../../JuceLibraryCode/juce_data_structures_wrapper.cpp
+$(OBJDIR)/juce_data_structures_84790dfc.o: ../../../../modules/juce_data_structures/juce_data_structures.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_data_structures_wrapper.cpp"
+	@echo "Compiling juce_data_structures.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_events_wrapper_a8dc8280.o: ../../JuceLibraryCode/juce_events_wrapper.cpp
+$(OBJDIR)/juce_events_584896b4.o: ../../../../modules/juce_events/juce_events.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_events_wrapper.cpp"
+	@echo "Compiling juce_events.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_graphics_wrapper_a0e77172.o: ../../JuceLibraryCode/juce_graphics_wrapper.cpp
+$(OBJDIR)/juce_graphics_f9afc18.o: ../../../../modules/juce_graphics/juce_graphics.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_graphics_wrapper.cpp"
+	@echo "Compiling juce_graphics.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_gui_basics_wrapper_e00f2ff0.o: ../../JuceLibraryCode/juce_gui_basics_wrapper.cpp
+$(OBJDIR)/juce_gui_basics_90929794.o: ../../../../modules/juce_gui_basics/juce_gui_basics.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_gui_basics_wrapper.cpp"
+	@echo "Compiling juce_gui_basics.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_gui_extra_wrapper_b6e18277.o: ../../JuceLibraryCode/juce_gui_extra_wrapper.cpp
+$(OBJDIR)/juce_gui_extra_b81d9e1c.o: ../../../../modules/juce_gui_extra/juce_gui_extra.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_gui_extra_wrapper.cpp"
+	@echo "Compiling juce_gui_extra.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_opengl_wrapper_74bbb916.o: ../../JuceLibraryCode/juce_opengl_wrapper.cpp
+$(OBJDIR)/juce_opengl_1890bee0.o: ../../../../modules/juce_opengl/juce_opengl.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_opengl_wrapper.cpp"
+	@echo "Compiling juce_opengl.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_video_wrapper_fcc67966.o: ../../JuceLibraryCode/juce_video_wrapper.cpp
+$(OBJDIR)/juce_video_86a19d3c.o: ../../../../modules/juce_video/juce_video.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_video_wrapper.cpp"
+	@echo "Compiling juce_video.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 -include $(OBJECTS:%.o=%.d)

extras/JuceDemo/Builds/VisualStudio2005/Juce Demo.vcproj

@@ -32,7 +32,7 @@
             Optimization="0"
             BufferSecurityCheck=""
             DebugInformationFormat="4"
-            AdditionalIncludeDirectories=""
+            AdditionalIncludeDirectories="..\..\JuceLibraryCode"
             PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2005_78A5003=1"
             RuntimeLibrary="1"
             RuntimeTypeInfo="true"
@@ -88,7 +88,7 @@
             Optimization="2"
             InlineFunctionExpansion="1"
             StringPooling="true"
-            AdditionalIncludeDirectories=""
+            AdditionalIncludeDirectories="..\..\JuceLibraryCode"
             PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2005_78A5003=1"
             RuntimeLibrary="0"
             RuntimeTypeInfo="true"
@@ -4464,20 +4464,20 @@
       <File RelativePath="..\..\JuceLibraryCode\AppConfig.h"/>
       <File RelativePath="..\..\JuceLibraryCode\BinaryData.cpp"/>
       <File RelativePath="..\..\JuceLibraryCode\BinaryData.h"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_audio_basics_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_audio_devices_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_audio_formats_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_audio_processors_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_audio_utils_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_core_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_cryptography_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_data_structures_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_events_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_graphics_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_gui_basics_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_gui_extra_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_opengl_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_video_wrapper.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_audio_basics\juce_audio_basics.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_audio_devices\juce_audio_devices.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_audio_formats\juce_audio_formats.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_audio_processors\juce_audio_processors.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_audio_utils\juce_audio_utils.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_core\juce_core.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_cryptography\juce_cryptography.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_data_structures\juce_data_structures.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_events\juce_events.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_graphics\juce_graphics.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_gui_basics\juce_gui_basics.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_gui_extra\juce_gui_extra.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_opengl\juce_opengl.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_video\juce_video.cpp"/>
       <File RelativePath="..\..\JuceLibraryCode\JuceHeader.h"/>
       <File RelativePath="icon.ico"/>
       <File RelativePath="resources.rc"/>

extras/JuceDemo/Builds/VisualStudio2008/Juce Demo.vcproj

@@ -32,7 +32,7 @@
             Optimization="0"
             BufferSecurityCheck=""
             DebugInformationFormat="4"
-            AdditionalIncludeDirectories=""
+            AdditionalIncludeDirectories="..\..\JuceLibraryCode"
             PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2008_78A5006=1"
             RuntimeLibrary="1"
             RuntimeTypeInfo="true"
@@ -88,7 +88,7 @@
             Optimization="2"
             InlineFunctionExpansion="1"
             StringPooling="true"
-            AdditionalIncludeDirectories=""
+            AdditionalIncludeDirectories="..\..\JuceLibraryCode"
             PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2008_78A5006=1"
             RuntimeLibrary="0"
             RuntimeTypeInfo="true"
@@ -4464,20 +4464,20 @@
       <File RelativePath="..\..\JuceLibraryCode\AppConfig.h"/>
       <File RelativePath="..\..\JuceLibraryCode\BinaryData.cpp"/>
       <File RelativePath="..\..\JuceLibraryCode\BinaryData.h"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_audio_basics_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_audio_devices_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_audio_formats_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_audio_processors_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_audio_utils_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_core_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_cryptography_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_data_structures_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_events_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_graphics_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_gui_basics_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_gui_extra_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_opengl_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_video_wrapper.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_audio_basics\juce_audio_basics.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_audio_devices\juce_audio_devices.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_audio_formats\juce_audio_formats.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_audio_processors\juce_audio_processors.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_audio_utils\juce_audio_utils.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_core\juce_core.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_cryptography\juce_cryptography.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_data_structures\juce_data_structures.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_events\juce_events.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_graphics\juce_graphics.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_gui_basics\juce_gui_basics.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_gui_extra\juce_gui_extra.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_opengl\juce_opengl.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_video\juce_video.cpp"/>
       <File RelativePath="..\..\JuceLibraryCode\JuceHeader.h"/>
       <File RelativePath="icon.ico"/>
       <File RelativePath="resources.rc"/>

extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj

@@ -53,7 +53,7 @@
     <ClCompile>
       <Optimization>Disabled</Optimization>
       <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\JuceLibraryCode;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2010_78A501D=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -91,7 +91,7 @@
     </Midl>
     <ClCompile>
       <Optimization>MaxSpeed</Optimization>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\..\JuceLibraryCode;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_WINDOWS;NDEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2010_78A501D=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
@@ -1192,20 +1192,20 @@
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ClCompile>
     <ClCompile Include="..\..\JuceLibraryCode\BinaryData.cpp"/>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_audio_basics_wrapper.cpp"/>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_audio_devices_wrapper.cpp"/>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_audio_formats_wrapper.cpp"/>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_audio_processors_wrapper.cpp"/>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_audio_utils_wrapper.cpp"/>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_core_wrapper.cpp"/>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_cryptography_wrapper.cpp"/>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_data_structures_wrapper.cpp"/>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_events_wrapper.cpp"/>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_graphics_wrapper.cpp"/>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_gui_basics_wrapper.cpp"/>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_gui_extra_wrapper.cpp"/>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_opengl_wrapper.cpp"/>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_video_wrapper.cpp"/>
+    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\juce_audio_basics.cpp"/>
+    <ClCompile Include="..\..\..\..\modules\juce_audio_devices\juce_audio_devices.cpp"/>
+    <ClCompile Include="..\..\..\..\modules\juce_audio_formats\juce_audio_formats.cpp"/>
+    <ClCompile Include="..\..\..\..\modules\juce_audio_processors\juce_audio_processors.cpp"/>
+    <ClCompile Include="..\..\..\..\modules\juce_audio_utils\juce_audio_utils.cpp"/>
+    <ClCompile Include="..\..\..\..\modules\juce_core\juce_core.cpp"/>
+    <ClCompile Include="..\..\..\..\modules\juce_cryptography\juce_cryptography.cpp"/>
+    <ClCompile Include="..\..\..\..\modules\juce_data_structures\juce_data_structures.cpp"/>
+    <ClCompile Include="..\..\..\..\modules\juce_events\juce_events.cpp"/>
+    <ClCompile Include="..\..\..\..\modules\juce_graphics\juce_graphics.cpp"/>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\juce_gui_basics.cpp"/>
+    <ClCompile Include="..\..\..\..\modules\juce_gui_extra\juce_gui_extra.cpp"/>
+    <ClCompile Include="..\..\..\..\modules\juce_opengl\juce_opengl.cpp"/>
+    <ClCompile Include="..\..\..\..\modules\juce_video\juce_video.cpp"/>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\..\Source\MainDemoWindow.h"/>

extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj.filters

@@ -1570,46 +1570,46 @@
     <ClCompile Include="..\..\JuceLibraryCode\BinaryData.cpp">
       <Filter>Juce Library Code</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_audio_basics_wrapper.cpp">
+    <ClCompile Include="..\..\..\..\modules\juce_audio_basics\juce_audio_basics.cpp">
       <Filter>Juce Library Code</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_audio_devices_wrapper.cpp">
+    <ClCompile Include="..\..\..\..\modules\juce_audio_devices\juce_audio_devices.cpp">
       <Filter>Juce Library Code</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_audio_formats_wrapper.cpp">
+    <ClCompile Include="..\..\..\..\modules\juce_audio_formats\juce_audio_formats.cpp">
       <Filter>Juce Library Code</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_audio_processors_wrapper.cpp">
+    <ClCompile Include="..\..\..\..\modules\juce_audio_processors\juce_audio_processors.cpp">
       <Filter>Juce Library Code</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_audio_utils_wrapper.cpp">
+    <ClCompile Include="..\..\..\..\modules\juce_audio_utils\juce_audio_utils.cpp">
       <Filter>Juce Library Code</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_core_wrapper.cpp">
+    <ClCompile Include="..\..\..\..\modules\juce_core\juce_core.cpp">
       <Filter>Juce Library Code</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_cryptography_wrapper.cpp">
+    <ClCompile Include="..\..\..\..\modules\juce_cryptography\juce_cryptography.cpp">
       <Filter>Juce Library Code</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_data_structures_wrapper.cpp">
+    <ClCompile Include="..\..\..\..\modules\juce_data_structures\juce_data_structures.cpp">
       <Filter>Juce Library Code</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_events_wrapper.cpp">
+    <ClCompile Include="..\..\..\..\modules\juce_events\juce_events.cpp">
       <Filter>Juce Library Code</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_graphics_wrapper.cpp">
+    <ClCompile Include="..\..\..\..\modules\juce_graphics\juce_graphics.cpp">
       <Filter>Juce Library Code</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_gui_basics_wrapper.cpp">
+    <ClCompile Include="..\..\..\..\modules\juce_gui_basics\juce_gui_basics.cpp">
       <Filter>Juce Library Code</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_gui_extra_wrapper.cpp">
+    <ClCompile Include="..\..\..\..\modules\juce_gui_extra\juce_gui_extra.cpp">
       <Filter>Juce Library Code</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_opengl_wrapper.cpp">
+    <ClCompile Include="..\..\..\..\modules\juce_opengl\juce_opengl.cpp">
       <Filter>Juce Library Code</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\JuceLibraryCode\juce_video_wrapper.cpp">
+    <ClCompile Include="..\..\..\..\modules\juce_video\juce_video.cpp">
       <Filter>Juce Library Code</Filter>
     </ClCompile>
   </ItemGroup>

extras/JuceDemo/JuceLibraryCode/AppConfig.h

@@ -10,6 +10,22 @@
 
 */
 
+//==============================================================================
+#define JUCE_MODULE_AVAILABLE_juce_audio_basics          1
+#define JUCE_MODULE_AVAILABLE_juce_audio_devices         1
+#define JUCE_MODULE_AVAILABLE_juce_audio_formats         1
+#define JUCE_MODULE_AVAILABLE_juce_audio_processors      1
+#define JUCE_MODULE_AVAILABLE_juce_audio_utils           1
+#define JUCE_MODULE_AVAILABLE_juce_core                  1
+#define JUCE_MODULE_AVAILABLE_juce_cryptography          1
+#define JUCE_MODULE_AVAILABLE_juce_data_structures       1
+#define JUCE_MODULE_AVAILABLE_juce_events                1
+#define JUCE_MODULE_AVAILABLE_juce_graphics              1
+#define JUCE_MODULE_AVAILABLE_juce_gui_basics            1
+#define JUCE_MODULE_AVAILABLE_juce_gui_extra             1
+#define JUCE_MODULE_AVAILABLE_juce_opengl                1
+#define JUCE_MODULE_AVAILABLE_juce_video                 1
+
 //==============================================================================
 // juce_audio_devices flags:
 

extras/JuceDemo/JuceLibraryCode/juce_audio_basics_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_basics/juce_audio_basics.cpp"

extras/JuceDemo/JuceLibraryCode/juce_audio_basics_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_basics/juce_audio_basics.cpp"

extras/JuceDemo/JuceLibraryCode/juce_audio_devices_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_devices/juce_audio_devices.cpp"

extras/JuceDemo/JuceLibraryCode/juce_audio_devices_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_devices/juce_audio_devices.cpp"

extras/JuceDemo/JuceLibraryCode/juce_audio_formats_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_formats/juce_audio_formats.cpp"

extras/JuceDemo/JuceLibraryCode/juce_audio_formats_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_formats/juce_audio_formats.cpp"

extras/JuceDemo/JuceLibraryCode/juce_audio_processors_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_processors/juce_audio_processors.cpp"

extras/JuceDemo/JuceLibraryCode/juce_audio_processors_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_processors/juce_audio_processors.cpp"

extras/JuceDemo/JuceLibraryCode/juce_audio_utils_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_utils/juce_audio_utils.cpp"

extras/JuceDemo/JuceLibraryCode/juce_audio_utils_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_utils/juce_audio_utils.cpp"

extras/JuceDemo/JuceLibraryCode/juce_core_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_core/juce_core.cpp"

extras/JuceDemo/JuceLibraryCode/juce_core_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_core/juce_core.cpp"

extras/JuceDemo/JuceLibraryCode/juce_cryptography_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_cryptography/juce_cryptography.cpp"

extras/JuceDemo/JuceLibraryCode/juce_cryptography_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_cryptography/juce_cryptography.cpp"

extras/JuceDemo/JuceLibraryCode/juce_data_structures_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_data_structures/juce_data_structures.cpp"

extras/JuceDemo/JuceLibraryCode/juce_data_structures_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_data_structures/juce_data_structures.cpp"

extras/JuceDemo/JuceLibraryCode/juce_events_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_events/juce_events.cpp"

extras/JuceDemo/JuceLibraryCode/juce_events_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_events/juce_events.cpp"

extras/JuceDemo/JuceLibraryCode/juce_graphics_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_graphics/juce_graphics.cpp"

extras/JuceDemo/JuceLibraryCode/juce_graphics_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_graphics/juce_graphics.cpp"

extras/JuceDemo/JuceLibraryCode/juce_gui_basics_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_gui_basics/juce_gui_basics.cpp"

extras/JuceDemo/JuceLibraryCode/juce_gui_basics_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_gui_basics/juce_gui_basics.cpp"

extras/JuceDemo/JuceLibraryCode/juce_gui_extra_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_gui_extra/juce_gui_extra.cpp"

extras/JuceDemo/JuceLibraryCode/juce_gui_extra_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_gui_extra/juce_gui_extra.cpp"

extras/JuceDemo/JuceLibraryCode/juce_opengl_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_opengl/juce_opengl.cpp"

extras/JuceDemo/JuceLibraryCode/juce_opengl_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_opengl/juce_opengl.cpp"

extras/JuceDemo/JuceLibraryCode/juce_video_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_video/juce_video.cpp"

extras/JuceDemo/JuceLibraryCode/juce_video_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_video/juce_video.cpp"

extras/audio plugin demo/Builds/Linux/Makefile

@@ -45,21 +45,21 @@ endif
 OBJECTS := \
   $(OBJDIR)/PluginProcessor_a059e380.o \
   $(OBJDIR)/PluginEditor_94d4fb09.o \
-  $(OBJDIR)/juce_audio_basics_wrapper_e4aa31f5.o \
-  $(OBJDIR)/juce_audio_devices_wrapper_845aeedf.o \
-  $(OBJDIR)/juce_audio_formats_wrapper_994a82de.o \
-  $(OBJDIR)/juce_audio_processors_wrapper_a34d7091.o \
-  $(OBJDIR)/juce_audio_utils_wrapper_e9783ef3.o \
-  $(OBJDIR)/juce_core_wrapper_b07ed786.o \
-  $(OBJDIR)/juce_data_structures_wrapper_4f7fd480.o \
-  $(OBJDIR)/juce_events_wrapper_a8dc8280.o \
-  $(OBJDIR)/juce_graphics_wrapper_a0e77172.o \
-  $(OBJDIR)/juce_gui_basics_wrapper_e00f2ff0.o \
-  $(OBJDIR)/juce_RTAS_DigiCode1_wrapper_6c4cad39.o \
-  $(OBJDIR)/juce_RTAS_DigiCode2_wrapper_5acfb3ba.o \
-  $(OBJDIR)/juce_RTAS_DigiCode3_wrapper_4952ba3b.o \
-  $(OBJDIR)/juce_RTAS_Wrapper_wrapper_1df0fd8f.o \
-  $(OBJDIR)/juce_VST_Wrapper_wrapper_da6c54d6.o \
+  $(OBJDIR)/juce_audio_basics_399a455e.o \
+  $(OBJDIR)/juce_audio_devices_c1c9ba9c.o \
+  $(OBJDIR)/juce_audio_formats_f04b043c.o \
+  $(OBJDIR)/juce_audio_processors_eb9ae116.o \
+  $(OBJDIR)/juce_audio_utils_cf18005c.o \
+  $(OBJDIR)/juce_core_1ee54a40.o \
+  $(OBJDIR)/juce_data_structures_84790dfc.o \
+  $(OBJDIR)/juce_events_584896b4.o \
+  $(OBJDIR)/juce_graphics_f9afc18.o \
+  $(OBJDIR)/juce_gui_basics_90929794.o \
+  $(OBJDIR)/juce_RTAS_DigiCode1_6dea9489.o \
+  $(OBJDIR)/juce_RTAS_DigiCode2_6df8ac0a.o \
+  $(OBJDIR)/juce_RTAS_DigiCode3_6e06c38b.o \
+  $(OBJDIR)/juce_RTAS_Wrapper_67ed73df.o \
+  $(OBJDIR)/juce_VST_Wrapper_8aa348b1.o \
 
 .PHONY: clean
 
@@ -86,79 +86,79 @@ $(OBJDIR)/PluginEditor_94d4fb09.o: ../../Source/PluginEditor.cpp
 	@echo "Compiling PluginEditor.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_audio_basics_wrapper_e4aa31f5.o: ../../JuceLibraryCode/juce_audio_basics_wrapper.cpp
+$(OBJDIR)/juce_audio_basics_399a455e.o: ../../../../modules/juce_audio_basics/juce_audio_basics.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_audio_basics_wrapper.cpp"
+	@echo "Compiling juce_audio_basics.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_audio_devices_wrapper_845aeedf.o: ../../JuceLibraryCode/juce_audio_devices_wrapper.cpp
+$(OBJDIR)/juce_audio_devices_c1c9ba9c.o: ../../../../modules/juce_audio_devices/juce_audio_devices.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_audio_devices_wrapper.cpp"
+	@echo "Compiling juce_audio_devices.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_audio_formats_wrapper_994a82de.o: ../../JuceLibraryCode/juce_audio_formats_wrapper.cpp
+$(OBJDIR)/juce_audio_formats_f04b043c.o: ../../../../modules/juce_audio_formats/juce_audio_formats.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_audio_formats_wrapper.cpp"
+	@echo "Compiling juce_audio_formats.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_audio_processors_wrapper_a34d7091.o: ../../JuceLibraryCode/juce_audio_processors_wrapper.cpp
+$(OBJDIR)/juce_audio_processors_eb9ae116.o: ../../../../modules/juce_audio_processors/juce_audio_processors.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_audio_processors_wrapper.cpp"
+	@echo "Compiling juce_audio_processors.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_audio_utils_wrapper_e9783ef3.o: ../../JuceLibraryCode/juce_audio_utils_wrapper.cpp
+$(OBJDIR)/juce_audio_utils_cf18005c.o: ../../../../modules/juce_audio_utils/juce_audio_utils.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_audio_utils_wrapper.cpp"
+	@echo "Compiling juce_audio_utils.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_core_wrapper_b07ed786.o: ../../JuceLibraryCode/juce_core_wrapper.cpp
+$(OBJDIR)/juce_core_1ee54a40.o: ../../../../modules/juce_core/juce_core.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_core_wrapper.cpp"
+	@echo "Compiling juce_core.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_data_structures_wrapper_4f7fd480.o: ../../JuceLibraryCode/juce_data_structures_wrapper.cpp
+$(OBJDIR)/juce_data_structures_84790dfc.o: ../../../../modules/juce_data_structures/juce_data_structures.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_data_structures_wrapper.cpp"
+	@echo "Compiling juce_data_structures.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_events_wrapper_a8dc8280.o: ../../JuceLibraryCode/juce_events_wrapper.cpp
+$(OBJDIR)/juce_events_584896b4.o: ../../../../modules/juce_events/juce_events.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_events_wrapper.cpp"
+	@echo "Compiling juce_events.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_graphics_wrapper_a0e77172.o: ../../JuceLibraryCode/juce_graphics_wrapper.cpp
+$(OBJDIR)/juce_graphics_f9afc18.o: ../../../../modules/juce_graphics/juce_graphics.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_graphics_wrapper.cpp"
+	@echo "Compiling juce_graphics.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_gui_basics_wrapper_e00f2ff0.o: ../../JuceLibraryCode/juce_gui_basics_wrapper.cpp
+$(OBJDIR)/juce_gui_basics_90929794.o: ../../../../modules/juce_gui_basics/juce_gui_basics.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_gui_basics_wrapper.cpp"
+	@echo "Compiling juce_gui_basics.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_RTAS_DigiCode1_wrapper_6c4cad39.o: ../../JuceLibraryCode/juce_RTAS_DigiCode1_wrapper.cpp
+$(OBJDIR)/juce_RTAS_DigiCode1_6dea9489.o: ../../../../modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode1.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_RTAS_DigiCode1_wrapper.cpp"
+	@echo "Compiling juce_RTAS_DigiCode1.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_RTAS_DigiCode2_wrapper_5acfb3ba.o: ../../JuceLibraryCode/juce_RTAS_DigiCode2_wrapper.cpp
+$(OBJDIR)/juce_RTAS_DigiCode2_6df8ac0a.o: ../../../../modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode2.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_RTAS_DigiCode2_wrapper.cpp"
+	@echo "Compiling juce_RTAS_DigiCode2.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_RTAS_DigiCode3_wrapper_4952ba3b.o: ../../JuceLibraryCode/juce_RTAS_DigiCode3_wrapper.cpp
+$(OBJDIR)/juce_RTAS_DigiCode3_6e06c38b.o: ../../../../modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode3.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_RTAS_DigiCode3_wrapper.cpp"
+	@echo "Compiling juce_RTAS_DigiCode3.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_RTAS_Wrapper_wrapper_1df0fd8f.o: ../../JuceLibraryCode/juce_RTAS_Wrapper_wrapper.cpp
+$(OBJDIR)/juce_RTAS_Wrapper_67ed73df.o: ../../../../modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_RTAS_Wrapper_wrapper.cpp"
+	@echo "Compiling juce_RTAS_Wrapper.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
-$(OBJDIR)/juce_VST_Wrapper_wrapper_da6c54d6.o: ../../JuceLibraryCode/juce_VST_Wrapper_wrapper.cpp
+$(OBJDIR)/juce_VST_Wrapper_8aa348b1.o: ../../../../modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp
 	-@mkdir -p $(OBJDIR)
-	@echo "Compiling juce_VST_Wrapper_wrapper.cpp"
+	@echo "Compiling juce_VST_Wrapper.cpp"
 	@$(CXX) $(CXXFLAGS) -o "$@" -c "$<"
 
 -include $(OBJECTS:%.o=%.d)

extras/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj

@@ -32,7 +32,7 @@
             Optimization="0"
             BufferSecurityCheck=""
             DebugInformationFormat="4"
-            AdditionalIncludeDirectories="c:\SDKs\vstsdk2.4;..\..\JuceLibraryCode"
+            AdditionalIncludeDirectories="..\..\JuceLibraryCode;c:\SDKs\vstsdk2.4"
             PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2005_78A5003=1"
             RuntimeLibrary="1"
             RuntimeTypeInfo="true"
@@ -88,7 +88,7 @@
             Optimization="2"
             InlineFunctionExpansion="1"
             StringPooling="true"
-            AdditionalIncludeDirectories="c:\SDKs\vstsdk2.4;..\..\JuceLibraryCode"
+            AdditionalIncludeDirectories="..\..\JuceLibraryCode;c:\SDKs\vstsdk2.4"
             PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2005_78A5003=1"
             RuntimeLibrary="0"
             RuntimeTypeInfo="true"
@@ -4014,17 +4014,17 @@
     </Filter>
     <Filter Name="Juce Library Code">
       <File RelativePath="..\..\JuceLibraryCode\AppConfig.h"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_audio_basics_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_audio_devices_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_audio_formats_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_audio_processors_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_audio_utils_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_core_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_data_structures_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_events_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_graphics_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_gui_basics_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_RTAS_DigiCode1_wrapper.cpp">
+      <File RelativePath="..\..\..\..\modules\juce_audio_basics\juce_audio_basics.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_audio_devices\juce_audio_devices.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_audio_formats\juce_audio_formats.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_audio_processors\juce_audio_processors.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_audio_utils\juce_audio_utils.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_core\juce_core.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_data_structures\juce_data_structures.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_events\juce_events.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_graphics\juce_graphics.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_gui_basics\juce_gui_basics.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_audio_plugin_client\RTAS\juce_RTAS_DigiCode1.cpp">
         <FileConfiguration Name="Debug|Win32">
           <Tool Name="VCCLCompilerTool"
                 CallingConvention="2"/>
@@ -4034,7 +4034,7 @@
                 CallingConvention="2"/>
         </FileConfiguration>
       </File>
-      <File RelativePath="..\..\JuceLibraryCode\juce_RTAS_DigiCode2_wrapper.cpp">
+      <File RelativePath="..\..\..\..\modules\juce_audio_plugin_client\RTAS\juce_RTAS_DigiCode2.cpp">
         <FileConfiguration Name="Debug|Win32">
           <Tool Name="VCCLCompilerTool"
                 CallingConvention="2"/>
@@ -4044,7 +4044,7 @@
                 CallingConvention="2"/>
         </FileConfiguration>
       </File>
-      <File RelativePath="..\..\JuceLibraryCode\juce_RTAS_DigiCode3_wrapper.cpp">
+      <File RelativePath="..\..\..\..\modules\juce_audio_plugin_client\RTAS\juce_RTAS_DigiCode3.cpp">
         <FileConfiguration Name="Debug|Win32">
           <Tool Name="VCCLCompilerTool"
                 CallingConvention="2"/>
@@ -4064,7 +4064,7 @@
           <Tool Name="VCCLCompilerTool"/>
         </FileConfiguration>
       </File>
-      <File RelativePath="..\..\JuceLibraryCode\juce_RTAS_WinUtilities_wrapper.cpp">
+      <File RelativePath="..\..\..\..\modules\juce_audio_plugin_client\RTAS\juce_RTAS_WinUtilities.cpp">
         <FileConfiguration Name="Debug|Win32">
           <Tool Name="VCCLCompilerTool"
                 CallingConvention="2"/>
@@ -4074,7 +4074,7 @@
                 CallingConvention="2"/>
         </FileConfiguration>
       </File>
-      <File RelativePath="..\..\JuceLibraryCode\juce_RTAS_Wrapper_wrapper.cpp">
+      <File RelativePath="..\..\..\..\modules\juce_audio_plugin_client\RTAS\juce_RTAS_Wrapper.cpp">
         <FileConfiguration Name="Debug|Win32">
           <Tool Name="VCCLCompilerTool"
                 CallingConvention="2"/>
@@ -4084,7 +4084,7 @@
                 CallingConvention="2"/>
         </FileConfiguration>
       </File>
-      <File RelativePath="..\..\JuceLibraryCode\juce_VST_Wrapper_wrapper.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_audio_plugin_client\VST\juce_VST_Wrapper.cpp"/>
       <File RelativePath="..\..\JuceLibraryCode\JuceHeader.h"/>
     </Filter>
   </Files>

extras/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj

@@ -32,7 +32,7 @@
             Optimization="0"
             BufferSecurityCheck=""
             DebugInformationFormat="4"
-            AdditionalIncludeDirectories="c:\SDKs\vstsdk2.4;..\..\JuceLibraryCode"
+            AdditionalIncludeDirectories="..\..\JuceLibraryCode;c:\SDKs\vstsdk2.4"
             PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2008_78A5006=1"
             RuntimeLibrary="1"
             RuntimeTypeInfo="true"
@@ -88,7 +88,7 @@
             Optimization="2"
             InlineFunctionExpansion="1"
             StringPooling="true"
-            AdditionalIncludeDirectories="c:\SDKs\vstsdk2.4;..\..\JuceLibraryCode"
+            AdditionalIncludeDirectories="..\..\JuceLibraryCode;c:\SDKs\vstsdk2.4"
             PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2008_78A5006=1"
             RuntimeLibrary="0"
             RuntimeTypeInfo="true"
@@ -4014,17 +4014,17 @@
     </Filter>
     <Filter Name="Juce Library Code">
       <File RelativePath="..\..\JuceLibraryCode\AppConfig.h"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_audio_basics_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_audio_devices_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_audio_formats_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_audio_processors_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_audio_utils_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_core_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_data_structures_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_events_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_graphics_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_gui_basics_wrapper.cpp"/>
-      <File RelativePath="..\..\JuceLibraryCode\juce_RTAS_DigiCode1_wrapper.cpp">
+      <File RelativePath="..\..\..\..\modules\juce_audio_basics\juce_audio_basics.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_audio_devices\juce_audio_devices.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_audio_formats\juce_audio_formats.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_audio_processors\juce_audio_processors.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_audio_utils\juce_audio_utils.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_core\juce_core.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_data_structures\juce_data_structures.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_events\juce_events.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_graphics\juce_graphics.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_gui_basics\juce_gui_basics.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_audio_plugin_client\RTAS\juce_RTAS_DigiCode1.cpp">
         <FileConfiguration Name="Debug|Win32">
           <Tool Name="VCCLCompilerTool"
                 CallingConvention="2"/>
@@ -4034,7 +4034,7 @@
                 CallingConvention="2"/>
         </FileConfiguration>
       </File>
-      <File RelativePath="..\..\JuceLibraryCode\juce_RTAS_DigiCode2_wrapper.cpp">
+      <File RelativePath="..\..\..\..\modules\juce_audio_plugin_client\RTAS\juce_RTAS_DigiCode2.cpp">
         <FileConfiguration Name="Debug|Win32">
           <Tool Name="VCCLCompilerTool"
                 CallingConvention="2"/>
@@ -4044,7 +4044,7 @@
                 CallingConvention="2"/>
         </FileConfiguration>
       </File>
-      <File RelativePath="..\..\JuceLibraryCode\juce_RTAS_DigiCode3_wrapper.cpp">
+      <File RelativePath="..\..\..\..\modules\juce_audio_plugin_client\RTAS\juce_RTAS_DigiCode3.cpp">
         <FileConfiguration Name="Debug|Win32">
           <Tool Name="VCCLCompilerTool"
                 CallingConvention="2"/>
@@ -4064,7 +4064,7 @@
           <Tool Name="VCCLCompilerTool"/>
         </FileConfiguration>
       </File>
-      <File RelativePath="..\..\JuceLibraryCode\juce_RTAS_WinUtilities_wrapper.cpp">
+      <File RelativePath="..\..\..\..\modules\juce_audio_plugin_client\RTAS\juce_RTAS_WinUtilities.cpp">
         <FileConfiguration Name="Debug|Win32">
           <Tool Name="VCCLCompilerTool"
                 CallingConvention="2"/>
@@ -4074,7 +4074,7 @@
                 CallingConvention="2"/>
         </FileConfiguration>
       </File>
-      <File RelativePath="..\..\JuceLibraryCode\juce_RTAS_Wrapper_wrapper.cpp">
+      <File RelativePath="..\..\..\..\modules\juce_audio_plugin_client\RTAS\juce_RTAS_Wrapper.cpp">
         <FileConfiguration Name="Debug|Win32">
           <Tool Name="VCCLCompilerTool"
                 CallingConvention="2"/>
@@ -4084,7 +4084,7 @@
                 CallingConvention="2"/>
         </FileConfiguration>
       </File>
-      <File RelativePath="..\..\JuceLibraryCode\juce_VST_Wrapper_wrapper.cpp"/>
+      <File RelativePath="..\..\..\..\modules\juce_audio_plugin_client\VST\juce_VST_Wrapper.cpp"/>
       <File RelativePath="..\..\JuceLibraryCode\JuceHeader.h"/>
     </Filter>
   </Files>

extras/audio plugin demo/JuceLibraryCode/AppConfig.h

@@ -10,6 +10,19 @@
 
 */
 
+//==============================================================================
+#define JUCE_MODULE_AVAILABLE_juce_audio_basics             1
+#define JUCE_MODULE_AVAILABLE_juce_audio_devices            1
+#define JUCE_MODULE_AVAILABLE_juce_audio_formats            1
+#define JUCE_MODULE_AVAILABLE_juce_audio_plugin_client      1
+#define JUCE_MODULE_AVAILABLE_juce_audio_processors         1
+#define JUCE_MODULE_AVAILABLE_juce_audio_utils              1
+#define JUCE_MODULE_AVAILABLE_juce_core                     1
+#define JUCE_MODULE_AVAILABLE_juce_data_structures          1
+#define JUCE_MODULE_AVAILABLE_juce_events                   1
+#define JUCE_MODULE_AVAILABLE_juce_graphics                 1
+#define JUCE_MODULE_AVAILABLE_juce_gui_basics               1
+
 //==============================================================================
 // juce_audio_devices flags:
 

extras/audio plugin demo/JuceLibraryCode/JuceHeader.h

@@ -29,7 +29,7 @@
 #if ! DONT_SET_USING_JUCE_NAMESPACE
  // If your code uses a lot of JUCE classes, then this will obviously save you
  // a lot of typing, but can be disabled by setting DONT_SET_USING_JUCE_NAMESPACE.
- using namespace JUCE_NAMESPACE;
+ using namespace juce;
 #endif
 
 namespace ProjectInfo

extras/audio plugin demo/JuceLibraryCode/juce_AU_Wrapper_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_plugin_client/AU/juce_AU_Wrapper.mm"

extras/audio plugin demo/JuceLibraryCode/juce_RTAS_DigiCode1_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode1.cpp"

extras/audio plugin demo/JuceLibraryCode/juce_RTAS_DigiCode1_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode1.cpp"

extras/audio plugin demo/JuceLibraryCode/juce_RTAS_DigiCode2_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode2.cpp"

extras/audio plugin demo/JuceLibraryCode/juce_RTAS_DigiCode2_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode2.cpp"

extras/audio plugin demo/JuceLibraryCode/juce_RTAS_DigiCode3_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode3.cpp"

extras/audio plugin demo/JuceLibraryCode/juce_RTAS_DigiCode3_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_plugin_client/RTAS/juce_RTAS_DigiCode3.cpp"

extras/audio plugin demo/JuceLibraryCode/juce_RTAS_MacUtilities_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_plugin_client/RTAS/juce_RTAS_MacUtilities.mm"

extras/audio plugin demo/JuceLibraryCode/juce_RTAS_WinUtilities_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_plugin_client/RTAS/juce_RTAS_WinUtilities.cpp"

extras/audio plugin demo/JuceLibraryCode/juce_RTAS_Wrapper_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp"

extras/audio plugin demo/JuceLibraryCode/juce_RTAS_Wrapper_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_plugin_client/RTAS/juce_RTAS_Wrapper.cpp"

extras/audio plugin demo/JuceLibraryCode/juce_VST_Wrapper_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.cpp"

extras/audio plugin demo/JuceLibraryCode/juce_VST_Wrapper_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_plugin_client/VST/juce_VST_Wrapper.mm"

extras/audio plugin demo/JuceLibraryCode/juce_audio_basics_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_basics/juce_audio_basics.cpp"

extras/audio plugin demo/JuceLibraryCode/juce_audio_basics_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_basics/juce_audio_basics.cpp"

extras/audio plugin demo/JuceLibraryCode/juce_audio_devices_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_devices/juce_audio_devices.cpp"

extras/audio plugin demo/JuceLibraryCode/juce_audio_devices_wrapper.mm

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_devices/juce_audio_devices.cpp"

extras/audio plugin demo/JuceLibraryCode/juce_audio_formats_wrapper.cpp

@@ -1,14 +0,0 @@
-/*
-
-    IMPORTANT! This file is auto-generated each time you save your
-    project - if you alter its contents, your changes may be overwritten!
-
-    This file pulls in a module's source code, and builds it using the settings
-    defined in AppConfig.h.
-
-*/
-
-#define JUCE_WRAPPED_FILE 1
-
-#include "AppConfig.h"
-#include "../../../modules/juce_audio_formats/juce_audio_formats.cpp"