From b9636ce02b97cc129f01fd3f671d6576ae8e7c68 Mon Sep 17 00:00:00 2001 From: jules Date: Tue, 1 Oct 2013 20:14:37 +0100 Subject: [PATCH] Introjucer: when exporting, added the modules folders to the include path. --- extras/Introjucer/Builds/Linux/Makefile | 8 ++++---- .../MacOSX/The Introjucer.xcodeproj/project.pbxproj | 4 ++-- .../Builds/VisualStudio2005/The Introjucer.vcproj | 4 ++-- .../Builds/VisualStudio2008/The Introjucer.vcproj | 4 ++-- .../Builds/VisualStudio2010/The Introjucer.vcxproj | 4 ++-- .../Builds/VisualStudio2012/The Introjucer.vcxproj | 4 ++-- extras/Introjucer/Source/Project/jucer_Module.cpp | 2 ++ extras/JuceDemo/Builds/Android/jni/Android.mk | 8 ++++---- extras/JuceDemo/Builds/Linux/Makefile | 8 ++++---- .../Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj | 4 ++-- extras/JuceDemo/Builds/VisualStudio2005/Juce Demo.vcproj | 4 ++-- extras/JuceDemo/Builds/VisualStudio2008/Juce Demo.vcproj | 4 ++-- extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj | 4 ++-- extras/JuceDemo/Builds/VisualStudio2012/Juce Demo.vcxproj | 4 ++-- .../Builds/iOS/Juce Demo.xcodeproj/project.pbxproj | 4 ++-- extras/audio plugin demo/Builds/Linux/Makefile | 8 ++++---- .../MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj | 4 ++-- .../Builds/VisualStudio2005/JuceDemoPlugin.vcproj | 4 ++-- .../Builds/VisualStudio2008/JuceDemoPlugin.vcproj | 4 ++-- extras/audio plugin host/Builds/Linux/Makefile | 8 ++++---- .../Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj | 4 ++-- .../Builds/VisualStudio2010/Plugin Host.vcxproj | 4 ++-- extras/binarybuilder/Builds/Linux/Makefile | 8 ++++---- .../Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj | 4 ++-- .../Builds/VisualStudio2008/BinaryBuilder.vcproj | 4 ++-- extras/example projects/Builds/Linux/Makefile | 8 ++++---- .../Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj | 4 ++-- .../Builds/VisualStudio2005/HelloWorld.vcproj | 4 ++-- .../Builds/VisualStudio2008/HelloWorld.vcproj | 4 ++-- .../Builds/iOS/HelloWorld.xcodeproj/project.pbxproj | 4 ++-- 30 files changed, 74 insertions(+), 72 deletions(-) diff --git a/extras/Introjucer/Builds/Linux/Makefile b/extras/Introjucer/Builds/Linux/Makefile index 7c9b13bd06..a8a76506c8 100644 --- a/extras/Introjucer/Builds/Linux/Makefile +++ b/extras/Introjucer/Builds/Linux/Makefile @@ -18,12 +18,12 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := -march=native endif - 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 + 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 -I ../../../../modules CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 CXXFLAGS += $(CFLAGS) LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt LDDEPS := - 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 + 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 -I ../../../../modules TARGET := Introjucer BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) endif @@ -38,12 +38,12 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=native endif - CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode + CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -O3 CXXFLAGS += $(CFLAGS) LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt LDDEPS := - RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode + RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules TARGET := Introjucer BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) endif diff --git a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj index 9cec215099..85e387f1d6 100644 --- a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj +++ b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj @@ -1864,7 +1864,7 @@ 0FFEF043CA89142B18C79ABE, 92ABB8016546F41128399E9D ); name = Source; sourceTree = ""; }; EA0BCC969703B2D179089E55 = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)"; + HEADER_SEARCH_PATHS = "../../JuceLibraryCode ../../../../modules $(inherited)"; GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_FILE = Info.plist; OTHER_CPLUSPLUSFLAGS = "-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing"; @@ -1885,7 +1885,7 @@ "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; B159CF4275B8A90122629FF4 = { isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)"; + HEADER_SEARCH_PATHS = "../../JuceLibraryCode ../../../../modules $(inherited)"; GCC_OPTIMIZATION_LEVEL = 3; INFOPLIST_FILE = Info.plist; OTHER_CPLUSPLUSFLAGS = "-Wall -Wshadow -Wno-missing-field-initializers -Wshadow -Wshorten-64-to-32 -Wstrict-aliasing"; diff --git a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj index cbbfac1f1f..3435c77a76 100644 --- a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj +++ b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj @@ -31,7 +31,7 @@ Optimization="0" BufferSecurityCheck="" DebugInformationFormat="4" - AdditionalIncludeDirectories="..\..\JuceLibraryCode" + AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2005_78A5003=1" RuntimeLibrary="1" RuntimeTypeInfo="true" @@ -87,7 +87,7 @@ Optimization="3" InlineFunctionExpansion="1" StringPooling="true" - AdditionalIncludeDirectories="..\..\JuceLibraryCode" + AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2005_78A5003=1" RuntimeLibrary="0" RuntimeTypeInfo="true" diff --git a/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj b/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj index 46d115aac2..8df09ac5bc 100644 --- a/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj +++ b/extras/Introjucer/Builds/VisualStudio2008/The Introjucer.vcproj @@ -31,7 +31,7 @@ Optimization="0" BufferSecurityCheck="" DebugInformationFormat="4" - AdditionalIncludeDirectories="..\..\JuceLibraryCode" + AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2008_78A5006=1" RuntimeLibrary="1" RuntimeTypeInfo="true" @@ -87,7 +87,7 @@ Optimization="3" InlineFunctionExpansion="1" StringPooling="true" - AdditionalIncludeDirectories="..\..\JuceLibraryCode" + AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2008_78A5006=1" RuntimeLibrary="0" RuntimeTypeInfo="true" diff --git a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj index 3100db2bc8..4b3bf4b40b 100644 --- a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj +++ b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj @@ -53,7 +53,7 @@ Disabled EditAndContinue - ..\..\JuceLibraryCode;%(AdditionalIncludeDirectories) + ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2010_78A501D=1;%(PreprocessorDefinitions) MultiThreadedDebug true @@ -94,7 +94,7 @@ Full - ..\..\JuceLibraryCode;%(AdditionalIncludeDirectories) + ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;NDEBUG;JUCER_VS2010_78A501D=1;%(PreprocessorDefinitions) MultiThreaded true diff --git a/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj b/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj index 435a58f22a..2867a9085a 100644 --- a/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj +++ b/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj @@ -59,7 +59,7 @@ Disabled EditAndContinue - ..\..\JuceLibraryCode;%(AdditionalIncludeDirectories) + ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2012_78A501F=1;%(PreprocessorDefinitions) MultiThreadedDebug true @@ -100,7 +100,7 @@ MinSpace - ..\..\JuceLibraryCode;%(AdditionalIncludeDirectories) + ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;NDEBUG;JUCER_VS2012_78A501F=1;%(PreprocessorDefinitions) MultiThreaded true diff --git a/extras/Introjucer/Source/Project/jucer_Module.cpp b/extras/Introjucer/Source/Project/jucer_Module.cpp index 31f230557c..acb631b008 100644 --- a/extras/Introjucer/Source/Project/jucer_Module.cpp +++ b/extras/Introjucer/Source/Project/jucer_Module.cpp @@ -324,6 +324,8 @@ void LibraryModule::prepareExporter (ProjectExporter& exporter, ProjectSaver& pr { Project& project = exporter.getProject(); + exporter.addToExtraSearchPaths (exporter.getModuleFolderRelativeToProject (getID(), projectSaver).getParentDirectory()); + { Array compiled; findAndAddCompiledCode (exporter, projectSaver, moduleInfo.getFolder(), compiled); diff --git a/extras/JuceDemo/Builds/Android/jni/Android.mk b/extras/JuceDemo/Builds/Android/jni/Android.mk index 36af02b515..c04b7aee75 100644 --- a/extras/JuceDemo/Builds/Android/jni/Android.mk +++ b/extras/JuceDemo/Builds/Android/jni/Android.mk @@ -47,14 +47,14 @@ LOCAL_SRC_FILES := \ ../../../../../modules/juce_video/juce_video.cpp\ ifeq ($(CONFIG),Debug) - LOCAL_CPPFLAGS += -fsigned-char -fexceptions -frtti -g -I "../../JuceLibraryCode" -O0 -D "JUCE_ANDROID=1" -D "JUCE_ANDROID_API_VERSION=8" -D "JUCE_ANDROID_ACTIVITY_CLASSNAME=com_juce_JuceDemo" -D JUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/juce/JuceDemo\" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_ANDROID_7F0E4A25=1" + LOCAL_CPPFLAGS += -fsigned-char -fexceptions -frtti -g -I "../../JuceLibraryCode" -I "../../../../modules" -O0 -D "JUCE_ANDROID=1" -D "JUCE_ANDROID_API_VERSION=8" -D "JUCE_ANDROID_ACTIVITY_CLASSNAME=com_juce_JuceDemo" -D JUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/juce/JuceDemo\" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_ANDROID_7F0E4A25=1" LOCAL_LDLIBS := -llog -lGLESv2 - LOCAL_CFLAGS += -fsigned-char -fexceptions -frtti -g -I "../../JuceLibraryCode" -O0 -D "JUCE_ANDROID=1" -D "JUCE_ANDROID_API_VERSION=8" -D "JUCE_ANDROID_ACTIVITY_CLASSNAME=com_juce_JuceDemo" -D JUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/juce/JuceDemo\" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_ANDROID_7F0E4A25=1" + LOCAL_CFLAGS += -fsigned-char -fexceptions -frtti -g -I "../../JuceLibraryCode" -I "../../../../modules" -O0 -D "JUCE_ANDROID=1" -D "JUCE_ANDROID_API_VERSION=8" -D "JUCE_ANDROID_ACTIVITY_CLASSNAME=com_juce_JuceDemo" -D JUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/juce/JuceDemo\" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_ANDROID_7F0E4A25=1" LOCAL_LDLIBS := -llog -lGLESv2 else - LOCAL_CPPFLAGS += -fsigned-char -fexceptions -frtti -I "../../JuceLibraryCode" -Os -D "JUCE_ANDROID=1" -D "JUCE_ANDROID_API_VERSION=8" -D "JUCE_ANDROID_ACTIVITY_CLASSNAME=com_juce_JuceDemo" -D JUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/juce/JuceDemo\" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_ANDROID_7F0E4A25=1" + LOCAL_CPPFLAGS += -fsigned-char -fexceptions -frtti -I "../../JuceLibraryCode" -I "../../../../modules" -Os -D "JUCE_ANDROID=1" -D "JUCE_ANDROID_API_VERSION=8" -D "JUCE_ANDROID_ACTIVITY_CLASSNAME=com_juce_JuceDemo" -D JUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/juce/JuceDemo\" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_ANDROID_7F0E4A25=1" LOCAL_LDLIBS := -llog -lGLESv2 - LOCAL_CFLAGS += -fsigned-char -fexceptions -frtti -I "../../JuceLibraryCode" -Os -D "JUCE_ANDROID=1" -D "JUCE_ANDROID_API_VERSION=8" -D "JUCE_ANDROID_ACTIVITY_CLASSNAME=com_juce_JuceDemo" -D JUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/juce/JuceDemo\" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_ANDROID_7F0E4A25=1" + LOCAL_CFLAGS += -fsigned-char -fexceptions -frtti -I "../../JuceLibraryCode" -I "../../../../modules" -Os -D "JUCE_ANDROID=1" -D "JUCE_ANDROID_API_VERSION=8" -D "JUCE_ANDROID_ACTIVITY_CLASSNAME=com_juce_JuceDemo" -D JUCE_ANDROID_ACTIVITY_CLASSPATH=\"com/juce/JuceDemo\" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=1" -D "JUCER_ANDROID_7F0E4A25=1" LOCAL_LDLIBS := -llog -lGLESv2 endif diff --git a/extras/JuceDemo/Builds/Linux/Makefile b/extras/JuceDemo/Builds/Linux/Makefile index 5c922d58d7..d543dd44a7 100644 --- a/extras/JuceDemo/Builds/Linux/Makefile +++ b/extras/JuceDemo/Builds/Linux/Makefile @@ -18,12 +18,12 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := -march=native endif - 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 + 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 -I ../../../../modules CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 CXXFLAGS += $(CFLAGS) LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt 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 -I ../../JuceLibraryCode + 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 -I ../../../../modules TARGET := JuceDemo BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) endif @@ -38,12 +38,12 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=native endif - 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 + 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 -I ../../../../modules CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -Os CXXFLAGS += $(CFLAGS) LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt 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 -I ../../JuceLibraryCode + 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 -I ../../../../modules TARGET := JuceDemo BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) endif diff --git a/extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj b/extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj index 2fddc75756..db6d2f16d6 100644 --- a/extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj +++ b/extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj @@ -2070,7 +2070,7 @@ 0AE68D12A51E59B084E046C1, 913372FE9DAAA74F5520A786 ); name = Source; sourceTree = ""; }; 2FE1E46B92ED7BD427F01D8C = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)"; + HEADER_SEARCH_PATHS = "../../JuceLibraryCode ../../../../modules $(inherited)"; GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_FILE = Info.plist; OTHER_CPLUSPLUSFLAGS = "-Wall -Wno-missing-field-initializers -Wstrict-aliasing -Wshadow -Wshorten-64-to-32"; @@ -2092,7 +2092,7 @@ "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; 9E3B64077ABD2AA72A51EE7C = { isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)"; + HEADER_SEARCH_PATHS = "../../JuceLibraryCode ../../../../modules $(inherited)"; GCC_OPTIMIZATION_LEVEL = s; INFOPLIST_FILE = Info.plist; OTHER_CPLUSPLUSFLAGS = "-Wall -Wno-missing-field-initializers -Wstrict-aliasing -Wshadow -Wshorten-64-to-32"; diff --git a/extras/JuceDemo/Builds/VisualStudio2005/Juce Demo.vcproj b/extras/JuceDemo/Builds/VisualStudio2005/Juce Demo.vcproj index 3f4116c527..a7d39b07d0 100644 --- a/extras/JuceDemo/Builds/VisualStudio2005/Juce Demo.vcproj +++ b/extras/JuceDemo/Builds/VisualStudio2005/Juce Demo.vcproj @@ -31,7 +31,7 @@ Optimization="0" BufferSecurityCheck="" DebugInformationFormat="4" - AdditionalIncludeDirectories="..\..\JuceLibraryCode" + AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2005_78A5003=1" RuntimeLibrary="1" RuntimeTypeInfo="true" @@ -87,7 +87,7 @@ Optimization="1" InlineFunctionExpansion="1" StringPooling="true" - AdditionalIncludeDirectories="..\..\JuceLibraryCode" + AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2005_78A5003=1" RuntimeLibrary="0" RuntimeTypeInfo="true" diff --git a/extras/JuceDemo/Builds/VisualStudio2008/Juce Demo.vcproj b/extras/JuceDemo/Builds/VisualStudio2008/Juce Demo.vcproj index f4de375516..d118dd93e7 100644 --- a/extras/JuceDemo/Builds/VisualStudio2008/Juce Demo.vcproj +++ b/extras/JuceDemo/Builds/VisualStudio2008/Juce Demo.vcproj @@ -31,7 +31,7 @@ Optimization="0" BufferSecurityCheck="" DebugInformationFormat="4" - AdditionalIncludeDirectories="..\..\JuceLibraryCode" + AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2008_78A5006=1" RuntimeLibrary="1" RuntimeTypeInfo="true" @@ -87,7 +87,7 @@ Optimization="1" InlineFunctionExpansion="1" StringPooling="true" - AdditionalIncludeDirectories="..\..\JuceLibraryCode" + AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2008_78A5006=1" RuntimeLibrary="0" RuntimeTypeInfo="true" diff --git a/extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj b/extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj index 8fafa6a8db..d52c221730 100644 --- a/extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj +++ b/extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj @@ -53,7 +53,7 @@ Disabled EditAndContinue - ..\..\JuceLibraryCode;%(AdditionalIncludeDirectories) + ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2010_78A501D=1;%(PreprocessorDefinitions) MultiThreadedDebug true @@ -94,7 +94,7 @@ MinSpace - ..\..\JuceLibraryCode;%(AdditionalIncludeDirectories) + ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;NDEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2010_78A501D=1;%(PreprocessorDefinitions) MultiThreaded true diff --git a/extras/JuceDemo/Builds/VisualStudio2012/Juce Demo.vcxproj b/extras/JuceDemo/Builds/VisualStudio2012/Juce Demo.vcxproj index b3aed8f65f..a5750d3480 100644 --- a/extras/JuceDemo/Builds/VisualStudio2012/Juce Demo.vcxproj +++ b/extras/JuceDemo/Builds/VisualStudio2012/Juce Demo.vcxproj @@ -59,7 +59,7 @@ Disabled EditAndContinue - ..\..\JuceLibraryCode;%(AdditionalIncludeDirectories) + ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2012_78A501F=1;%(PreprocessorDefinitions) MultiThreadedDebug true @@ -100,7 +100,7 @@ MinSpace - ..\..\JuceLibraryCode;%(AdditionalIncludeDirectories) + ..\..\JuceLibraryCode;..\..\..\..\modules;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;NDEBUG;JUCER_VS2012_78A501F=1;%(PreprocessorDefinitions) MultiThreaded true diff --git a/extras/JuceDemo/Builds/iOS/Juce Demo.xcodeproj/project.pbxproj b/extras/JuceDemo/Builds/iOS/Juce Demo.xcodeproj/project.pbxproj index ba6df2d763..4f6df349e6 100644 --- a/extras/JuceDemo/Builds/iOS/Juce Demo.xcodeproj/project.pbxproj +++ b/extras/JuceDemo/Builds/iOS/Juce Demo.xcodeproj/project.pbxproj @@ -2055,7 +2055,7 @@ 0AE68D12A51E59B084E046C1, 913372FE9DAAA74F5520A786 ); name = Source; sourceTree = ""; }; 2FE1E46B92ED7BD427F01D8C = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)"; + HEADER_SEARCH_PATHS = "../../JuceLibraryCode ../../../../modules $(inherited)"; GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; @@ -2074,7 +2074,7 @@ "JUCER_XCODE_IPHONE_5BC26AE3=1"); }; name = Debug; }; 9E3B64077ABD2AA72A51EE7C = { isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)"; + HEADER_SEARCH_PATHS = "../../JuceLibraryCode ../../../../modules $(inherited)"; GCC_OPTIMIZATION_LEVEL = s; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; diff --git a/extras/audio plugin demo/Builds/Linux/Makefile b/extras/audio plugin demo/Builds/Linux/Makefile index b3f03033d3..57592d4c47 100644 --- a/extras/audio plugin demo/Builds/Linux/Makefile +++ b/extras/audio plugin demo/Builds/Linux/Makefile @@ -18,12 +18,12 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := -march=native endif - 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 ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode + 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 ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode -I ../../../../modules CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -fPIC -O0 CXXFLAGS += $(CFLAGS) LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -shared -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt LDDEPS := - RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode + RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode -I ../../../../modules TARGET := JuceDemoPlugin.so BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) endif @@ -38,12 +38,12 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=native endif - CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode + CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode -I ../../../../modules CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC -Os CXXFLAGS += $(CFLAGS) LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -shared -fvisibility=hidden -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt LDDEPS := - RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode + RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode -I ../../../../modules TARGET := JuceDemoPlugin.so BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) endif diff --git a/extras/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj b/extras/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj index e840970415..1f951fc5b2 100644 --- a/extras/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj +++ b/extras/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj @@ -2033,7 +2033,7 @@ 7EA0AEAFB626CDF5E0038ED5, 227AE5B2ACBB7881D9552404 ); name = Source; sourceTree = ""; }; 77D1D11FAA110A1B1F960A8F = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = "~/SDKs/vstsdk2.4 ../../JuceLibraryCode $(DEVELOPER_DIR)/Extras/CoreAudio/PublicUtility $(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/Utility $(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/AUBase $(inherited)"; + HEADER_SEARCH_PATHS = "~/SDKs/vstsdk2.4 ../../JuceLibraryCode ../../../../modules $(DEVELOPER_DIR)/Extras/CoreAudio/PublicUtility $(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/Utility $(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/AUBase $(inherited)"; GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/Components/"; @@ -2059,7 +2059,7 @@ "DEBUG=1", "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; 76082281008CF5F891C856DA = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = "~/SDKs/vstsdk2.4 ../../JuceLibraryCode $(DEVELOPER_DIR)/Extras/CoreAudio/PublicUtility $(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/Utility $(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/AUBase $(inherited)"; + HEADER_SEARCH_PATHS = "~/SDKs/vstsdk2.4 ../../JuceLibraryCode ../../../../modules $(DEVELOPER_DIR)/Extras/CoreAudio/PublicUtility $(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/Utility $(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/AUBase $(inherited)"; GCC_OPTIMIZATION_LEVEL = s; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Library/Audio/Plug-Ins/Components/"; diff --git a/extras/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj b/extras/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj index 8c2787edf3..437f17a431 100644 --- a/extras/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj +++ b/extras/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj @@ -31,7 +31,7 @@ Optimization="0" BufferSecurityCheck="" DebugInformationFormat="4" - AdditionalIncludeDirectories="..\..\JuceLibraryCode;c:\SDKs\vstsdk2.4" + AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules;c:\SDKs\vstsdk2.4" PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2005_78A5003=1" RuntimeLibrary="1" RuntimeTypeInfo="true" @@ -87,7 +87,7 @@ Optimization="1" InlineFunctionExpansion="1" StringPooling="true" - AdditionalIncludeDirectories="..\..\JuceLibraryCode;c:\SDKs\vstsdk2.4" + AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules;c:\SDKs\vstsdk2.4" PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2005_78A5003=1" RuntimeLibrary="0" RuntimeTypeInfo="true" diff --git a/extras/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj b/extras/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj index b0361dd289..7129131e12 100644 --- a/extras/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj +++ b/extras/audio plugin demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj @@ -31,7 +31,7 @@ Optimization="0" BufferSecurityCheck="" DebugInformationFormat="4" - AdditionalIncludeDirectories="..\..\JuceLibraryCode;c:\SDKs\vstsdk2.4" + AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules;c:\SDKs\vstsdk2.4" PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2008_78A5006=1" RuntimeLibrary="1" RuntimeTypeInfo="true" @@ -87,7 +87,7 @@ Optimization="1" InlineFunctionExpansion="1" StringPooling="true" - AdditionalIncludeDirectories="..\..\JuceLibraryCode;c:\SDKs\vstsdk2.4" + AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules;c:\SDKs\vstsdk2.4" PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2008_78A5006=1" RuntimeLibrary="0" RuntimeTypeInfo="true" diff --git a/extras/audio plugin host/Builds/Linux/Makefile b/extras/audio plugin host/Builds/Linux/Makefile index a0caf2484f..367a35c2c4 100644 --- a/extras/audio plugin host/Builds/Linux/Makefile +++ b/extras/audio plugin host/Builds/Linux/Makefile @@ -18,12 +18,12 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := -march=native endif - 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 ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode + 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 ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode -I ../../../../modules CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 CXXFLAGS += $(CFLAGS) LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt LDDEPS := - RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode + RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode -I ../../../../modules TARGET := Plugin\ Host BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) endif @@ -38,12 +38,12 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=native endif - CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode + CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode -I ../../../../modules CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -Os CXXFLAGS += $(CFLAGS) LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lGL -lX11 -lXext -lXinerama -lasound -ldl -lfreetype -lpthread -lrt LDDEPS := - RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode + RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ~/SDKs/vstsdk2.4 -I ../../JuceLibraryCode -I ../../../../modules TARGET := Plugin\ Host BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) endif diff --git a/extras/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj b/extras/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj index d013ac49a4..2d63c1e598 100644 --- a/extras/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj +++ b/extras/audio plugin host/Builds/MacOSX/Plugin Host.xcodeproj/project.pbxproj @@ -1989,7 +1989,7 @@ D1C4804CD275CB57A5C89A2D, D85C0D11EE4F6C73B9EB5BCD ); name = Source; sourceTree = ""; }; 92E529F622AC4282800634D3 = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = "~/SDKs/vstsdk2.4 ../../JuceLibraryCode $(inherited)"; + HEADER_SEARCH_PATHS = "~/SDKs/vstsdk2.4 ../../JuceLibraryCode ../../../../modules $(inherited)"; GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; @@ -2009,7 +2009,7 @@ "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; 20F59BC9E9ACBDF56007CE03 = { isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - HEADER_SEARCH_PATHS = "~/SDKs/vstsdk2.4 ../../JuceLibraryCode $(inherited)"; + HEADER_SEARCH_PATHS = "~/SDKs/vstsdk2.4 ../../JuceLibraryCode ../../../../modules $(inherited)"; GCC_OPTIMIZATION_LEVEL = s; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; diff --git a/extras/audio plugin host/Builds/VisualStudio2010/Plugin Host.vcxproj b/extras/audio plugin host/Builds/VisualStudio2010/Plugin Host.vcxproj index bdbb7d0191..ddecaa78fd 100644 --- a/extras/audio plugin host/Builds/VisualStudio2010/Plugin Host.vcxproj +++ b/extras/audio plugin host/Builds/VisualStudio2010/Plugin Host.vcxproj @@ -53,7 +53,7 @@ Disabled EditAndContinue - ..\..\JuceLibraryCode;c:\SDKs\vstsdk2.4;%(AdditionalIncludeDirectories) + ..\..\JuceLibraryCode;..\..\..\..\modules;c:\SDKs\vstsdk2.4;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2010_78A501D=1;%(PreprocessorDefinitions) MultiThreadedDebug true @@ -94,7 +94,7 @@ MinSpace - ..\..\JuceLibraryCode;c:\SDKs\vstsdk2.4;%(AdditionalIncludeDirectories) + ..\..\JuceLibraryCode;..\..\..\..\modules;c:\SDKs\vstsdk2.4;%(AdditionalIncludeDirectories) WIN32;_WINDOWS;NDEBUG;JUCER_VS2010_78A501D=1;%(PreprocessorDefinitions) MultiThreaded true diff --git a/extras/binarybuilder/Builds/Linux/Makefile b/extras/binarybuilder/Builds/Linux/Makefile index 3d8fa04eef..4e27dee706 100644 --- a/extras/binarybuilder/Builds/Linux/Makefile +++ b/extras/binarybuilder/Builds/Linux/Makefile @@ -18,12 +18,12 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := -march=native endif - 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 + 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 -I ../../../../modules CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 CXXFLAGS += $(CFLAGS) LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -ldl -lpthread -lrt LDDEPS := - 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 + 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 -I ../../../../modules TARGET := BinaryBuilder BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) endif @@ -38,12 +38,12 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=native endif - CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode + CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -Os CXXFLAGS += $(CFLAGS) LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -ldl -lpthread -lrt LDDEPS := - RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode + RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules TARGET := BinaryBuilder BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) endif diff --git a/extras/binarybuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj b/extras/binarybuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj index f63b3c693a..c0735dc32a 100644 --- a/extras/binarybuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj +++ b/extras/binarybuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj @@ -447,7 +447,7 @@ E28F51A0038F01E08E22F853, 70A875922C34E55D4F48A196 ); name = Source; sourceTree = ""; }; 3C712C667F851F9061100DD7 = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)"; + HEADER_SEARCH_PATHS = "../../JuceLibraryCode ../../../../modules $(inherited)"; GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "/usr/bin"; @@ -466,7 +466,7 @@ "DEBUG=1", "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; 145C0C90E41D8DECE4DD66AD = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)"; + HEADER_SEARCH_PATHS = "../../JuceLibraryCode ../../../../modules $(inherited)"; GCC_OPTIMIZATION_LEVEL = s; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "/usr/bin"; diff --git a/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj b/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj index 90170d4e3e..5eb078d0a9 100644 --- a/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj +++ b/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj @@ -31,7 +31,7 @@ Optimization="0" BufferSecurityCheck="" DebugInformationFormat="4" - AdditionalIncludeDirectories="..\..\JuceLibraryCode" + AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" PreprocessorDefinitions="_CONSOLE;WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2008_78A5006=1" RuntimeLibrary="1" RuntimeTypeInfo="true" @@ -87,7 +87,7 @@ Optimization="1" InlineFunctionExpansion="1" StringPooling="true" - AdditionalIncludeDirectories="..\..\JuceLibraryCode" + AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" PreprocessorDefinitions="_CONSOLE;WIN32;_WINDOWS;NDEBUG;JUCER_VS2008_78A5006=1" RuntimeLibrary="0" RuntimeTypeInfo="true" diff --git a/extras/example projects/Builds/Linux/Makefile b/extras/example projects/Builds/Linux/Makefile index 3ed450257c..e6366203a6 100644 --- a/extras/example projects/Builds/Linux/Makefile +++ b/extras/example projects/Builds/Linux/Makefile @@ -18,12 +18,12 @@ ifeq ($(CONFIG),Debug) TARGET_ARCH := -march=native endif - 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 + 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 -I ../../../../modules CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 CXXFLAGS += $(CFLAGS) LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt LDDEPS := - 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 + 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 -I ../../../../modules TARGET := HelloWorld BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) endif @@ -38,12 +38,12 @@ ifeq ($(CONFIG),Release) TARGET_ARCH := -march=native endif - CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode + CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -Os CXXFLAGS += $(CFLAGS) LDFLAGS += $(TARGET_ARCH) -L$(BINDIR) -L$(LIBDIR) -fvisibility=hidden -L/usr/X11R6/lib/ -lX11 -lXext -lXinerama -ldl -lfreetype -lpthread -lrt LDDEPS := - RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode + RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I /usr/include -I /usr/include/freetype2 -I ../../JuceLibraryCode -I ../../../../modules TARGET := HelloWorld BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) endif diff --git a/extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj b/extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj index dbe0d95662..3ffc1303bd 100644 --- a/extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj +++ b/extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj @@ -1420,7 +1420,7 @@ C581D34B32A781E9AED7F7B0, 1C83313FCFBC3FAFA8CDB087 ); name = Source; sourceTree = ""; }; 34AEE2803DA0D6192C299422 = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)"; + HEADER_SEARCH_PATHS = "../../JuceLibraryCode ../../../../modules $(inherited)"; GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; @@ -1439,7 +1439,7 @@ "DEBUG=1", "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; 339C95D5B2E96DD37B176D75 = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)"; + HEADER_SEARCH_PATHS = "../../JuceLibraryCode ../../../../modules $(inherited)"; GCC_OPTIMIZATION_LEVEL = s; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; diff --git a/extras/example projects/Builds/VisualStudio2005/HelloWorld.vcproj b/extras/example projects/Builds/VisualStudio2005/HelloWorld.vcproj index e6d246b382..00960cc545 100644 --- a/extras/example projects/Builds/VisualStudio2005/HelloWorld.vcproj +++ b/extras/example projects/Builds/VisualStudio2005/HelloWorld.vcproj @@ -31,7 +31,7 @@ Optimization="0" BufferSecurityCheck="" DebugInformationFormat="4" - AdditionalIncludeDirectories="..\..\JuceLibraryCode" + AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2005_78A5003=1" RuntimeLibrary="1" RuntimeTypeInfo="true" @@ -87,7 +87,7 @@ Optimization="1" InlineFunctionExpansion="1" StringPooling="true" - AdditionalIncludeDirectories="..\..\JuceLibraryCode" + AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2005_78A5003=1" RuntimeLibrary="0" RuntimeTypeInfo="true" diff --git a/extras/example projects/Builds/VisualStudio2008/HelloWorld.vcproj b/extras/example projects/Builds/VisualStudio2008/HelloWorld.vcproj index ff33a673f8..38ef2d0c07 100644 --- a/extras/example projects/Builds/VisualStudio2008/HelloWorld.vcproj +++ b/extras/example projects/Builds/VisualStudio2008/HelloWorld.vcproj @@ -31,7 +31,7 @@ Optimization="0" BufferSecurityCheck="" DebugInformationFormat="4" - AdditionalIncludeDirectories="..\..\JuceLibraryCode" + AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2008_78A5006=1" RuntimeLibrary="1" RuntimeTypeInfo="true" @@ -87,7 +87,7 @@ Optimization="1" InlineFunctionExpansion="1" StringPooling="true" - AdditionalIncludeDirectories="..\..\JuceLibraryCode" + AdditionalIncludeDirectories="..\..\JuceLibraryCode;..\..\..\..\modules" PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2008_78A5006=1" RuntimeLibrary="0" RuntimeTypeInfo="true" diff --git a/extras/example projects/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj b/extras/example projects/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj index 84e333c08a..afbb65f30d 100644 --- a/extras/example projects/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj +++ b/extras/example projects/Builds/iOS/HelloWorld.xcodeproj/project.pbxproj @@ -1417,7 +1417,7 @@ C581D34B32A781E9AED7F7B0, 1C83313FCFBC3FAFA8CDB087 ); name = Source; sourceTree = ""; }; 34AEE2803DA0D6192C299422 = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)"; + HEADER_SEARCH_PATHS = "../../JuceLibraryCode ../../../../modules $(inherited)"; GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; @@ -1434,7 +1434,7 @@ "DEBUG=1", "JUCER_XCODE_IPHONE_5BC26AE3=1"); }; name = Debug; }; 339C95D5B2E96DD37B176D75 = { isa = XCBuildConfiguration; buildSettings = { - HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)"; + HEADER_SEARCH_PATHS = "../../JuceLibraryCode ../../../../modules $(inherited)"; GCC_OPTIMIZATION_LEVEL = s; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications";