From 44ece5a54aa40152c69794e9da77def279c38af1 Mon Sep 17 00:00:00 2001 From: Julian Storer Date: Fri, 15 Oct 2010 16:26:58 +0100 Subject: [PATCH] Updated the new jucer to handle inherited preprocessor defs, and to use them when expanding some of its parameter strings. --- Builds/Linux/Makefile | 8 +-- Builds/MacOSX/Juce.xcodeproj/project.pbxproj | 10 +-- Builds/VisualStudio2005/Juce.vcproj | 4 +- Builds/VisualStudio2008/Juce.vcproj | 4 +- Builds/VisualStudio2008_DLL/Juce.vcproj | 4 +- Builds/VisualStudio2010/Juce.vcxproj | 4 +- Builds/iPhone/Juce.xcodeproj/project.pbxproj | 10 +-- .../Builds/Linux/Makefile | 8 +-- .../The Jucer.xcodeproj/project.pbxproj | 10 +-- .../Builds/VisualStudio2005/The Jucer.vcproj | 4 +- .../Builds/VisualStudio2008/The Jucer.vcproj | 4 +- .../Builds/VisualStudio2010/The Jucer.vcxproj | 4 +- .../Source/Application/jucer_JuceUpdater.cpp | 4 +- .../Source/Project/jucer_Project.cpp | 24 ++++--- .../Source/Project/jucer_Project.h | 9 ++- .../Source/Project/jucer_ProjectExport_MSVC.h | 59 ++++++++++----- .../Source/Project/jucer_ProjectExport_Make.h | 27 ++++--- .../Project/jucer_ProjectExport_XCode.h | 42 ++++++----- .../Source/Project/jucer_ProjectExporter.cpp | 24 ++++--- .../Source/Project/jucer_ProjectExporter.h | 7 +- .../Source/Utility/jucer_MiscUtilities.cpp | 71 +++++++++++++++++++ .../Source/Utility/jucer_MiscUtilities.h | 4 ++ .../Source/Utility/jucer_PresetIDs.h | 3 + extras/amalgamator/Amalgamator.jucer | 4 +- extras/amalgamator/Builds/Linux/Makefile | 8 +-- .../Amalgamator.xcodeproj/project.pbxproj | 10 +-- .../VisualStudio2005/Amalgamator.vcproj | 4 +- .../VisualStudio2008/Amalgamator.vcproj | 4 +- .../audio plugin host/Builds/Linux/Makefile | 8 +-- .../Plugin Host.xcodeproj/project.pbxproj | 10 +-- .../VisualStudio2005/Plugin Host.vcproj | 4 +- .../VisualStudio2008/Plugin Host.vcproj | 4 +- .../audio plugins/demo/Builds/Linux/Makefile | 8 +-- .../JuceDemoPlugin.xcodeproj/project.pbxproj | 14 ++-- .../VisualStudio2005/JuceDemoPlugin.vcproj | 4 +- .../VisualStudio2008/JuceDemoPlugin.vcproj | 4 +- extras/binarybuilder/Builds/Linux/Makefile | 8 +-- .../BinaryBuilder.xcodeproj/project.pbxproj | 10 +-- .../VisualStudio2005/BinaryBuilder.vcproj | 4 +- .../VisualStudio2008/BinaryBuilder.vcproj | 4 +- extras/example projects/Builds/Linux/Makefile | 8 +-- .../HelloWorld.xcodeproj/project.pbxproj | 10 +-- .../Builds/VisualStudio2005/HelloWorld.vcproj | 4 +- .../Builds/VisualStudio2008/HelloWorld.vcproj | 4 +- .../HelloWorld.xcodeproj/project.pbxproj | 10 +-- extras/juce demo/Builds/Linux/Makefile | 8 +-- .../Juce Demo.xcodeproj/project.pbxproj | 14 ++-- .../Builds/VisualStudio2005/Juce Demo.vcproj | 4 +- .../Builds/VisualStudio2008/Juce Demo.vcproj | 4 +- .../Builds/VisualStudio2010/Juce Demo.vcxproj | 4 +- .../Juce Demo.xcodeproj/project.pbxproj | 14 ++-- 51 files changed, 349 insertions(+), 195 deletions(-) diff --git a/Builds/Linux/Makefile b/Builds/Linux/Makefile index 7f368b7736..283fd2b3dd 100644 --- a/Builds/Linux/Makefile +++ b/Builds/Linux/Makefile @@ -13,12 +13,12 @@ ifeq ($(CONFIG),Debug) LIBDIR := build OBJDIR := build/intermediate/Debug OUTDIR := build - CPPFLAGS := $(DEPFLAGS) -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "/usr/include" -I "/usr/include/freetype2" CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -O0 CXXFLAGS += $(CFLAGS) LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L"/usr/X11R6/lib/" -L"../.././bin" -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound LDDEPS := - RESFLAGS := -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=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" TARGET := libjucedebug.a BLDCMD = ar -rcs $(OUTDIR)/$(TARGET) $(OBJECTS) $(TARGET_ARCH) endif @@ -28,12 +28,12 @@ ifeq ($(CONFIG),Release) LIBDIR := build OBJDIR := build/intermediate/Release OUTDIR := build - CPPFLAGS := $(DEPFLAGS) -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=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" CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -Os CXXFLAGS += $(CFLAGS) LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -L"/usr/X11R6/lib/" -L"../.././bin" -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound LDDEPS := - RESFLAGS := -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=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" TARGET := libjuce.a BLDCMD = ar -rcs $(OUTDIR)/$(TARGET) $(OBJECTS) $(TARGET_ARCH) endif diff --git a/Builds/MacOSX/Juce.xcodeproj/project.pbxproj b/Builds/MacOSX/Juce.xcodeproj/project.pbxproj index 10383fe724..5ea7c32cee 100644 --- a/Builds/MacOSX/Juce.xcodeproj/project.pbxproj +++ b/Builds/MacOSX/Juce.xcodeproj/project.pbxproj @@ -1862,9 +1862,9 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( - "JUCER_XCODE_MAC_F6D2F4CF=1", "_DEBUG=1", - "DEBUG=1 "); }; name = Debug; }; + "DEBUG=1", + "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; 9DE19CD5BB8E12A153385ADD = { isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; PREBINDING = NO; @@ -1879,9 +1879,9 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( - "JUCER_XCODE_MAC_F6D2F4CF=1", "_NDEBUG=1", - "NDEBUG=1 "); }; name = Release; }; + "NDEBUG=1", + "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Release; }; 8E935B9E7F2982A06CD7EF99 = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; GCC_C_LANGUAGE_STANDARD = c99; @@ -1891,6 +1891,7 @@ GCC_WARN_MISSING_PARENTHESES = YES; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; + WARNING_CFLAGS = -Wreorder; GCC_MODEL_TUNING = G5; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO; @@ -1906,6 +1907,7 @@ GCC_WARN_MISSING_PARENTHESES = YES; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; + WARNING_CFLAGS = -Wreorder; GCC_MODEL_TUNING = G5; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO; diff --git a/Builds/VisualStudio2005/Juce.vcproj b/Builds/VisualStudio2005/Juce.vcproj index 21690ba386..1ca5b09e79 100644 --- a/Builds/VisualStudio2005/Juce.vcproj +++ b/Builds/VisualStudio2005/Juce.vcproj @@ -26,7 +26,7 @@ BufferSecurityCheck="" DebugInformationFormat="3" AdditionalIncludeDirectories="" - PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;_DEBUG;_LIB" + PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;_LIB;JUCER_VS2005_78A5003=1" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -69,7 +69,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="" - PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;NDEBUG;_LIB" + PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_LIB;JUCER_VS2005_78A5003=1" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" diff --git a/Builds/VisualStudio2008/Juce.vcproj b/Builds/VisualStudio2008/Juce.vcproj index a4f3a8bf1c..886507abbd 100644 --- a/Builds/VisualStudio2008/Juce.vcproj +++ b/Builds/VisualStudio2008/Juce.vcproj @@ -26,7 +26,7 @@ BufferSecurityCheck="" DebugInformationFormat="3" AdditionalIncludeDirectories="" - PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;_DEBUG;_LIB" + PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;_LIB;JUCER_VS2008_78A5006=1" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -69,7 +69,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="" - PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;NDEBUG;_LIB" + PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_LIB;JUCER_VS2008_78A5006=1" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" diff --git a/Builds/VisualStudio2008_DLL/Juce.vcproj b/Builds/VisualStudio2008_DLL/Juce.vcproj index e60da01048..5659a40516 100644 --- a/Builds/VisualStudio2008_DLL/Juce.vcproj +++ b/Builds/VisualStudio2008_DLL/Juce.vcproj @@ -26,7 +26,7 @@ BufferSecurityCheck="" DebugInformationFormat="3" AdditionalIncludeDirectories="" - PreprocessorDefinitions="JUCER_VS2008_9A63150B;WIN32;_WINDOWS;_DEBUG;_LIB;JUCE_DLL_BUILD=1;JUCE_DLL=1" + PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;_LIB;JUCE_DLL_BUILD=1;JUCE_DLL=1;JUCER_VS2008_9A63150B=1" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -70,7 +70,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="" - PreprocessorDefinitions="JUCER_VS2008_9A63150B;WIN32;_WINDOWS;NDEBUG;_LIB;JUCE_DLL_BUILD=1;JUCE_DLL=1" + PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_LIB;JUCE_DLL_BUILD=1;JUCE_DLL=1;JUCER_VS2008_9A63150B=1" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" diff --git a/Builds/VisualStudio2010/Juce.vcxproj b/Builds/VisualStudio2010/Juce.vcxproj index 3f2f974fed..d42dc99c6e 100644 --- a/Builds/VisualStudio2010/Juce.vcxproj +++ b/Builds/VisualStudio2010/Juce.vcxproj @@ -54,7 +54,7 @@ Disabled EditAndContinue %(AdditionalIncludeDirectories) - JUCER_VS2010_78A501D;WIN32;_WINDOWS;_DEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;_WINDOWS;DEBUG;_DEBUG;_LIB;JUCER_VS2010_78A501D=1;%(PreprocessorDefinitions) MultiThreadedDebug true @@ -92,7 +92,7 @@ MaxSpeed %(AdditionalIncludeDirectories) - JUCER_VS2010_78A501D;WIN32;_WINDOWS;NDEBUG;_LIB;%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;_LIB;JUCER_VS2010_78A501D=1;%(PreprocessorDefinitions) MultiThreaded true diff --git a/Builds/iPhone/Juce.xcodeproj/project.pbxproj b/Builds/iPhone/Juce.xcodeproj/project.pbxproj index 9be17be6d9..4071854ac5 100644 --- a/Builds/iPhone/Juce.xcodeproj/project.pbxproj +++ b/Builds/iPhone/Juce.xcodeproj/project.pbxproj @@ -1862,9 +1862,9 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( - "JUCER_XCODE_IPHONE_25ADD7EF=1", "_DEBUG=1", - "DEBUG=1 "); }; name = Debug; }; + "DEBUG=1", + "JUCER_XCODE_IPHONE_25ADD7EF=1"); }; name = Debug; }; 9DE19CD5BB8E12A153385ADD = { isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; PREBINDING = NO; @@ -1879,9 +1879,9 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( - "JUCER_XCODE_IPHONE_25ADD7EF=1", "_NDEBUG=1", - "NDEBUG=1 "); }; name = Release; }; + "NDEBUG=1", + "JUCER_XCODE_IPHONE_25ADD7EF=1"); }; name = Release; }; 8E935B9E7F2982A06CD7EF99 = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; GCC_C_LANGUAGE_STANDARD = c99; @@ -1891,6 +1891,7 @@ GCC_WARN_MISSING_PARENTHESES = YES; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; + WARNING_CFLAGS = -Wreorder; GCC_MODEL_TUNING = G5; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO; @@ -1906,6 +1907,7 @@ GCC_WARN_MISSING_PARENTHESES = YES; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; + WARNING_CFLAGS = -Wreorder; GCC_MODEL_TUNING = G5; GCC_INLINES_ARE_PRIVATE_EXTERN = NO; GCC_SYMBOLS_PRIVATE_EXTERN = NO; diff --git a/extras/Jucer (experimental)/Builds/Linux/Makefile b/extras/Jucer (experimental)/Builds/Linux/Makefile index 522443f489..54de5f27bb 100644 --- a/extras/Jucer (experimental)/Builds/Linux/Makefile +++ b/extras/Jucer (experimental)/Builds/Linux/Makefile @@ -17,12 +17,12 @@ ifeq ($(CONFIG),Debug) LIBDIR := build OBJDIR := build/intermediate/Debug OUTDIR := build - CPPFLAGS := $(DEPFLAGS) -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "/usr/include" -I "/usr/include/freetype2" 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 "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=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" TARGET := Jucer 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 "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=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" 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 "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=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" TARGET := Jucer BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) endif diff --git a/extras/Jucer (experimental)/Builds/MacOSX/The Jucer.xcodeproj/project.pbxproj b/extras/Jucer (experimental)/Builds/MacOSX/The Jucer.xcodeproj/project.pbxproj index 129120d478..7ad0cca98c 100644 --- a/extras/Jucer (experimental)/Builds/MacOSX/The Jucer.xcodeproj/project.pbxproj +++ b/extras/Jucer (experimental)/Builds/MacOSX/The Jucer.xcodeproj/project.pbxproj @@ -254,9 +254,9 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( - "JUCER_XCODE_MAC_F6D2F4CF=1", "_DEBUG=1", - "DEBUG=1 "); }; name = Debug; }; + "DEBUG=1", + "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; 673FACB8969ADED17ACEFF7C = { isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; PREBINDING = NO; @@ -268,9 +268,9 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( - "JUCER_XCODE_MAC_F6D2F4CF=1", "_NDEBUG=1", - "NDEBUG=1 "); }; name = Release; }; + "NDEBUG=1", + "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Release; }; 69D26A715A354ED1735D8438 = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; GCC_C_LANGUAGE_STANDARD = c99; @@ -280,6 +280,7 @@ GCC_WARN_MISSING_PARENTHESES = YES; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; + WARNING_CFLAGS = -Wreorder; GCC_MODEL_TUNING = G5; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; ZERO_LINK = NO; @@ -294,6 +295,7 @@ GCC_WARN_MISSING_PARENTHESES = YES; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; + WARNING_CFLAGS = -Wreorder; GCC_MODEL_TUNING = G5; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; ZERO_LINK = NO; diff --git a/extras/Jucer (experimental)/Builds/VisualStudio2005/The Jucer.vcproj b/extras/Jucer (experimental)/Builds/VisualStudio2005/The Jucer.vcproj index cced041554..b81b006292 100644 --- a/extras/Jucer (experimental)/Builds/VisualStudio2005/The Jucer.vcproj +++ b/extras/Jucer (experimental)/Builds/VisualStudio2005/The Jucer.vcproj @@ -33,7 +33,7 @@ BufferSecurityCheck="" DebugInformationFormat="4" AdditionalIncludeDirectories="" - PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;_DEBUG" + PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2005_78A5003=1" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -89,7 +89,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="" - PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;NDEBUG" + PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2005_78A5003=1" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" diff --git a/extras/Jucer (experimental)/Builds/VisualStudio2008/The Jucer.vcproj b/extras/Jucer (experimental)/Builds/VisualStudio2008/The Jucer.vcproj index 6558ce1a29..dfcfa551f9 100644 --- a/extras/Jucer (experimental)/Builds/VisualStudio2008/The Jucer.vcproj +++ b/extras/Jucer (experimental)/Builds/VisualStudio2008/The Jucer.vcproj @@ -33,7 +33,7 @@ BufferSecurityCheck="" DebugInformationFormat="4" AdditionalIncludeDirectories="" - PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;_DEBUG" + PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2008_78A5006=1" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -89,7 +89,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="" - PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;NDEBUG" + PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2008_78A5006=1" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" diff --git a/extras/Jucer (experimental)/Builds/VisualStudio2010/The Jucer.vcxproj b/extras/Jucer (experimental)/Builds/VisualStudio2010/The Jucer.vcxproj index 1d06fb7029..6971cec82c 100644 --- a/extras/Jucer (experimental)/Builds/VisualStudio2010/The Jucer.vcxproj +++ b/extras/Jucer (experimental)/Builds/VisualStudio2010/The Jucer.vcxproj @@ -54,7 +54,7 @@ Disabled EditAndContinue %(AdditionalIncludeDirectories) - JUCER_VS2010_78A501D;WIN32;_WINDOWS;_DEBUG;%(PreprocessorDefinitions) + WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2010_78A501D=1;%(PreprocessorDefinitions) MultiThreadedDebug true @@ -92,7 +92,7 @@ MaxSpeed %(AdditionalIncludeDirectories) - JUCER_VS2010_78A501D;WIN32;_WINDOWS;NDEBUG;%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;JUCER_VS2010_78A501D=1;%(PreprocessorDefinitions) MultiThreaded true diff --git a/extras/Jucer (experimental)/Source/Application/jucer_JuceUpdater.cpp b/extras/Jucer (experimental)/Source/Application/jucer_JuceUpdater.cpp index 7de8f5fb6a..f6eea73357 100644 --- a/extras/Jucer (experimental)/Source/Application/jucer_JuceUpdater.cpp +++ b/extras/Jucer (experimental)/Source/Application/jucer_JuceUpdater.cpp @@ -219,7 +219,7 @@ class Unzipper : public ThreadWithProgressWindow public: Unzipper (ZipFile& zipFile_, const File& targetDir_) : ThreadWithProgressWindow ("Unzipping...", true, true), - zipFile (zipFile_), targetDir (targetDir_), worked (true) + worked (true), zipFile (zipFile_), targetDir (targetDir_) { } @@ -389,8 +389,8 @@ Component* JuceUpdater::refreshComponentForRow (int rowNumber, bool isRowSelecte private: JuceUpdater& updater; - TextButton applyButton; VersionInfo* version; + TextButton applyButton; }; UpdateListComponent* c = dynamic_cast (existingComponentToUpdate); diff --git a/extras/Jucer (experimental)/Source/Project/jucer_Project.cpp b/extras/Jucer (experimental)/Source/Project/jucer_Project.cpp index 8d2551e1d9..109bf84159 100644 --- a/extras/Jucer (experimental)/Source/Project/jucer_Project.cpp +++ b/extras/Jucer (experimental)/Source/Project/jucer_Project.cpp @@ -226,11 +226,13 @@ void Project::valueTreeParentChanged (ValueTree& tree) } //============================================================================== -const File Project::resolveFilename (const String& filename) const +const File Project::resolveFilename (String filename) const { if (filename.isEmpty()) return File::nonexistent; + filename = replacePreprocessorDefs (getPreprocessorDefs(), filename); + if (File::isAbsolutePath (filename)) return File (filename); @@ -411,6 +413,9 @@ void Project::createPropertyEditors (Array & props) "ePlugInCategory_Dither, ePlugInCategory_SoundField"); } + props.add (new TextPropertyComponent (getProjectPreprocessorDefs(), "Preprocessor definitions", 32768, false)); + props.getLast()->setTooltip ("Extra preprocessor definitions. Use the form \"NAME1=value NAME2=value\", using whitespace or commas to separate the items - to include a space or comma in a definition, precede it with a backslash."); + for (int i = props.size(); --i >= 0;) props.getUnchecked(i)->setPreferredHeight (22); } @@ -435,6 +440,11 @@ const Image Project::getSmallIcon() return Image(); } +const StringPairArray Project::getPreprocessorDefs() const +{ + return parsePreprocessorDefs (getProjectPreprocessorDefs().toString()); +} + //============================================================================== Project::Item Project::getMainGroup() { @@ -954,8 +964,8 @@ void Project::BuildConfiguration::createPropertyEditors (Array setTooltip ("Extra header search paths. Use semi-colons to separate multiple paths."); - props.add (new TextPropertyComponent (getPreprocessorDefs(), "Preprocessor definitions", 32768, false)); - props.getLast()->setTooltip ("Extra preprocessor definitions. Use whitespace or commas as a delimiter."); + props.add (new TextPropertyComponent (getBuildConfigPreprocessorDefs(), "Preprocessor definitions", 32768, false)); + props.getLast()->setTooltip ("Extra preprocessor definitions. Use the form \"NAME1=value NAME2=value\", using whitespace or commas to separate the items - to include a space or comma in a definition, precede it with a backslash."); if (getMacSDKVersion().toString().isEmpty()) getMacSDKVersion() = osxVersionDefault; @@ -976,12 +986,10 @@ void Project::BuildConfiguration::createPropertyEditors (Array setPreferredHeight (22); } -const StringArray Project::BuildConfiguration::parsePreprocessorDefs() const +const StringPairArray Project::BuildConfiguration::getAllPreprocessorDefs() const { - StringArray defines; - defines.addTokens (getPreprocessorDefs().toString(), " ,;", String::empty); - defines.removeEmptyStrings (true); - return defines; + return mergePreprocessorDefs (project->getPreprocessorDefs(), + parsePreprocessorDefs (getBuildConfigPreprocessorDefs().toString())); } const StringArray Project::BuildConfiguration::getHeaderSearchPaths() const diff --git a/extras/Jucer (experimental)/Source/Project/jucer_Project.h b/extras/Jucer (experimental)/Source/Project/jucer_Project.h index 4687f493a7..c63f4cf062 100644 --- a/extras/Jucer (experimental)/Source/Project/jucer_Project.h +++ b/extras/Jucer (experimental)/Source/Project/jucer_Project.h @@ -56,7 +56,7 @@ public: //============================================================================== bool shouldBeAddedToBinaryResourcesByDefault (const File& file); - const File resolveFilename (const String& filename) const; + const File resolveFilename (String filename) const; const String getRelativePathForFile (const File& file) const; //============================================================================== @@ -102,6 +102,9 @@ public: //============================================================================== Value getProjectValue (const Identifier& name) const { return projectRoot.getPropertyAsValue (name, getUndoManagerFor (projectRoot)); } + Value getProjectPreprocessorDefs() const { return getProjectValue (Ids::defines); } + const StringPairArray getPreprocessorDefs() const; + Value getBigIconImageItemID() const { return getProjectValue ("bigIcon"); } Value getSmallIconImageItemID() const { return getProjectValue ("smallIcon"); } const Image getBigIcon(); @@ -238,8 +241,8 @@ public: Value getTargetBinaryRelativePath() const { return getValue (Ids::binaryPath); } Value getOptimisationLevel() const { return getValue (Ids::optimisation); } const String getGCCOptimisationFlag() const; - Value getPreprocessorDefs() const { return getValue (Ids::defines); } - const StringArray parsePreprocessorDefs() const; + Value getBuildConfigPreprocessorDefs() const { return getValue (Ids::defines); } + const StringPairArray getAllPreprocessorDefs() const; // includes inherited definitions Value getHeaderSearchPath() const { return getValue (Ids::headerPath); } const StringArray getHeaderSearchPaths() const; diff --git a/extras/Jucer (experimental)/Source/Project/jucer_ProjectExport_MSVC.h b/extras/Jucer (experimental)/Source/Project/jucer_ProjectExport_MSVC.h index 6ee13055d4..5aafac0817 100644 --- a/extras/Jucer (experimental)/Source/Project/jucer_ProjectExport_MSVC.h +++ b/extras/Jucer (experimental)/Source/Project/jucer_ProjectExport_MSVC.h @@ -136,28 +136,48 @@ protected: const String getPreprocessorDefs (const Project::BuildConfiguration& config, const String& joinString) const { - StringArray defines; - defines.add (getExporterIdentifierMacro()); - defines.add ("WIN32"); - defines.add ("_WINDOWS"); - defines.add (config.isDebug().getValue() ? "_DEBUG" : "NDEBUG"); + StringPairArray defines; + defines.set ("WIN32", ""); + defines.set ("_WINDOWS", ""); + + if (config.isDebug().getValue()) + { + defines.set ("DEBUG", ""); + defines.set ("_DEBUG", ""); + } + else + { + defines.set ("NDEBUG", ""); + } + if (project.isCommandLineApp()) - defines.add ("_CONSOLE"); + defines.set ("_CONSOLE", ""); if (project.isLibrary()) - defines.add ("_LIB"); + defines.set ("_LIB", ""); if (isRTAS()) { RelativePath rtasFolder (getRTASFolder().toString(), RelativePath::unknown); - defines.add ("JucePlugin_WinBag_path=" - + CodeHelpers::addEscapeChars (rtasFolder.getChildFile ("WinBag") - .toWindowsStyle().quoted())); + defines.set ("JucePlugin_WinBag_path", CodeHelpers::addEscapeChars (rtasFolder.getChildFile ("WinBag") + .toWindowsStyle().quoted())); + } + + defines = mergePreprocessorDefs (defines, getAllPreprocessorDefs (config)); + + StringArray result; + + for (int i = 0; i < defines.size(); ++i) + { + String def (defines.getAllKeys()[i]); + const String value (defines.getAllValues()[i]); + if (value.isNotEmpty()) + def << "=" << value; + + result.add (def); } - defines.addArray (config.parsePreprocessorDefs()); - defines.addArray (parsePreprocessorDefs()); - return defines.joinIntoString (joinString); + return result.joinIntoString (joinString); } const StringArray getHeaderSearchPaths (const Project::BuildConfiguration& config) const @@ -692,8 +712,9 @@ protected: compiler->setAttribute ("WarningLevel", "4"); compiler->setAttribute ("SuppressStartupBanner", "true"); - if (getExtraCompilerFlags().toString().isNotEmpty()) - compiler->setAttribute ("AdditionalOptions", getExtraCompilerFlags().toString().trim()); + const String extraFlags (replacePreprocessorTokens (config, getExtraCompilerFlags().toString()).trim()); + if (extraFlags.isNotEmpty()) + compiler->setAttribute ("AdditionalOptions", extraFlags); } createToolElement (xml, "VCManagedResourceCompilerTool"); @@ -743,7 +764,7 @@ protected: } if (extraLinkerOptions.isNotEmpty()) - linker->setAttribute ("AdditionalOptions", extraLinkerOptions.trim()); + linker->setAttribute ("AdditionalOptions", replacePreprocessorTokens (config, extraLinkerOptions).trim()); } else { @@ -753,7 +774,7 @@ protected: String extraLinkerOptions (getExtraLinkerFlags().toString()); extraLinkerOptions << " /IMPLIB:" << FileHelpers::windowsStylePath (binariesPath + "/" + outputFileName.upToLastOccurrenceOf (".", false, false) + ".lib"); - linker->setAttribute ("AdditionalOptions", extraLinkerOptions.trim()); + linker->setAttribute ("AdditionalOptions", replacePreprocessorTokens (config, extraLinkerOptions).trim()); linker->setAttribute ("OutputFile", FileHelpers::windowsStylePath (binariesPath + "/" + outputFileName)); linker->setAttribute ("IgnoreDefaultLibraryNames", isDebug ? "libcmt.lib, msvcrt.lib" : ""); @@ -969,7 +990,7 @@ private: << "# ADD CPP /nologo " << (isDebug ? "/MTd" : "/MT") << " /W3 /GR /GX /" << optimisationFlag << " /I " << getHeaderSearchPaths (config).joinIntoString (" /I ") << " /D " << defines << " /D \"_UNICODE\" /D \"UNICODE\" /FD /c /Zm1024 " << extraDebugFlags - << " " << getExtraCompilerFlags().toString().trim() << newLine; + << " " << replacePreprocessorTokens (config, getExtraCompilerFlags().toString()).trim() << newLine; if (! isDebug) out << "# SUBTRACT CPP /YX" << newLine; @@ -1000,7 +1021,7 @@ private: << " /nologo /machine:I386 /out:\"" << targetBinary << "\" " << (isDLL ? "/dll" : (project.isCommandLineApp() ? "/subsystem:console " : "/subsystem:windows ")) - << getExtraLinkerFlags().toString().trim() << newLine; + << replacePreprocessorTokens (config, getExtraLinkerFlags().toString()).trim() << newLine; } } diff --git a/extras/Jucer (experimental)/Source/Project/jucer_ProjectExport_Make.h b/extras/Jucer (experimental)/Source/Project/jucer_ProjectExport_Make.h index 8518a24370..1fe3956ac9 100644 --- a/extras/Jucer (experimental)/Source/Project/jucer_ProjectExport_Make.h +++ b/extras/Jucer (experimental)/Source/Project/jucer_ProjectExport_Make.h @@ -128,25 +128,30 @@ private: void writeDefineFlags (OutputStream& out, const Project::BuildConfiguration& config) { - StringArray defines; - defines.add (getExporterIdentifierMacro() + "=1"); - defines.add ("LINUX=1"); + StringPairArray defines; + defines.set ("LINUX", "1"); if (config.isDebug().getValue()) { - defines.add ("DEBUG=1"); - defines.add ("_DEBUG=1"); + defines.set ("DEBUG", "1"); + defines.set ("_DEBUG", "1"); } else { - defines.add ("NDEBUG=1"); + defines.set ("NDEBUG", "1"); } - defines.addArray (config.parsePreprocessorDefs()); - defines.addArray (parsePreprocessorDefs()); + defines = mergePreprocessorDefs (defines, getAllPreprocessorDefs (config)); for (int i = 0; i < defines.size(); ++i) - out << " -D " << defines[i].quoted(); + { + String def (defines.getAllKeys()[i]); + const String value (defines.getAllValues()[i]); + if (value.isNotEmpty()) + def << "=" << value; + + out << " -D " << def.quoted(); + } } void writeHeaderPathFlags (OutputStream& out, const Project::BuildConfiguration& config) @@ -198,7 +203,7 @@ private: for (int i = 0; i < libs.size(); ++i) out << " -l" << libs[i]; - out << " " << getExtraLinkerFlags().toString().trim() + out << " " << replacePreprocessorTokens (config, getExtraLinkerFlags().toString()).trim() << newLine; } @@ -225,7 +230,7 @@ private: out << " -O" << config.getGCCOptimisationFlag() << newLine; - out << " CXXFLAGS += $(CFLAGS) " << getExtraCompilerFlags().toString().trim() << newLine; + out << " CXXFLAGS += $(CFLAGS) " << replacePreprocessorTokens (config, getExtraCompilerFlags().toString()).trim() << newLine; writeLinkerFlags (out, config); diff --git a/extras/Jucer (experimental)/Source/Project/jucer_ProjectExport_XCode.h b/extras/Jucer (experimental)/Source/Project/jucer_ProjectExport_XCode.h index e6ab2d9ec3..e5a5375b9d 100644 --- a/extras/Jucer (experimental)/Source/Project/jucer_ProjectExport_XCode.h +++ b/extras/Jucer (experimental)/Source/Project/jucer_ProjectExport_XCode.h @@ -352,7 +352,8 @@ private: addPlistDictionaryKey (dict, "CFBundleVersion", project.getVersion().toString()); StringArray documentExtensions; - documentExtensions.addTokens (getSetting ("documentExtensions").toString(), ",", String::empty); + documentExtensions.addTokens (replacePreprocessorDefs (project.getPreprocessorDefs(), getSetting ("documentExtensions").toString()), + ",", String::empty); documentExtensions.trim(); documentExtensions.removeEmptyStrings (true); @@ -475,7 +476,7 @@ private: getLinkerFlagsForStaticLibrary (juceLib, flags, librarySearchPaths); } - flags.add (getExtraLinkerFlags().toString()); + flags.add (replacePreprocessorTokens (config, getExtraLinkerFlags().toString())); flags.removeEmptyStrings (true); } @@ -521,8 +522,9 @@ private: s.add ("GCC_OPTIMIZATION_LEVEL = " + config.getGCCOptimisationFlag()); s.add ("INFOPLIST_FILE = " + infoPlistFile.getFileName()); - if (getExtraCompilerFlags().toString().isNotEmpty()) - s.add ("OTHER_CPLUSPLUSFLAGS = " + getExtraCompilerFlags().toString()); + const String extraFlags (replacePreprocessorTokens (config, getExtraCompilerFlags().toString()).trim()); + if (extraFlags.isNotEmpty()) + s.add ("OTHER_CPLUSPLUSFLAGS = " + extraFlags); if (project.isGUIApplication()) { @@ -616,14 +618,12 @@ private: } } - StringArray defines; - - defines.add (getExporterIdentifierMacro() + "=1"); + StringPairArray defines; if (config.isDebug().getValue()) { - defines.add ("_DEBUG=1"); - defines.add ("DEBUG=1 "); + defines.set ("_DEBUG", "1"); + defines.set ("DEBUG", "1"); s.add ("ONLY_ACTIVE_ARCH = YES"); s.add ("COPY_PHASE_STRIP = NO"); s.add ("GCC_DYNAMIC_NO_PIC = NO"); @@ -631,8 +631,8 @@ private: } else { - defines.add ("_NDEBUG=1"); - defines.add ("NDEBUG=1 "); + defines.set ("_NDEBUG", "1"); + defines.set ("NDEBUG", "1"); s.add ("GCC_GENERATE_DEBUGGING_SYMBOLS = NO"); s.add ("GCC_SYMBOLS_PRIVATE_EXTERN = YES"); } @@ -640,17 +640,25 @@ private: { const String objCSuffix (getSetting ("objCExtraSuffix").toString().trim()); if (objCSuffix.isNotEmpty()) - defines.add ("JUCE_ObjCExtraSuffix=" + objCSuffix); + defines.set ("JUCE_ObjCExtraSuffix", replacePreprocessorTokens (config, objCSuffix)); } { - defines.addArray (config.parsePreprocessorDefs()); - defines.addArray (parsePreprocessorDefs()); + defines = mergePreprocessorDefs (defines, getAllPreprocessorDefs (config)); + + StringArray defsList; - for (int i = defines.size(); --i >= 0;) - defines.set (i, defines[i].quoted()); + for (int i = 0; i < defines.size(); ++i) + { + String def (defines.getAllKeys()[i]); + const String value (defines.getAllValues()[i]); + if (value.isNotEmpty()) + def << "=" << value; + + defsList.add (def.quoted()); + } - s.add ("GCC_PREPROCESSOR_DEFINITIONS = (" + indentList (defines, ",") + ")"); + s.add ("GCC_PREPROCESSOR_DEFINITIONS = (" + indentList (defsList, ",") + ")"); } return s; diff --git a/extras/Jucer (experimental)/Source/Project/jucer_ProjectExporter.cpp b/extras/Jucer (experimental)/Source/Project/jucer_ProjectExporter.cpp index 434270a685..0798663e07 100644 --- a/extras/Jucer (experimental)/Source/Project/jucer_ProjectExporter.cpp +++ b/extras/Jucer (experimental)/Source/Project/jucer_ProjectExporter.cpp @@ -176,12 +176,13 @@ void ProjectExporter::createPropertyEditors (Array & props) } } - props.add (new TextPropertyComponent (getExtraPreprocessorDefs(), "Extra Preprocessor Definitions", 32768, false)); - props.getLast()->setTooltip ("Extra preprocessor definitions. Use whitespace or commas as a delimiter."); + props.add (new TextPropertyComponent (getExporterPreprocessorDefs(), "Extra Preprocessor Definitions", 32768, false)); + props.getLast()->setTooltip ("Extra preprocessor definitions. Use the form \"NAME1=value NAME2=value\", using whitespace or commas to separate the items - to include a space or comma in a definition, precede it with a backslash."); + props.add (new TextPropertyComponent (getExtraCompilerFlags(), "Extra compiler flags", 2048, false)); - props.getLast()->setTooltip ("Extra command-line flags to be passed to the compiler"); + props.getLast()->setTooltip ("Extra command-line flags to be passed to the compiler. This string can contain references to preprocessor definitions in the form ${NAME_OF_DEFINITION}, which will be replaced with their values."); props.add (new TextPropertyComponent (getExtraLinkerFlags(), "Extra linker flags", 2048, false)); - props.getLast()->setTooltip ("Extra command-line flags to be passed to the linker. You might want to use this for adding additional libraries"); + props.getLast()->setTooltip ("Extra command-line flags to be passed to the linker. You might want to use this for adding additional libraries. This string can contain references to preprocessor definitions in the form ${NAME_OF_VALUE}, which will be replaced with their values."); } const Array ProjectExporter::getVSTFilesRequired() const @@ -199,10 +200,15 @@ const Array ProjectExporter::getVSTFilesRequired() const return s; } -const StringArray ProjectExporter::parsePreprocessorDefs() const +const StringPairArray ProjectExporter::getAllPreprocessorDefs (const Project::BuildConfiguration& config) const +{ + StringPairArray defs (mergePreprocessorDefs (config.getAllPreprocessorDefs(), + parsePreprocessorDefs (getExporterPreprocessorDefs().toString()))); + defs.set (getExporterIdentifierMacro(), "1"); + return defs; +} + +const String ProjectExporter::replacePreprocessorTokens (const Project::BuildConfiguration& config, const String& sourceString) const { - StringArray defines; - defines.addTokens (getExtraPreprocessorDefs().toString(), " ,;", String::empty); - defines.removeEmptyStrings (true); - return defines; + return replacePreprocessorDefs (getAllPreprocessorDefs (config), sourceString); } diff --git a/extras/Jucer (experimental)/Source/Project/jucer_ProjectExporter.h b/extras/Jucer (experimental)/Source/Project/jucer_ProjectExporter.h index 0a7eaa43ff..9fe7cd1972 100644 --- a/extras/Jucer (experimental)/Source/Project/jucer_ProjectExporter.h +++ b/extras/Jucer (experimental)/Source/Project/jucer_ProjectExporter.h @@ -77,8 +77,11 @@ public: Value getExtraCompilerFlags() const { return getSetting (Ids::extraCompilerFlags); } Value getExtraLinkerFlags() const { return getSetting (Ids::extraLinkerFlags); } - Value getExtraPreprocessorDefs() const { return getSetting (Ids::extraDefs); } - const StringArray parsePreprocessorDefs() const; + Value getExporterPreprocessorDefs() const { return getSetting (Ids::extraDefs); } + const StringPairArray getAllPreprocessorDefs (const Project::BuildConfiguration& config) const; // includes inherited ones.. + + const String replacePreprocessorTokens (const Project::BuildConfiguration& config, + const String& sourceString) const; // This adds the quotes, and may return angle-brackets, eg: or normal quotes. const String getIncludePathForFileInJuceFolder (const String& pathFromJuceFolder, const File& targetIncludeFile) const; diff --git a/extras/Jucer (experimental)/Source/Utility/jucer_MiscUtilities.cpp b/extras/Jucer (experimental)/Source/Utility/jucer_MiscUtilities.cpp index 982af9a1eb..5146120f30 100644 --- a/extras/Jucer (experimental)/Source/Utility/jucer_MiscUtilities.cpp +++ b/extras/Jucer (experimental)/Source/Utility/jucer_MiscUtilities.cpp @@ -75,6 +75,77 @@ const String createGUID (const String& seed) return guid; } +//============================================================================== +static void skipWhitespace (const String& s, int& i) +{ + while (CharacterFunctions::isWhitespace (s[i])) + ++i; +} + +const StringPairArray parsePreprocessorDefs (const String& s) +{ + StringPairArray result; + int i = 0; + + while (s[i] != 0) + { + String token, value; + skipWhitespace (s, i); + + while (s[i] != 0 && s[i] != '=' && ! CharacterFunctions::isWhitespace (s[i])) + token << s[i++]; + + skipWhitespace (s, i); + + if (s[i] == '=') + { + ++i; + + skipWhitespace (s, i); + + while (s[i] != 0 && ! CharacterFunctions::isWhitespace (s[i])) + { + if (s[i] == ',') + { + ++i; + break; + } + + if (s[i] == '\\' && (s[i + 1] == ' ' || s[i + 1] == ',')) + ++i; + + value << s[i++]; + } + } + + if (token.isNotEmpty()) + result.set (token, value); + } + + return result; +} + +const StringPairArray mergePreprocessorDefs (StringPairArray inheritedDefs, const StringPairArray& overridingDefs) +{ + for (int i = 0; i < overridingDefs.size(); ++i) + inheritedDefs.set (overridingDefs.getAllKeys()[i], overridingDefs.getAllValues()[i]); + + return inheritedDefs; +} + +const String replacePreprocessorDefs (const StringPairArray& definitions, String sourceString) +{ + for (int i = 0; i < definitions.size(); ++i) + { + const String key (definitions.getAllKeys()[i]); + const String value (definitions.getAllValues()[i]); + + sourceString = sourceString.replace ("${" + key + "}", value); + } + + return sourceString; +} + //============================================================================== void autoScrollForMouseEvent (const MouseEvent& e, bool scrollX, bool scrollY) { diff --git a/extras/Jucer (experimental)/Source/Utility/jucer_MiscUtilities.h b/extras/Jucer (experimental)/Source/Utility/jucer_MiscUtilities.h index da97b43b1b..4f8a9b460b 100644 --- a/extras/Jucer (experimental)/Source/Utility/jucer_MiscUtilities.h +++ b/extras/Jucer (experimental)/Source/Utility/jucer_MiscUtilities.h @@ -33,6 +33,10 @@ const String hexString8Digits (int value); const String createAlphaNumericUID(); const String createGUID (const String& seed); // Turns a seed into a windows GUID +const StringPairArray parsePreprocessorDefs (const String& defs); +const StringPairArray mergePreprocessorDefs (StringPairArray inheritedDefs, const StringPairArray& overridingDefs); +const String replacePreprocessorDefs (const StringPairArray& definitions, String sourceString); + //============================================================================== int indexOfLineStartingWith (const StringArray& lines, const String& text, int startIndex); diff --git a/extras/Jucer (experimental)/Source/Utility/jucer_PresetIDs.h b/extras/Jucer (experimental)/Source/Utility/jucer_PresetIDs.h index bd96565a7e..34b105777c 100644 --- a/extras/Jucer (experimental)/Source/Utility/jucer_PresetIDs.h +++ b/extras/Jucer (experimental)/Source/Utility/jucer_PresetIDs.h @@ -105,6 +105,9 @@ namespace Ids DECLARE_ID (constructorParams); DECLARE_ID (memberInitialisers); DECLARE_ID (lossOfFocusDiscardsChanges); + DECLARE_ID (url); + DECLARE_ID (rootItemVisible); + DECLARE_ID (openByDefault); const Identifier class_ ("class"); const Identifier id_ ("id"); diff --git a/extras/amalgamator/Amalgamator.jucer b/extras/amalgamator/Amalgamator.jucer index b252176028..2a602ad10d 100644 --- a/extras/amalgamator/Amalgamator.jucer +++ b/extras/amalgamator/Amalgamator.jucer @@ -12,9 +12,9 @@ + rtasFolder="c:\SDKs\PT_80_SDK" juceFolder="../../../juce" libraryType="1"/> + rtasFolder="c:\SDKs\PT_80_SDK" juceFolder="../../../juce" libraryType="1"/> diff --git a/extras/amalgamator/Builds/Linux/Makefile b/extras/amalgamator/Builds/Linux/Makefile index 8544394d94..2b59cdc8d8 100644 --- a/extras/amalgamator/Builds/Linux/Makefile +++ b/extras/amalgamator/Builds/Linux/Makefile @@ -17,12 +17,12 @@ ifeq ($(CONFIG),Debug) LIBDIR := build OBJDIR := build/intermediate/Debug OUTDIR := build - CPPFLAGS := $(DEPFLAGS) -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "/usr/include" -I "/usr/include/freetype2" 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 "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=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" TARGET := amalgamator 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 "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=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" 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 "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=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" TARGET := amalgamator BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) endif diff --git a/extras/amalgamator/Builds/MacOSX/Amalgamator.xcodeproj/project.pbxproj b/extras/amalgamator/Builds/MacOSX/Amalgamator.xcodeproj/project.pbxproj index 1828222f2a..c06a7b6d7a 100644 --- a/extras/amalgamator/Builds/MacOSX/Amalgamator.xcodeproj/project.pbxproj +++ b/extras/amalgamator/Builds/MacOSX/Amalgamator.xcodeproj/project.pbxproj @@ -74,9 +74,9 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( - "JUCER_XCODE_MAC_F6D2F4CF=1", "_DEBUG=1", - "DEBUG=1 "); }; name = Debug; }; + "DEBUG=1", + "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; 4DFAC29D863495AD1E31B6B9 = { isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; PREBINDING = NO; @@ -87,9 +87,9 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( - "JUCER_XCODE_MAC_F6D2F4CF=1", "_NDEBUG=1", - "NDEBUG=1 "); }; name = Release; }; + "NDEBUG=1", + "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Release; }; 4EAD81574ACF05AC27D04B76 = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; GCC_C_LANGUAGE_STANDARD = c99; @@ -99,6 +99,7 @@ GCC_WARN_MISSING_PARENTHESES = YES; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; + WARNING_CFLAGS = -Wreorder; GCC_MODEL_TUNING = G5; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; ZERO_LINK = NO; @@ -113,6 +114,7 @@ GCC_WARN_MISSING_PARENTHESES = YES; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; + WARNING_CFLAGS = -Wreorder; GCC_MODEL_TUNING = G5; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; ZERO_LINK = NO; diff --git a/extras/amalgamator/Builds/VisualStudio2005/Amalgamator.vcproj b/extras/amalgamator/Builds/VisualStudio2005/Amalgamator.vcproj index be2c474bae..5918a55231 100644 --- a/extras/amalgamator/Builds/VisualStudio2005/Amalgamator.vcproj +++ b/extras/amalgamator/Builds/VisualStudio2005/Amalgamator.vcproj @@ -33,7 +33,7 @@ BufferSecurityCheck="" DebugInformationFormat="4" AdditionalIncludeDirectories="" - PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;_DEBUG;_CONSOLE" + PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;_CONSOLE;JUCER_VS2005_78A5003=1" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -89,7 +89,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="" - PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;NDEBUG;_CONSOLE" + PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CONSOLE;JUCER_VS2005_78A5003=1" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" diff --git a/extras/amalgamator/Builds/VisualStudio2008/Amalgamator.vcproj b/extras/amalgamator/Builds/VisualStudio2008/Amalgamator.vcproj index f3d261e365..a57cabcce7 100644 --- a/extras/amalgamator/Builds/VisualStudio2008/Amalgamator.vcproj +++ b/extras/amalgamator/Builds/VisualStudio2008/Amalgamator.vcproj @@ -33,7 +33,7 @@ BufferSecurityCheck="" DebugInformationFormat="4" AdditionalIncludeDirectories="" - PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;_DEBUG;_CONSOLE" + PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;_CONSOLE;JUCER_VS2008_78A5006=1" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -89,7 +89,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="" - PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;NDEBUG;_CONSOLE" + PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CONSOLE;JUCER_VS2008_78A5006=1" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" diff --git a/extras/audio plugin host/Builds/Linux/Makefile b/extras/audio plugin host/Builds/Linux/Makefile index 83f884b755..b439ef9325 100644 --- a/extras/audio plugin host/Builds/Linux/Makefile +++ b/extras/audio plugin host/Builds/Linux/Makefile @@ -17,12 +17,12 @@ ifeq ($(CONFIG),Debug) LIBDIR := build OBJDIR := build/intermediate/Debug OUTDIR := build - CPPFLAGS := $(DEPFLAGS) -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "~/SDKs/vstsdk2.4" -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 "~/SDKs/vstsdk2.4" -I "/usr/include" -I "/usr/include/freetype2" 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 "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "~/SDKs/vstsdk2.4" -I "/usr/include" -I "/usr/include/freetype2" + RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "~/SDKs/vstsdk2.4" -I "/usr/include" -I "/usr/include/freetype2" TARGET := Plugin\ Host 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 "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=1" -I "~/SDKs/vstsdk2.4" -I "/usr/include" -I "/usr/include/freetype2" + CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "~/SDKs/vstsdk2.4" -I "/usr/include" -I "/usr/include/freetype2" 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 "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=1" -I "~/SDKs/vstsdk2.4" -I "/usr/include" -I "/usr/include/freetype2" + RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "~/SDKs/vstsdk2.4" -I "/usr/include" -I "/usr/include/freetype2" 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 43a5b60017..a46a798751 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 @@ -112,9 +112,9 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( - "JUCER_XCODE_MAC_F6D2F4CF=1", "_DEBUG=1", - "DEBUG=1 "); }; name = Debug; }; + "DEBUG=1", + "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; 90901561E3F7FD713257B23D = { isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; PREBINDING = NO; @@ -126,9 +126,9 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( - "JUCER_XCODE_MAC_F6D2F4CF=1", "_NDEBUG=1", - "NDEBUG=1 "); }; name = Release; }; + "NDEBUG=1", + "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Release; }; 8133D32BA8816D704BF648FA = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; GCC_C_LANGUAGE_STANDARD = c99; @@ -138,6 +138,7 @@ GCC_WARN_MISSING_PARENTHESES = YES; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; + WARNING_CFLAGS = -Wreorder; GCC_MODEL_TUNING = G5; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; ZERO_LINK = NO; @@ -152,6 +153,7 @@ GCC_WARN_MISSING_PARENTHESES = YES; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; + WARNING_CFLAGS = -Wreorder; GCC_MODEL_TUNING = G5; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; ZERO_LINK = NO; diff --git a/extras/audio plugin host/Builds/VisualStudio2005/Plugin Host.vcproj b/extras/audio plugin host/Builds/VisualStudio2005/Plugin Host.vcproj index 4489f0904d..be695fef78 100644 --- a/extras/audio plugin host/Builds/VisualStudio2005/Plugin Host.vcproj +++ b/extras/audio plugin host/Builds/VisualStudio2005/Plugin Host.vcproj @@ -33,7 +33,7 @@ BufferSecurityCheck="" DebugInformationFormat="4" AdditionalIncludeDirectories="c:\SDKs\vstsdk2.4" - PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;_DEBUG" + PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2005_78A5003=1" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -89,7 +89,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="c:\SDKs\vstsdk2.4" - PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;NDEBUG" + PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2005_78A5003=1" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" diff --git a/extras/audio plugin host/Builds/VisualStudio2008/Plugin Host.vcproj b/extras/audio plugin host/Builds/VisualStudio2008/Plugin Host.vcproj index 0fecba0767..1c090fa1f8 100644 --- a/extras/audio plugin host/Builds/VisualStudio2008/Plugin Host.vcproj +++ b/extras/audio plugin host/Builds/VisualStudio2008/Plugin Host.vcproj @@ -33,7 +33,7 @@ BufferSecurityCheck="" DebugInformationFormat="4" AdditionalIncludeDirectories="c:\SDKs\vstsdk2.4" - PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;_DEBUG" + PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2008_78A5006=1" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -89,7 +89,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="c:\SDKs\vstsdk2.4" - PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;NDEBUG" + PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2008_78A5006=1" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" diff --git a/extras/audio plugins/demo/Builds/Linux/Makefile b/extras/audio plugins/demo/Builds/Linux/Makefile index 89d22442d3..9d7f7b52e3 100644 --- a/extras/audio plugins/demo/Builds/Linux/Makefile +++ b/extras/audio plugins/demo/Builds/Linux/Makefile @@ -17,12 +17,12 @@ ifeq ($(CONFIG),Debug) LIBDIR := build OBJDIR := build/intermediate/Debug OUTDIR := build - CPPFLAGS := $(DEPFLAGS) -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "../../JuceLibraryCode" -I "~/SDKs/vstsdk2.4" -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 "../../JuceLibraryCode" -I "~/SDKs/vstsdk2.4" -I "/usr/include" -I "/usr/include/freetype2" CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -g -ggdb -fPIC -O0 CXXFLAGS += $(CFLAGS) LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -L"/usr/X11R6/lib/" -L"../../../../../../juce/bin" -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound LDDEPS := - RESFLAGS := -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "../../JuceLibraryCode" -I "~/SDKs/vstsdk2.4" -I "/usr/include" -I "/usr/include/freetype2" + RESFLAGS := -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "../../JuceLibraryCode" -I "~/SDKs/vstsdk2.4" -I "/usr/include" -I "/usr/include/freetype2" TARGET := JuceDemoPlugin.so 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 "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=1" -I "../../JuceLibraryCode" -I "~/SDKs/vstsdk2.4" -I "/usr/include" -I "/usr/include/freetype2" + CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "../../JuceLibraryCode" -I "~/SDKs/vstsdk2.4" -I "/usr/include" -I "/usr/include/freetype2" CFLAGS += $(CPPFLAGS) $(TARGET_ARCH) -fPIC -Os CXXFLAGS += $(CFLAGS) LDFLAGS += -L$(BINDIR) -L$(LIBDIR) -shared -L"/usr/X11R6/lib/" -L"../../../../../../juce/bin" -lfreetype -lpthread -lrt -lX11 -lGL -lGLU -lXinerama -lasound LDDEPS := - RESFLAGS := -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=1" -I "../../JuceLibraryCode" -I "~/SDKs/vstsdk2.4" -I "/usr/include" -I "/usr/include/freetype2" + RESFLAGS := -D "LINUX=1" -D "NDEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "../../JuceLibraryCode" -I "~/SDKs/vstsdk2.4" -I "/usr/include" -I "/usr/include/freetype2" TARGET := JuceDemoPlugin.so BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) endif diff --git a/extras/audio plugins/demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj b/extras/audio plugins/demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj index d7e996301a..51bac0cad7 100644 --- a/extras/audio plugins/demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj +++ b/extras/audio plugins/demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj @@ -249,10 +249,10 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( - "JUCER_XCODE_MAC_F6D2F4CF=1", "_DEBUG=1", - "DEBUG=1 ", - "JUCE_ObjCExtraSuffix=JuceDemo"); }; name = Debug; }; + "DEBUG=1", + "JUCE_ObjCExtraSuffix=JuceDemo", + "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; F4B05B483343A2F3C923C6B4 = { isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; PREBINDING = NO; @@ -269,10 +269,10 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( - "JUCER_XCODE_MAC_F6D2F4CF=1", "_NDEBUG=1", - "NDEBUG=1 ", - "JUCE_ObjCExtraSuffix=JuceDemo"); }; name = Release; }; + "NDEBUG=1", + "JUCE_ObjCExtraSuffix=JuceDemo", + "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Release; }; F6631902F8DE12E2C2C34B71 = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; GCC_C_LANGUAGE_STANDARD = c99; @@ -282,6 +282,7 @@ GCC_WARN_MISSING_PARENTHESES = YES; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; + WARNING_CFLAGS = -Wreorder; GCC_MODEL_TUNING = G5; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; ZERO_LINK = NO; @@ -296,6 +297,7 @@ GCC_WARN_MISSING_PARENTHESES = YES; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; + WARNING_CFLAGS = -Wreorder; GCC_MODEL_TUNING = G5; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; ZERO_LINK = NO; diff --git a/extras/audio plugins/demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj b/extras/audio plugins/demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj index 5a1f0ab96a..41bd0e3c73 100644 --- a/extras/audio plugins/demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj +++ b/extras/audio plugins/demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj @@ -33,7 +33,7 @@ BufferSecurityCheck="" DebugInformationFormat="4" AdditionalIncludeDirectories="c:\SDKs\vstsdk2.4;..\..\JuceLibraryCode" - PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;_DEBUG" + PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2005_78A5003=1" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -89,7 +89,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="c:\SDKs\vstsdk2.4;..\..\JuceLibraryCode" - PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;NDEBUG" + PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2005_78A5003=1" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" diff --git a/extras/audio plugins/demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj b/extras/audio plugins/demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj index fb0dd1eb73..a3cf6dea60 100644 --- a/extras/audio plugins/demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj +++ b/extras/audio plugins/demo/Builds/VisualStudio2008/JuceDemoPlugin.vcproj @@ -33,7 +33,7 @@ BufferSecurityCheck="" DebugInformationFormat="4" AdditionalIncludeDirectories="c:\SDKs\vstsdk2.4;..\..\JuceLibraryCode" - PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;_DEBUG" + PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2008_78A5006=1" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -89,7 +89,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="c:\SDKs\vstsdk2.4;..\..\JuceLibraryCode" - PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;NDEBUG" + PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2008_78A5006=1" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" diff --git a/extras/binarybuilder/Builds/Linux/Makefile b/extras/binarybuilder/Builds/Linux/Makefile index 7347124698..ad20adf563 100644 --- a/extras/binarybuilder/Builds/Linux/Makefile +++ b/extras/binarybuilder/Builds/Linux/Makefile @@ -17,12 +17,12 @@ ifeq ($(CONFIG),Debug) LIBDIR := build OBJDIR := build/intermediate/Debug OUTDIR := build - CPPFLAGS := $(DEPFLAGS) -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "/usr/include" -I "/usr/include/freetype2" 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 "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=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" TARGET := BinaryBuilder 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 "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=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" 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 "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=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" 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 a027d5c9c3..88c6986ee1 100644 --- a/extras/binarybuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj +++ b/extras/binarybuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj @@ -74,9 +74,9 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( - "JUCER_XCODE_MAC_F6D2F4CF=1", "_DEBUG=1", - "DEBUG=1 "); }; name = Debug; }; + "DEBUG=1", + "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; D4E910481C9C05D598DC755B = { isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; PREBINDING = NO; @@ -87,9 +87,9 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( - "JUCER_XCODE_MAC_F6D2F4CF=1", "_NDEBUG=1", - "NDEBUG=1 "); }; name = Release; }; + "NDEBUG=1", + "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Release; }; C69BDE02D12775D4A17BFA17 = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; GCC_C_LANGUAGE_STANDARD = c99; @@ -99,6 +99,7 @@ GCC_WARN_MISSING_PARENTHESES = YES; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; + WARNING_CFLAGS = -Wreorder; GCC_MODEL_TUNING = G5; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; ZERO_LINK = NO; @@ -113,6 +114,7 @@ GCC_WARN_MISSING_PARENTHESES = YES; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; + WARNING_CFLAGS = -Wreorder; GCC_MODEL_TUNING = G5; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; ZERO_LINK = NO; diff --git a/extras/binarybuilder/Builds/VisualStudio2005/BinaryBuilder.vcproj b/extras/binarybuilder/Builds/VisualStudio2005/BinaryBuilder.vcproj index 124fd2ffa3..54c9100c78 100644 --- a/extras/binarybuilder/Builds/VisualStudio2005/BinaryBuilder.vcproj +++ b/extras/binarybuilder/Builds/VisualStudio2005/BinaryBuilder.vcproj @@ -33,7 +33,7 @@ BufferSecurityCheck="" DebugInformationFormat="4" AdditionalIncludeDirectories="" - PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;_DEBUG;_CONSOLE" + PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;_CONSOLE;JUCER_VS2005_78A5003=1" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -89,7 +89,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="" - PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;NDEBUG;_CONSOLE" + PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CONSOLE;JUCER_VS2005_78A5003=1" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" diff --git a/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj b/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj index bfdda7a7e3..0879dc1b56 100644 --- a/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj +++ b/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj @@ -33,7 +33,7 @@ BufferSecurityCheck="" DebugInformationFormat="4" AdditionalIncludeDirectories="" - PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;_DEBUG;_CONSOLE" + PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;_CONSOLE;JUCER_VS2008_78A5006=1" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -89,7 +89,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="" - PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;NDEBUG;_CONSOLE" + PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CONSOLE;JUCER_VS2008_78A5006=1" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" diff --git a/extras/example projects/Builds/Linux/Makefile b/extras/example projects/Builds/Linux/Makefile index 62143b744a..00bea9f9a7 100644 --- a/extras/example projects/Builds/Linux/Makefile +++ b/extras/example projects/Builds/Linux/Makefile @@ -17,12 +17,12 @@ ifeq ($(CONFIG),Debug) LIBDIR := build OBJDIR := build/intermediate/Debug OUTDIR := build - CPPFLAGS := $(DEPFLAGS) -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCER_LINUX_MAKE_7346DA2A=1" -I "/usr/include" -I "/usr/include/freetype2" 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 "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=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" TARGET := HelloWorld 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 "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=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" 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 "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=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" 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 c4a4c8eff6..18ad609f05 100644 --- a/extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj +++ b/extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj @@ -91,9 +91,9 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( - "JUCER_XCODE_MAC_F6D2F4CF=1", "_DEBUG=1", - "DEBUG=1 "); }; name = Debug; }; + "DEBUG=1", + "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; 2BF0DFE3F61DBC969BCBD0C4 = { isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; PREBINDING = NO; @@ -105,9 +105,9 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( - "JUCER_XCODE_MAC_F6D2F4CF=1", "_NDEBUG=1", - "NDEBUG=1 "); }; name = Release; }; + "NDEBUG=1", + "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Release; }; 1C939EADBAB81B95A46A6581 = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; GCC_C_LANGUAGE_STANDARD = c99; @@ -117,6 +117,7 @@ GCC_WARN_MISSING_PARENTHESES = YES; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; + WARNING_CFLAGS = -Wreorder; GCC_MODEL_TUNING = G5; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; ZERO_LINK = NO; @@ -131,6 +132,7 @@ GCC_WARN_MISSING_PARENTHESES = YES; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; + WARNING_CFLAGS = -Wreorder; GCC_MODEL_TUNING = G5; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; ZERO_LINK = NO; diff --git a/extras/example projects/Builds/VisualStudio2005/HelloWorld.vcproj b/extras/example projects/Builds/VisualStudio2005/HelloWorld.vcproj index 8dea3e7dba..f2f3e57c27 100644 --- a/extras/example projects/Builds/VisualStudio2005/HelloWorld.vcproj +++ b/extras/example projects/Builds/VisualStudio2005/HelloWorld.vcproj @@ -33,7 +33,7 @@ BufferSecurityCheck="" DebugInformationFormat="4" AdditionalIncludeDirectories="" - PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;_DEBUG" + PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2005_78A5003=1" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -89,7 +89,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="" - PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;NDEBUG" + PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2005_78A5003=1" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" diff --git a/extras/example projects/Builds/VisualStudio2008/HelloWorld.vcproj b/extras/example projects/Builds/VisualStudio2008/HelloWorld.vcproj index caa3728e01..436b0c7287 100644 --- a/extras/example projects/Builds/VisualStudio2008/HelloWorld.vcproj +++ b/extras/example projects/Builds/VisualStudio2008/HelloWorld.vcproj @@ -33,7 +33,7 @@ BufferSecurityCheck="" DebugInformationFormat="4" AdditionalIncludeDirectories="" - PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;_DEBUG" + PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCER_VS2008_78A5006=1" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -89,7 +89,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="" - PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;NDEBUG" + PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCER_VS2008_78A5006=1" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" diff --git a/extras/example projects/Builds/iPhone/HelloWorld.xcodeproj/project.pbxproj b/extras/example projects/Builds/iPhone/HelloWorld.xcodeproj/project.pbxproj index 2842afce79..19c9be3b6a 100644 --- a/extras/example projects/Builds/iPhone/HelloWorld.xcodeproj/project.pbxproj +++ b/extras/example projects/Builds/iPhone/HelloWorld.xcodeproj/project.pbxproj @@ -76,9 +76,9 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( - "JUCER_XCODE_IPHONE_25ADD7EF=1", "_DEBUG=1", - "DEBUG=1 "); }; name = Debug; }; + "DEBUG=1", + "JUCER_XCODE_IPHONE_25ADD7EF=1"); }; name = Debug; }; 2BF0DFE3F61DBC969BCBD0C4 = { isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; PREBINDING = NO; @@ -90,9 +90,9 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( - "JUCER_XCODE_IPHONE_25ADD7EF=1", "_NDEBUG=1", - "NDEBUG=1 "); }; name = Release; }; + "NDEBUG=1", + "JUCER_XCODE_IPHONE_25ADD7EF=1"); }; name = Release; }; 1C939EADBAB81B95A46A6581 = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; GCC_C_LANGUAGE_STANDARD = c99; @@ -102,6 +102,7 @@ GCC_WARN_MISSING_PARENTHESES = YES; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; + WARNING_CFLAGS = -Wreorder; GCC_MODEL_TUNING = G5; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; ZERO_LINK = NO; @@ -116,6 +117,7 @@ GCC_WARN_MISSING_PARENTHESES = YES; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; + WARNING_CFLAGS = -Wreorder; GCC_MODEL_TUNING = G5; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; ZERO_LINK = NO; diff --git a/extras/juce demo/Builds/Linux/Makefile b/extras/juce demo/Builds/Linux/Makefile index eec41b6f8d..67658c58c4 100644 --- a/extras/juce demo/Builds/Linux/Makefile +++ b/extras/juce demo/Builds/Linux/Makefile @@ -17,12 +17,12 @@ ifeq ($(CONFIG),Debug) LIBDIR := build OBJDIR := build/intermediate/Debug OUTDIR := build - CPPFLAGS := $(DEPFLAGS) -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_UNIT_TESTS=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" 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 "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -D "JUCE_UNIT_TESTS=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" 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 "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=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" 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 "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=1" -D "JUCE_UNIT_TESTS=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" TARGET := JuceDemo BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) endif diff --git a/extras/juce demo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj b/extras/juce demo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj index 9e3f6909b0..195b98e775 100644 --- a/extras/juce demo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj +++ b/extras/juce demo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj @@ -188,10 +188,10 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( - "JUCER_XCODE_MAC_F6D2F4CF=1", "_DEBUG=1", - "DEBUG=1 ", - "JUCE_UNIT_TESTS=1"); }; name = Debug; }; + "DEBUG=1", + "JUCE_UNIT_TESTS=1", + "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; 8EF7C7FFD55219581A5075F3 = { isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; PREBINDING = NO; @@ -203,10 +203,10 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( - "JUCER_XCODE_MAC_F6D2F4CF=1", "_NDEBUG=1", - "NDEBUG=1 ", - "JUCE_UNIT_TESTS=1"); }; name = Release; }; + "NDEBUG=1", + "JUCE_UNIT_TESTS=1", + "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Release; }; 7FA986B99AFC795723E00AB0 = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; GCC_C_LANGUAGE_STANDARD = c99; @@ -216,6 +216,7 @@ GCC_WARN_MISSING_PARENTHESES = YES; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; + WARNING_CFLAGS = -Wreorder; GCC_MODEL_TUNING = G5; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; ZERO_LINK = NO; @@ -230,6 +231,7 @@ GCC_WARN_MISSING_PARENTHESES = YES; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; + WARNING_CFLAGS = -Wreorder; GCC_MODEL_TUNING = G5; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; ZERO_LINK = NO; diff --git a/extras/juce demo/Builds/VisualStudio2005/Juce Demo.vcproj b/extras/juce demo/Builds/VisualStudio2005/Juce Demo.vcproj index e5e68b54f4..559037762e 100644 --- a/extras/juce demo/Builds/VisualStudio2005/Juce Demo.vcproj +++ b/extras/juce demo/Builds/VisualStudio2005/Juce Demo.vcproj @@ -33,7 +33,7 @@ BufferSecurityCheck="" DebugInformationFormat="4" AdditionalIncludeDirectories="" - PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;_DEBUG;JUCE_UNIT_TESTS=1" + PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2005_78A5003=1" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -89,7 +89,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="" - PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;NDEBUG;JUCE_UNIT_TESTS=1" + PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2005_78A5003=1" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" diff --git a/extras/juce demo/Builds/VisualStudio2008/Juce Demo.vcproj b/extras/juce demo/Builds/VisualStudio2008/Juce Demo.vcproj index 425c8b058d..4a0a7a49e9 100644 --- a/extras/juce demo/Builds/VisualStudio2008/Juce Demo.vcproj +++ b/extras/juce demo/Builds/VisualStudio2008/Juce Demo.vcproj @@ -33,7 +33,7 @@ BufferSecurityCheck="" DebugInformationFormat="4" AdditionalIncludeDirectories="" - PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;_DEBUG;JUCE_UNIT_TESTS=1" + PreprocessorDefinitions="WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2008_78A5006=1" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -89,7 +89,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="" - PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;NDEBUG;JUCE_UNIT_TESTS=1" + PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2008_78A5006=1" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" diff --git a/extras/juce demo/Builds/VisualStudio2010/Juce Demo.vcxproj b/extras/juce demo/Builds/VisualStudio2010/Juce Demo.vcxproj index 25925328cf..7835779251 100644 --- a/extras/juce demo/Builds/VisualStudio2010/Juce Demo.vcxproj +++ b/extras/juce demo/Builds/VisualStudio2010/Juce Demo.vcxproj @@ -54,7 +54,7 @@ Disabled EditAndContinue %(AdditionalIncludeDirectories) - JUCER_VS2010_78A501D;WIN32;_WINDOWS;_DEBUG;JUCE_UNIT_TESTS=1;%(PreprocessorDefinitions) + WIN32;_WINDOWS;DEBUG;_DEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2010_78A501D=1;%(PreprocessorDefinitions) MultiThreadedDebug true @@ -92,7 +92,7 @@ MaxSpeed %(AdditionalIncludeDirectories) - JUCER_VS2010_78A501D;WIN32;_WINDOWS;NDEBUG;JUCE_UNIT_TESTS=1;%(PreprocessorDefinitions) + WIN32;_WINDOWS;NDEBUG;JUCE_UNIT_TESTS=1;JUCER_VS2010_78A501D=1;%(PreprocessorDefinitions) MultiThreaded true diff --git a/extras/juce demo/Builds/iPhone/Juce Demo.xcodeproj/project.pbxproj b/extras/juce demo/Builds/iPhone/Juce Demo.xcodeproj/project.pbxproj index 624715b332..4896d27b5d 100644 --- a/extras/juce demo/Builds/iPhone/Juce Demo.xcodeproj/project.pbxproj +++ b/extras/juce demo/Builds/iPhone/Juce Demo.xcodeproj/project.pbxproj @@ -173,10 +173,10 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( - "JUCER_XCODE_IPHONE_25ADD7EF=1", "_DEBUG=1", - "DEBUG=1 ", - "JUCE_UNIT_TESTS=1"); }; name = Debug; }; + "DEBUG=1", + "JUCE_UNIT_TESTS=1", + "JUCER_XCODE_IPHONE_25ADD7EF=1"); }; name = Debug; }; 8EF7C7FFD55219581A5075F3 = { isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; PREBINDING = NO; @@ -188,10 +188,10 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( - "JUCER_XCODE_IPHONE_25ADD7EF=1", "_NDEBUG=1", - "NDEBUG=1 ", - "JUCE_UNIT_TESTS=1"); }; name = Release; }; + "NDEBUG=1", + "JUCE_UNIT_TESTS=1", + "JUCER_XCODE_IPHONE_25ADD7EF=1"); }; name = Release; }; 7FA986B99AFC795723E00AB0 = { isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; GCC_C_LANGUAGE_STANDARD = c99; @@ -201,6 +201,7 @@ GCC_WARN_MISSING_PARENTHESES = YES; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; + WARNING_CFLAGS = -Wreorder; GCC_MODEL_TUNING = G5; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; ZERO_LINK = NO; @@ -215,6 +216,7 @@ GCC_WARN_MISSING_PARENTHESES = YES; GCC_WARN_NON_VIRTUAL_DESTRUCTOR = YES; GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; + WARNING_CFLAGS = -Wreorder; GCC_MODEL_TUNING = G5; GCC_INLINES_ARE_PRIVATE_EXTERN = YES; ZERO_LINK = NO;