From 64905b472fa943dd5878aeada594ab4bda009deb Mon Sep 17 00:00:00 2001 From: Julian Storer Date: Mon, 17 May 2010 19:24:35 +0100 Subject: [PATCH] Jucer improvements to cope with multiple juce paths. --- Builds/Linux/Makefile | 8 +- Builds/MacOSX/Juce.xcodeproj/project.pbxproj | 2 + Builds/VisualStudio2005/Juce.vcproj | 4 +- Builds/VisualStudio2008/Juce.vcproj | 4 +- Builds/VisualStudio2008_DLL/Juce.vcproj | 4 +- Builds/iPhone/Juce.xcodeproj/project.pbxproj | 2 + .../Builds/Linux/Makefile | 14 +- .../The Jucer.xcodeproj/project.pbxproj | 10 +- .../Builds/VisualStudio2005/The Jucer.vcproj | 6 +- .../Builds/VisualStudio2008/The Jucer.vcproj | 6 +- extras/Jucer (experimental)/Jucer.jucer | 4 + .../Types/jucer_ComponentTypeManager.h | 20 +-- .../Component/Types/jucer_JucerComponent.h | 35 +++-- .../Component/jucer_ComponentDocument.cpp | 59 ++------ .../model/Component/jucer_ComponentDocument.h | 18 +-- .../model/Project/jucer_ProjectExport_MSVC.h | 2 +- .../model/Project/jucer_ProjectExport_Make.h | 2 +- .../model/Project/jucer_ProjectExport_XCode.h | 3 +- .../model/Project/jucer_ProjectExporter.h | 9 +- .../Source/model/Project/jucer_ProjectSaver.h | 2 +- .../jucer_ComponentEditor.cpp | 4 +- .../Component Editor/jucer_ComponentEditor.h | 1 - .../jucer_ComponentEditorCanvas.h | 5 + .../jucer_ComponentViewer.cpp | 142 ++++++++++++++++++ .../Component Editor/jucer_ComponentViewer.h | 73 +++++++++ .../jucer_DrawableEditorCanvas.h | 4 + .../ui/Editor Base/jucer_EditorCanvas.cpp | 11 ++ .../ui/Editor Base/jucer_EditorCanvas.h | 1 + .../ui/jucer_DocumentEditorComponent.cpp | 26 ++-- .../Source/ui/jucer_DocumentEditorComponent.h | 5 +- .../Source/ui/jucer_OpenDocumentManager.cpp | 33 +++- .../Source/ui/jucer_OpenDocumentManager.h | 17 ++- extras/amalgamator/Builds/Linux/Makefile | 8 +- .../Amalgamator.xcodeproj/project.pbxproj | 2 + .../VisualStudio2005/Amalgamator.vcproj | 4 +- .../VisualStudio2008/Amalgamator.vcproj | 4 +- .../audio plugin host/Builds/Linux/Makefile | 8 +- .../Plugin Host.xcodeproj/project.pbxproj | 2 + .../VisualStudio2005/Plugin Host.vcproj | 4 +- .../VisualStudio2008/Plugin Host.vcproj | 4 +- .../JuceDemoPlugin.xcodeproj/project.pbxproj | 2 + .../VisualStudio2005/JuceDemoPlugin.vcproj | 4 +- .../VisualStudio2008/JuceDemoPlugin.vcproj | 4 +- extras/binarybuilder/Builds/Linux/Makefile | 8 +- .../BinaryBuilder.xcodeproj/project.pbxproj | 2 + .../VisualStudio2005/BinaryBuilder.vcproj | 4 +- .../VisualStudio2008/BinaryBuilder.vcproj | 4 +- extras/example projects/Builds/Linux/Makefile | 8 +- .../HelloWorld.xcodeproj/project.pbxproj | 2 + .../Builds/VisualStudio2005/HelloWorld.vcproj | 4 +- .../Builds/VisualStudio2008/HelloWorld.vcproj | 4 +- .../HelloWorld.xcodeproj/project.pbxproj | 2 + extras/juce demo/Builds/Linux/Makefile | 8 +- .../Juce Demo.xcodeproj/project.pbxproj | 2 + .../Builds/VisualStudio2005/Juce Demo.vcproj | 4 +- .../Builds/VisualStudio2008/Juce Demo.vcproj | 4 +- .../Juce Demo.xcodeproj/project.pbxproj | 2 + 57 files changed, 449 insertions(+), 191 deletions(-) create mode 100644 extras/Jucer (experimental)/Source/ui/Component Editor/jucer_ComponentViewer.cpp create mode 100644 extras/Jucer (experimental)/Source/ui/Component Editor/jucer_ComponentViewer.h diff --git a/Builds/Linux/Makefile b/Builds/Linux/Makefile index 3e09722b69..ebfbecd5b6 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 "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + CPPFLAGS := $(DEPFLAGS) -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=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 "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + RESFLAGS := -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=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 "LINUX=1" -D "NDEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + CPPFLAGS := $(DEPFLAGS) -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=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 "LINUX=1" -D "NDEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + RESFLAGS := -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=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 728df2c27e..9f74a01432 100644 --- a/Builds/MacOSX/Juce.xcodeproj/project.pbxproj +++ b/Builds/MacOSX/Juce.xcodeproj/project.pbxproj @@ -1775,6 +1775,7 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_PREPROCESSOR_DEFINITIONS = ( + "JUCER_XCODE_MAC_F6D2F4CF=1", "_DEBUG=1", "DEBUG=1 "); }; name = Debug; }; 9DE19CD5BB8E12A153385ADD = { isa = XCBuildConfiguration; buildSettings = { @@ -1791,6 +1792,7 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( + "JUCER_XCODE_MAC_F6D2F4CF=1", "_NDEBUG=1", "NDEBUG=1 "); }; name = Release; }; 8E935B9E7F2982A06CD7EF99 = { isa = XCBuildConfiguration; buildSettings = { diff --git a/Builds/VisualStudio2005/Juce.vcproj b/Builds/VisualStudio2005/Juce.vcproj index 2824c4f33c..ad9d068577 100644 --- a/Builds/VisualStudio2005/Juce.vcproj +++ b/Builds/VisualStudio2005/Juce.vcproj @@ -26,7 +26,7 @@ BufferSecurityCheck="" DebugInformationFormat="3" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_LIB" + PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;_DEBUG;_LIB" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -69,7 +69,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_LIB" + PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;NDEBUG;_LIB" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" diff --git a/Builds/VisualStudio2008/Juce.vcproj b/Builds/VisualStudio2008/Juce.vcproj index 6fdf00727f..36dd503643 100644 --- a/Builds/VisualStudio2008/Juce.vcproj +++ b/Builds/VisualStudio2008/Juce.vcproj @@ -26,7 +26,7 @@ BufferSecurityCheck="" DebugInformationFormat="3" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_LIB" + PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;_DEBUG;_LIB" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -69,7 +69,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_LIB" + PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;NDEBUG;_LIB" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" diff --git a/Builds/VisualStudio2008_DLL/Juce.vcproj b/Builds/VisualStudio2008_DLL/Juce.vcproj index 5e55d73ebe..2b56b699a8 100644 --- a/Builds/VisualStudio2008_DLL/Juce.vcproj +++ b/Builds/VisualStudio2008_DLL/Juce.vcproj @@ -26,7 +26,7 @@ BufferSecurityCheck="" DebugInformationFormat="3" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_LIB;JUCE_DLL_BUILD=1;JUCE_DLL=1" + PreprocessorDefinitions="JUCER_VS2008_9A63150B;WIN32;_WINDOWS;_DEBUG;_LIB;JUCE_DLL_BUILD=1;JUCE_DLL=1" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -70,7 +70,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_LIB;JUCE_DLL_BUILD=1;JUCE_DLL=1" + PreprocessorDefinitions="JUCER_VS2008_9A63150B;WIN32;_WINDOWS;NDEBUG;_LIB;JUCE_DLL_BUILD=1;JUCE_DLL=1" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" diff --git a/Builds/iPhone/Juce.xcodeproj/project.pbxproj b/Builds/iPhone/Juce.xcodeproj/project.pbxproj index 0682b1b781..b77534bc3e 100644 --- a/Builds/iPhone/Juce.xcodeproj/project.pbxproj +++ b/Builds/iPhone/Juce.xcodeproj/project.pbxproj @@ -1775,6 +1775,7 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_PREPROCESSOR_DEFINITIONS = ( + "JUCER_XCODE_IPHONE_25ADD7EF=1", "_DEBUG=1", "DEBUG=1 "); }; name = Debug; }; 9DE19CD5BB8E12A153385ADD = { isa = XCBuildConfiguration; buildSettings = { @@ -1791,6 +1792,7 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( + "JUCER_XCODE_IPHONE_25ADD7EF=1", "_NDEBUG=1", "NDEBUG=1 "); }; name = Release; }; 8E935B9E7F2982A06CD7EF99 = { isa = XCBuildConfiguration; buildSettings = { diff --git a/extras/Jucer (experimental)/Builds/Linux/Makefile b/extras/Jucer (experimental)/Builds/Linux/Makefile index 72a7a3998a..d4772c74b5 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 "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + CPPFLAGS := $(DEPFLAGS) -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=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 "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + RESFLAGS := -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" TARGET := Jucer BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) endif @@ -32,12 +32,12 @@ ifeq ($(CONFIG),Release) LIBDIR := build OBJDIR := build/intermediate/Release OUTDIR := build - CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + CPPFLAGS := $(DEPFLAGS) -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=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 "LINUX=1" -D "NDEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + RESFLAGS := -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" TARGET := Jucer BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) endif @@ -54,6 +54,7 @@ OBJECTS := \ $(OBJDIR)/jucer_ResourceFile.o \ $(OBJDIR)/jucer_SourceCodeEditor.o \ $(OBJDIR)/jucer_ComponentEditor.o \ + $(OBJDIR)/jucer_ComponentViewer.o \ $(OBJDIR)/jucer_DrawableEditor.o \ $(OBJDIR)/jucer_EditorCanvas.o \ $(OBJDIR)/jucer_DocumentEditorComponent.o \ @@ -148,6 +149,11 @@ $(OBJDIR)/jucer_ComponentEditor.o: ../../Source/ui/Component\ Editor/jucer_Compo @echo $(notdir $<) @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" +$(OBJDIR)/jucer_ComponentViewer.o: ../../Source/ui/Component\ Editor/jucer_ComponentViewer.cpp + -@mkdir -p $(OBJDIR) + @echo $(notdir $<) + @$(CXX) $(CXXFLAGS) -o "$@" -c "$<" + $(OBJDIR)/jucer_DrawableEditor.o: ../../Source/ui/Drawable\ Editor/jucer_DrawableEditor.cpp -@mkdir -p $(OBJDIR) @echo $(notdir $<) 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 5814f11163..20378ddf27 100644 --- a/extras/Jucer (experimental)/Builds/MacOSX/The Jucer.xcodeproj/project.pbxproj +++ b/extras/Jucer (experimental)/Builds/MacOSX/The Jucer.xcodeproj/project.pbxproj @@ -28,6 +28,7 @@ 7C9FFFC0B129F5C3FAEE13E9 = { isa = PBXBuildFile; fileRef = A6D148E4503AAD3DE6DDCD8B; }; 33E1A095D656AF109DD54170 = { isa = PBXBuildFile; fileRef = 31F175F277299B3CEA857F96; }; D706C3B5016318D85FE452C2 = { isa = PBXBuildFile; fileRef = 3263F4099F45D6FACD28F08D; }; + 872B76525D184228B4F69372 = { isa = PBXBuildFile; fileRef = 06F5D2DB198F068520732796; }; E43D00B370F289420379B759 = { isa = PBXBuildFile; fileRef = 82F91CF84A296665177CB79A; }; EFFCA85EFB4F06F1BEB9AB97 = { isa = PBXBuildFile; fileRef = 03E9C079FBBF727D50A2B678; }; 944CE0EADAD951F48EC77071 = { isa = PBXBuildFile; fileRef = 3B2C45064E85B3B631D4F921; }; @@ -106,6 +107,8 @@ 7CB154C3682F8C786134A6F3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_ComponentEditorCodeView.h; path = "../../Source/ui/Component Editor/jucer_ComponentEditorCodeView.h"; sourceTree = SOURCE_ROOT; }; B5F5AD9FC53F60610C71367C = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_ComponentEditorToolbar.h; path = "../../Source/ui/Component Editor/jucer_ComponentEditorToolbar.h"; sourceTree = SOURCE_ROOT; }; 8CB73D6F1D0FFC4B379D1240 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_ComponentEditorTreeView.h; path = "../../Source/ui/Component Editor/jucer_ComponentEditorTreeView.h"; sourceTree = SOURCE_ROOT; }; + 06F5D2DB198F068520732796 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = jucer_ComponentViewer.cpp; path = "../../Source/ui/Component Editor/jucer_ComponentViewer.cpp"; sourceTree = SOURCE_ROOT; }; + 1309F36592198D9DC738FDE6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_ComponentViewer.h; path = "../../Source/ui/Component Editor/jucer_ComponentViewer.h"; sourceTree = SOURCE_ROOT; }; 82F91CF84A296665177CB79A = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = jucer_DrawableEditor.cpp; path = "../../Source/ui/Drawable Editor/jucer_DrawableEditor.cpp"; sourceTree = SOURCE_ROOT; }; D1776C5F3E6BB7E8C698BAD6 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_DrawableEditor.h; path = "../../Source/ui/Drawable Editor/jucer_DrawableEditor.h"; sourceTree = SOURCE_ROOT; }; B19F19A0ED7386FAA7DD854E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = jucer_DrawableEditorCanvas.h; path = "../../Source/ui/Drawable Editor/jucer_DrawableEditorCanvas.h"; sourceTree = SOURCE_ROOT; }; @@ -230,7 +233,9 @@ 3B77C7A8D9A2386088D75CFE, 7CB154C3682F8C786134A6F3, B5F5AD9FC53F60610C71367C, - 8CB73D6F1D0FFC4B379D1240 ); name = "Component Editor"; sourceTree = ""; }; + 8CB73D6F1D0FFC4B379D1240, + 06F5D2DB198F068520732796, + 1309F36592198D9DC738FDE6 ); name = "Component Editor"; sourceTree = ""; }; E6053BD673F80E900DDA3593 = { isa = PBXGroup; children = ( 82F91CF84A296665177CB79A, D1776C5F3E6BB7E8C698BAD6, @@ -355,6 +360,7 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_PREPROCESSOR_DEFINITIONS = ( + "JUCER_XCODE_MAC_F6D2F4CF=1", "_DEBUG=1", "DEBUG=1 "); }; name = Debug; }; 673FACB8969ADED17ACEFF7C = { isa = XCBuildConfiguration; buildSettings = { @@ -368,6 +374,7 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( + "JUCER_XCODE_MAC_F6D2F4CF=1", "_NDEBUG=1", "NDEBUG=1 "); }; name = Release; }; 69D26A715A354ED1735D8438 = { isa = XCBuildConfiguration; buildSettings = { @@ -417,6 +424,7 @@ 7C9FFFC0B129F5C3FAEE13E9, 33E1A095D656AF109DD54170, D706C3B5016318D85FE452C2, + 872B76525D184228B4F69372, E43D00B370F289420379B759, EFFCA85EFB4F06F1BEB9AB97, 944CE0EADAD951F48EC77071, diff --git a/extras/Jucer (experimental)/Builds/VisualStudio2005/The Jucer.vcproj b/extras/Jucer (experimental)/Builds/VisualStudio2005/The Jucer.vcproj index 719ccd4c00..68c1e057b6 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="WIN32;_WINDOWS;_DEBUG" + PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;_DEBUG" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -89,7 +89,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG" + PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;NDEBUG" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -184,6 +184,8 @@ + + diff --git a/extras/Jucer (experimental)/Builds/VisualStudio2008/The Jucer.vcproj b/extras/Jucer (experimental)/Builds/VisualStudio2008/The Jucer.vcproj index e6c291936e..1fa95b2037 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="WIN32;_WINDOWS;_DEBUG" + PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;_DEBUG" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -89,7 +89,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG" + PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;NDEBUG" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -184,6 +184,8 @@ + + diff --git a/extras/Jucer (experimental)/Jucer.jucer b/extras/Jucer (experimental)/Jucer.jucer index 117a9937ff..8865a839e9 100644 --- a/extras/Jucer (experimental)/Jucer.jucer +++ b/extras/Jucer (experimental)/Jucer.jucer @@ -124,6 +124,10 @@ resource="0" file="Source/ui/Component Editor/jucer_ComponentEditorToolbar.h"/> + + & props) = 0; + virtual void itemDoubleClicked (const MouseEvent& e, ComponentTypeInstance& item) = 0; virtual void createCode (ComponentTypeInstance& item, CodeGenerator& code) = 0; virtual const String getClassName (ComponentTypeInstance& item) const { return className; } @@ -193,6 +179,10 @@ public: createProperties (item, props); } + void itemDoubleClicked (const MouseEvent&, ComponentTypeInstance&) + { + } + protected: //============================================================================== struct EditableColour diff --git a/extras/Jucer (experimental)/Source/model/Component/Types/jucer_JucerComponent.h b/extras/Jucer (experimental)/Source/model/Component/Types/jucer_JucerComponent.h index 7388750a72..633c70a986 100644 --- a/extras/Jucer (experimental)/Source/model/Component/Types/jucer_JucerComponent.h +++ b/extras/Jucer (experimental)/Source/model/Component/Types/jucer_JucerComponent.h @@ -28,6 +28,9 @@ #else #include "../jucer_ComponentDocument.h" +#include "../../../ui/jucer_OpenDocumentManager.h" +#include "../../../ui/Project Editor/jucer_ProjectContentComponent.h" + //============================================================================== class JucerComponent : public Component @@ -55,7 +58,6 @@ public: { projectId = newProjectId; comp = 0; - document = 0; if (newProjectId.isNotEmpty()) { @@ -63,11 +65,11 @@ public: if (file.exists()) { - ComponentDocument doc (item.getDocument().getProject(), file); + OpenDocumentManager::Document* doc = OpenDocumentManager::getInstance()->getDocumentForFile (item.getDocument().getProject(), file); - if (doc.reload()) + if (doc != 0) { - addAndMakeVisible (comp = new ComponentDocument::TestComponent (doc)); + addAndMakeVisible (comp = doc->createViewer()); resized(); } } @@ -75,22 +77,15 @@ public: } } -private: - String projectId; - ScopedPointer document; - ScopedPointer comp; - - const File getDocumentFile (ComponentTypeInstance& item, const String projectItemId) + static const File getDocumentFile (ComponentTypeInstance& item, const String projectItemId) { - const String projectId (projectItemId); - - if (projectId.isNotEmpty()) + if (projectItemId.isNotEmpty()) { Project* project = item.getDocument().getProject(); if (project != 0) { - Project::Item item (project->getMainGroup().findItemWithID (projectId)); + Project::Item item (project->getMainGroup().findItemWithID (projectItemId)); if (item.isValid()) return item.getFile(); @@ -99,6 +94,10 @@ private: return File::nonexistent; } + +private: + String projectId; + ScopedPointer comp; }; //============================================================================== @@ -149,6 +148,14 @@ public: item.addFocusOrderProperty (props); } + void itemDoubleClicked (const MouseEvent& e, ComponentTypeInstance& item) + { + ProjectContentComponent* pcc = e.originalComponent->findParentComponentOfClass ((ProjectContentComponent*) 0); + + if (pcc != 0) + pcc->showEditorForFile (JucerComponent::getDocumentFile (item, item [Ids::source].toString())); + } + const String getClassName (ComponentTypeInstance& item) const { return "xxx"; diff --git a/extras/Jucer (experimental)/Source/model/Component/jucer_ComponentDocument.cpp b/extras/Jucer (experimental)/Source/model/Component/jucer_ComponentDocument.cpp index 85cca7eff6..066ae29ecb 100644 --- a/extras/Jucer (experimental)/Source/model/Component/jucer_ComponentDocument.cpp +++ b/extras/Jucer (experimental)/Source/model/Component/jucer_ComponentDocument.cpp @@ -374,6 +374,12 @@ const ValueTree ComponentDocument::performNewComponentMenuItem (int menuResultCo return ValueTree::invalid; } +void ComponentDocument::componentDoubleClicked (const MouseEvent& e, const ValueTree& state) +{ + ComponentTypeInstance item (*this, state); + item.getHandler()->itemDoubleClicked (e, item); +} + void ComponentDocument::updateComponentsIn (Component* compHolder) { int i; @@ -394,12 +400,10 @@ void ComponentDocument::updateComponentsIn (Component* compHolder) Component* c = findComponentForState (compHolder, v); if (c == 0) - { - c = createComponent (i); - compHolder->addAndMakeVisible (c); - } + compHolder->addAndMakeVisible (c = createComponent (i)); + else + updateComponent (c); - updateComponent (c); componentsInOrder.add (c); } @@ -413,51 +417,6 @@ void ComponentDocument::updateComponentsIn (Component* compHolder) } } -//============================================================================== -ComponentDocument::TestComponent::TestComponent (ComponentDocument& document) -{ - background = Colour::fromString (document.getBackgroundColour().toString()); - layoutManager = new ComponentAutoLayoutManager (this); - - setSize (document.getCanvasWidth().getValue(), - document.getCanvasHeight().getValue()); - - int i; - for (i = 0; i < document.getNumComponents(); ++i) - { - Component* c = document.createComponent (i); - addAndMakeVisible (c); - - const ValueTree state (document.getComponent (i)); - layoutManager->setComponentLayout (c, state [ComponentDocument::memberNameProperty], - document.getCoordsFor (state)); - } - - for (i = 0; i < document.getMarkerListX().size(); ++i) - { - const ValueTree marker (document.getMarkerListX().getMarker (i)); - layoutManager->setMarker (document.getMarkerListX().getName (marker), - document.getMarkerListX().getCoordinate (marker)); - } - - for (i = 0; i < document.getMarkerListY().size(); ++i) - { - const ValueTree marker (document.getMarkerListY().getMarker (i)); - layoutManager->setMarker (document.getMarkerListY().getName (marker), - document.getMarkerListY().getCoordinate (marker)); - } -} - -ComponentDocument::TestComponent::~TestComponent() -{ - deleteAllChildren(); -} - -void ComponentDocument::TestComponent::paint (Graphics& g) -{ - g.fillAll (background); -} - //============================================================================== ValueTree ComponentDocument::getComponentGroup() const { diff --git a/extras/Jucer (experimental)/Source/model/Component/jucer_ComponentDocument.h b/extras/Jucer (experimental)/Source/model/Component/jucer_ComponentDocument.h index 2750d4b5fe..4d1ca421d6 100644 --- a/extras/Jucer (experimental)/Source/model/Component/jucer_ComponentDocument.h +++ b/extras/Jucer (experimental)/Source/model/Component/jucer_ComponentDocument.h @@ -94,7 +94,10 @@ public: void addNewComponentMenuItems (PopupMenu& menu) const; const ValueTree performNewComponentMenuItem (int menuResultCode); + void componentDoubleClicked (const MouseEvent& e, const ValueTree& state); + void updateComponentsIn (Component* compHolder); + Component* findComponentForState (Component* parentComp, const ValueTree& state); //============================================================================== class MarkerList : public MarkerListBase @@ -163,19 +166,6 @@ public: static const String getJucerIDFor (Component* c); //============================================================================== - class TestComponent : public Component - { - public: - TestComponent (ComponentDocument& document); - ~TestComponent(); - - void paint (Graphics& g); - - private: - ScopedPointer layoutManager; - Colour background; - }; - juce_UseDebuggingNewOperator private: @@ -201,8 +191,6 @@ private: void writeMetadata (OutputStream& out); bool createItemProperties (Array & props, const String& itemId); - - Component* findComponentForState (Component* compHolder, const ValueTree& state); }; diff --git a/extras/Jucer (experimental)/Source/model/Project/jucer_ProjectExport_MSVC.h b/extras/Jucer (experimental)/Source/model/Project/jucer_ProjectExport_MSVC.h index 0a907b0a38..e41cfe31b4 100644 --- a/extras/Jucer (experimental)/Source/model/Project/jucer_ProjectExport_MSVC.h +++ b/extras/Jucer (experimental)/Source/model/Project/jucer_ProjectExport_MSVC.h @@ -112,7 +112,6 @@ public: bool isPossibleForCurrentProject() { return true; } bool usesMMFiles() const { return false; } - const String getOSTestMacro() { return "(defined (_WIN32) || defined (_WIN64))"; } void launchProject() { @@ -358,6 +357,7 @@ private: 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"); diff --git a/extras/Jucer (experimental)/Source/model/Project/jucer_ProjectExport_Make.h b/extras/Jucer (experimental)/Source/model/Project/jucer_ProjectExport_Make.h index ef054ef86e..50610d73c3 100644 --- a/extras/Jucer (experimental)/Source/model/Project/jucer_ProjectExport_Make.h +++ b/extras/Jucer (experimental)/Source/model/Project/jucer_ProjectExport_Make.h @@ -75,7 +75,6 @@ public: bool isPossibleForCurrentProject() { return true; } bool usesMMFiles() const { return false; } - const String getOSTestMacro() { return "(defined (LINUX) || defined (__linux__))"; } void launchProject() { @@ -126,6 +125,7 @@ private: void writeDefineFlags (OutputStream& out, const Project::BuildConfiguration& config) { StringArray defines; + defines.add (getExporterIdentifierMacro() + "=1"); defines.add ("LINUX=1"); if (config.isDebug().getValue()) diff --git a/extras/Jucer (experimental)/Source/model/Project/jucer_ProjectExport_XCode.h b/extras/Jucer (experimental)/Source/model/Project/jucer_ProjectExport_XCode.h index 6255cdd462..de9bd48c49 100644 --- a/extras/Jucer (experimental)/Source/model/Project/jucer_ProjectExport_XCode.h +++ b/extras/Jucer (experimental)/Source/model/Project/jucer_ProjectExport_XCode.h @@ -82,7 +82,6 @@ public: } bool isPossibleForCurrentProject() { return project.isGUIApplication() || ! iPhone; } - const String getOSTestMacro() { return "(defined(__APPLE_CPP__) || defined(__APPLE_CC__))"; } bool usesMMFiles() const { return true; } void createPropertyEditors (Array & props) @@ -491,6 +490,8 @@ private: StringArray defines; + defines.add (getExporterIdentifierMacro() + "=1"); + if (config.isDebug().getValue()) { defines.add ("_DEBUG=1"); diff --git a/extras/Jucer (experimental)/Source/model/Project/jucer_ProjectExporter.h b/extras/Jucer (experimental)/Source/model/Project/jucer_ProjectExporter.h index 720c4581b9..0b6b17328c 100644 --- a/extras/Jucer (experimental)/Source/model/Project/jucer_ProjectExporter.h +++ b/extras/Jucer (experimental)/Source/model/Project/jucer_ProjectExporter.h @@ -54,14 +54,13 @@ public: virtual void createPropertyEditors (Array & props); virtual void launchProject() = 0; virtual const String create() = 0; - virtual const String getOSTestMacro() = 0; virtual bool shouldFileBeCompiledByDefault (const RelativePath& path) const; //============================================================================== const String getName() const { return name; } const File getTargetFolder() const; - const ValueTree& getSettings() const { return settings; } + const ValueTree& getSettings() const { return settings; } Value getSetting (const Identifier& name_) const { return settings.getPropertyAsValue (name_, project.getUndoManagerFor (settings)); } Value getJuceFolder() const { return getSetting ("juceFolder"); } @@ -84,6 +83,12 @@ public: // This adds the quotes, and may return angle-brackets, eg: or normal quotes. const String getIncludePathForFileInJuceFolder (const String& pathFromJuceFolder, const File& targetIncludeFile) const; + const String getExporterIdentifierMacro() const + { + return "JUCER_" + settings.getType() + "_" + + String::toHexString (settings ["targetFolder"].toString().hashCode()).toUpperCase(); + } + Array juceWrapperFiles; protected: diff --git a/extras/Jucer (experimental)/Source/model/Project/jucer_ProjectSaver.h b/extras/Jucer (experimental)/Source/model/Project/jucer_ProjectSaver.h index 8f018a44de..7875b6edb1 100644 --- a/extras/Jucer (experimental)/Source/model/Project/jucer_ProjectSaver.h +++ b/extras/Jucer (experimental)/Source/model/Project/jucer_ProjectSaver.h @@ -252,7 +252,7 @@ private: if (exporter != 0) { paths.add (exporter->getIncludePathForFileInJuceFolder (pathFromJuceFolder, juceHeaderFile)); - guards.add (exporter->getOSTestMacro()); + guards.add ("defined (" + exporter->getExporterIdentifierMacro() + ")"); } } diff --git a/extras/Jucer (experimental)/Source/ui/Component Editor/jucer_ComponentEditor.cpp b/extras/Jucer (experimental)/Source/ui/Component Editor/jucer_ComponentEditor.cpp index f7e535f739..41fe46ae96 100644 --- a/extras/Jucer (experimental)/Source/ui/Component Editor/jucer_ComponentEditor.cpp +++ b/extras/Jucer (experimental)/Source/ui/Component Editor/jucer_ComponentEditor.cpp @@ -273,11 +273,11 @@ void ComponentEditor::showNewComponentMenu (Component* componentToAttachTo) //============================================================================== void ComponentEditor::test() { - ComponentDocument::TestComponent testComp (getDocument()); + ScopedPointer testComp (document->createViewer()); TooltipWindow tooltipWindow; DialogWindow::showModalDialog ("Testing: " + getDocument().getClassName().toString(), - &testComp, this, Colours::lightgrey, true, true); + testComp, this, Colours::lightgrey, true, true); } //============================================================================== diff --git a/extras/Jucer (experimental)/Source/ui/Component Editor/jucer_ComponentEditor.h b/extras/Jucer (experimental)/Source/ui/Component Editor/jucer_ComponentEditor.h index 55b17289ac..be69bb6621 100644 --- a/extras/Jucer (experimental)/Source/ui/Component Editor/jucer_ComponentEditor.h +++ b/extras/Jucer (experimental)/Source/ui/Component Editor/jucer_ComponentEditor.h @@ -89,5 +89,4 @@ private: }; - #endif // __JUCE_COMPONENTEDITOR_H_6CAE6B7E__ diff --git a/extras/Jucer (experimental)/Source/ui/Component Editor/jucer_ComponentEditorCanvas.h b/extras/Jucer (experimental)/Source/ui/Component Editor/jucer_ComponentEditorCanvas.h index 532c165700..8cfa9b4eef 100644 --- a/extras/Jucer (experimental)/Source/ui/Component Editor/jucer_ComponentEditorCanvas.h +++ b/extras/Jucer (experimental)/Source/ui/Component Editor/jucer_ComponentEditorCanvas.h @@ -108,6 +108,11 @@ public: } } + void objectDoubleClicked (const MouseEvent& e, const ValueTree& state) + { + getDocument().componentDoubleClicked (e, state); + } + const ValueTree getObjectState (const String& objectId) { return getDocument().getComponentWithID (objectId); diff --git a/extras/Jucer (experimental)/Source/ui/Component Editor/jucer_ComponentViewer.cpp b/extras/Jucer (experimental)/Source/ui/Component Editor/jucer_ComponentViewer.cpp new file mode 100644 index 0000000000..d1dea9a913 --- /dev/null +++ b/extras/Jucer (experimental)/Source/ui/Component Editor/jucer_ComponentViewer.cpp @@ -0,0 +1,142 @@ +/* + ============================================================================== + + This file is part of the JUCE library - "Jules' Utility Class Extensions" + Copyright 2004-10 by Raw Material Software Ltd. + + ------------------------------------------------------------------------------ + + JUCE can be redistributed and/or modified under the terms of the GNU General + Public License (Version 2), as published by the Free Software Foundation. + A copy of the license is included in the JUCE distribution, or can be found + online at www.gnu.org/licenses. + + JUCE is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + ------------------------------------------------------------------------------ + + To release a closed-source product which uses JUCE, commercial licenses are + available: visit www.rawmaterialsoftware.com/juce for more information. + + ============================================================================== +*/ + +#include "../../jucer_Headers.h" +#include "jucer_ComponentViewer.h" + + +//============================================================================== +ComponentViewer::ComponentViewer (OpenDocumentManager::Document* document_, Project* project_, ComponentDocument* componentDocument_) + : document (document_), project (project_), componentDocument (componentDocument_) +{ + OpenDocumentManager::getInstance()->addListener (this); + + documentRoot = componentDocument->getRoot(); + documentRoot.addListener (this); + + handleAsyncUpdate(); +} + +ComponentViewer::~ComponentViewer() +{ + OpenDocumentManager::getInstance()->removeListener (this); + deleteAllChildren(); +} + +void ComponentViewer::documentAboutToClose (OpenDocumentManager::Document* closingDoc) +{ + if (document == closingDoc) + { + componentDocument = 0; + document = 0; + layoutManager = 0; + documentRoot = ValueTree::invalid; + + triggerAsyncUpdate(); + handleUpdateNowIfNeeded(); + + // xxx + } +} + +void ComponentViewer::paint (Graphics& g) +{ + if (componentDocument == 0) + drawComponentPlaceholder (g, getWidth(), getHeight(), "(Not a valid Jucer component)"); + else + g.fillAll (background); +} + +void ComponentViewer::handleAsyncUpdate() +{ + deleteAllChildren(); + layoutManager = 0; + background = Colours::transparentBlack; + + if (componentDocument != 0) + { + background = Colour::fromString (componentDocument->getBackgroundColour().toString()); + + if (layoutManager == 0) + layoutManager = new ComponentAutoLayoutManager (this); + + int i; + for (i = getNumChildComponents(); --i >= 0;) + { + Component* c = getChildComponent (i); + + if (! componentDocument->containsComponent (c)) + delete c; + } + + { + Array componentsInOrder; + + const int num = componentDocument->getNumComponents(); + for (i = 0; i < num; ++i) + { + const ValueTree v (componentDocument->getComponent (i)); + Component* c = componentDocument->findComponentForState (this, v); + + if (c == 0) + addAndMakeVisible (c = componentDocument->createComponent (i)); + else + componentDocument->updateComponent (c); + + componentsInOrder.add (c); + + layoutManager->setComponentLayout (c, v [ComponentDocument::memberNameProperty], componentDocument->getCoordsFor (v)); + } + + // Make sure the z-order is correct.. + if (num > 0) + { + componentsInOrder.getLast()->toFront (false); + + for (i = num - 1; --i >= 0;) + componentsInOrder.getUnchecked(i)->toBehind (componentsInOrder.getUnchecked (i + 1)); + } + } + + setSize (componentDocument->getCanvasWidth().getValue(), + componentDocument->getCanvasHeight().getValue()); + + for (i = 0; i < componentDocument->getMarkerListX().size(); ++i) + { + const ValueTree marker (componentDocument->getMarkerListX().getMarker (i)); + layoutManager->setMarker (componentDocument->getMarkerListX().getName (marker), + componentDocument->getMarkerListX().getCoordinate (marker)); + } + + for (i = 0; i < componentDocument->getMarkerListY().size(); ++i) + { + const ValueTree marker (componentDocument->getMarkerListY().getMarker (i)); + layoutManager->setMarker (componentDocument->getMarkerListY().getName (marker), + componentDocument->getMarkerListY().getCoordinate (marker)); + } + } + + repaint(); +} diff --git a/extras/Jucer (experimental)/Source/ui/Component Editor/jucer_ComponentViewer.h b/extras/Jucer (experimental)/Source/ui/Component Editor/jucer_ComponentViewer.h new file mode 100644 index 0000000000..86d881fb9c --- /dev/null +++ b/extras/Jucer (experimental)/Source/ui/Component Editor/jucer_ComponentViewer.h @@ -0,0 +1,73 @@ +/* + ============================================================================== + + This file is part of the JUCE library - "Jules' Utility Class Extensions" + Copyright 2004-10 by Raw Material Software Ltd. + + ------------------------------------------------------------------------------ + + JUCE can be redistributed and/or modified under the terms of the GNU General + Public License (Version 2), as published by the Free Software Foundation. + A copy of the license is included in the JUCE distribution, or can be found + online at www.gnu.org/licenses. + + JUCE is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR + A PARTICULAR PURPOSE. See the GNU General Public License for more details. + + ------------------------------------------------------------------------------ + + To release a closed-source product which uses JUCE, commercial licenses are + available: visit www.rawmaterialsoftware.com/juce for more information. + + ============================================================================== +*/ + +#ifndef __JUCER_COMPONENTVIEWER_H_56080E43__ +#define __JUCER_COMPONENTVIEWER_H_56080E43__ + +#include "../jucer_DocumentEditorComponent.h" +#include "../../model/Component/jucer_ComponentDocument.h" + + +//============================================================================== +/** +*/ +class ComponentViewer : public Component, + public OpenDocumentManager::DocumentCloseListener, + public AsyncUpdater, + public ValueTree::Listener +{ +public: + //============================================================================== + ComponentViewer (OpenDocumentManager::Document* document, Project* project, + ComponentDocument* componentDocument); + ~ComponentViewer(); + + //============================================================================== + void paint (Graphics& g); + + void documentAboutToClose (OpenDocumentManager::Document* closingDoc); + + void valueTreePropertyChanged (ValueTree&, const Identifier&) { triggerAsyncUpdate(); } + void valueTreeChildrenChanged (ValueTree& treeWhoseChildHasChanged) { triggerAsyncUpdate(); } + void valueTreeParentChanged (ValueTree& treeWhoseParentHasChanged) {} + + void handleAsyncUpdate(); + +private: + //============================================================================== + Project* project; + OpenDocumentManager::Document* document; + ComponentDocument* componentDocument; + ValueTree documentRoot; + + ScopedPointer layoutManager; + Colour background; + + ComponentViewer (const ComponentViewer&); + ComponentViewer& operator= (const ComponentViewer&); +}; + + +#endif // __JUCER_COMPONENTVIEWER_H_56080E43__ diff --git a/extras/Jucer (experimental)/Source/ui/Drawable Editor/jucer_DrawableEditorCanvas.h b/extras/Jucer (experimental)/Source/ui/Drawable Editor/jucer_DrawableEditorCanvas.h index 35905ab7a9..1afcc9e436 100644 --- a/extras/Jucer (experimental)/Source/ui/Drawable Editor/jucer_DrawableEditorCanvas.h +++ b/extras/Jucer (experimental)/Source/ui/Drawable Editor/jucer_DrawableEditorCanvas.h @@ -95,6 +95,10 @@ public: } } + void objectDoubleClicked (const MouseEvent& e, const ValueTree& state) + { + } + const ValueTree getObjectState (const String& objectId) { return ValueTree(); diff --git a/extras/Jucer (experimental)/Source/ui/Editor Base/jucer_EditorCanvas.cpp b/extras/Jucer (experimental)/Source/ui/Editor Base/jucer_EditorCanvas.cpp index 449813b489..980084502c 100644 --- a/extras/Jucer (experimental)/Source/ui/Editor Base/jucer_EditorCanvas.cpp +++ b/extras/Jucer (experimental)/Source/ui/Editor Base/jucer_EditorCanvas.cpp @@ -469,6 +469,17 @@ public: { canvas->getMarkerList (false).createMarker ("Marker", e.y - yAxis.getY()); } + else + { + const MouseEvent e2 (e.getEventRelativeTo (canvas->getComponentHolder())); + const SelectedItems::ItemType underMouse (canvas->findObjectIdAt (e2.getPosition())); + + if (underMouse.isNotEmpty()) + { + const ValueTree state (canvas->getObjectState (underMouse)); + canvas->objectDoubleClicked (e2, state); + } + } } void findLassoItemsInArea (Array & itemsFound, const Rectangle& area) diff --git a/extras/Jucer (experimental)/Source/ui/Editor Base/jucer_EditorCanvas.h b/extras/Jucer (experimental)/Source/ui/Editor Base/jucer_EditorCanvas.h index b6589861a5..0b3570da2a 100644 --- a/extras/Jucer (experimental)/Source/ui/Editor Base/jucer_EditorCanvas.h +++ b/extras/Jucer (experimental)/Source/ui/Editor Base/jucer_EditorCanvas.h @@ -73,6 +73,7 @@ public: virtual const SelectedItems::ItemType findObjectIdAt (const Point& position) = 0; virtual void showPopupMenu (const Point& position) = 0; + virtual void objectDoubleClicked (const MouseEvent& e, const ValueTree& state) = 0; virtual const ValueTree getObjectState (const String& objectId) = 0; virtual const Rectangle getObjectPosition (const ValueTree& state) = 0; diff --git a/extras/Jucer (experimental)/Source/ui/jucer_DocumentEditorComponent.cpp b/extras/Jucer (experimental)/Source/ui/jucer_DocumentEditorComponent.cpp index 21db7f7199..b6f3b4adac 100644 --- a/extras/Jucer (experimental)/Source/ui/jucer_DocumentEditorComponent.cpp +++ b/extras/Jucer (experimental)/Source/ui/jucer_DocumentEditorComponent.cpp @@ -31,27 +31,29 @@ DocumentEditorComponent::DocumentEditorComponent (OpenDocumentManager::Document* document_) : document (document_) { - OpenDocumentManager::getInstance()->registerEditor (this); + OpenDocumentManager::getInstance()->addListener (this); } DocumentEditorComponent::~DocumentEditorComponent() { - OpenDocumentManager::getInstance()->deregisterEditor (this); + OpenDocumentManager::getInstance()->removeListener (this); } -void DocumentEditorComponent::deleteSelf() +void DocumentEditorComponent::documentAboutToClose (OpenDocumentManager::Document* closingDoc) { - jassert (document != 0); - - ProjectContentComponent* pcc = findParentComponentOfClass ((ProjectContentComponent*) 0); - - if (pcc != 0) + if (document == closingDoc) { - pcc->hideDocument (document); - return; - } + jassert (document != 0); + ProjectContentComponent* pcc = findParentComponentOfClass ((ProjectContentComponent*) 0); - jassertfalse + if (pcc != 0) + { + pcc->hideDocument (document); + return; + } + + jassertfalse + } } ApplicationCommandTarget* DocumentEditorComponent::getNextCommandTarget() diff --git a/extras/Jucer (experimental)/Source/ui/jucer_DocumentEditorComponent.h b/extras/Jucer (experimental)/Source/ui/jucer_DocumentEditorComponent.h index 7aa75739fb..b32d0f46aa 100644 --- a/extras/Jucer (experimental)/Source/ui/jucer_DocumentEditorComponent.h +++ b/extras/Jucer (experimental)/Source/ui/jucer_DocumentEditorComponent.h @@ -33,7 +33,8 @@ /** */ class DocumentEditorComponent : public Component, - public ApplicationCommandTarget + public ApplicationCommandTarget, + public OpenDocumentManager::DocumentCloseListener { public: //============================================================================== @@ -41,7 +42,7 @@ public: ~DocumentEditorComponent(); OpenDocumentManager::Document* getDocument() const { return document; } - virtual void deleteSelf(); + void documentAboutToClose (OpenDocumentManager::Document* document); //============================================================================== ApplicationCommandTarget* getNextCommandTarget(); diff --git a/extras/Jucer (experimental)/Source/ui/jucer_OpenDocumentManager.cpp b/extras/Jucer (experimental)/Source/ui/jucer_OpenDocumentManager.cpp index 491c8ff9b0..9ab76f3619 100644 --- a/extras/Jucer (experimental)/Source/ui/jucer_OpenDocumentManager.cpp +++ b/extras/Jucer (experimental)/Source/ui/jucer_OpenDocumentManager.cpp @@ -28,6 +28,7 @@ #include "Drawable Editor/jucer_DrawableEditor.h" #include "Project Editor/jucer_ItemPreviewComponent.h" #include "Component Editor/jucer_ComponentEditor.h" +#include "Component Editor/jucer_ComponentViewer.h" //============================================================================== @@ -91,6 +92,8 @@ public: return new SourceCodeEditor (this, *codeDoc, tokeniser); } + Component* createViewer() { return createEditor(); } + private: FileModificationDetector modDetector; ScopedPointer codeDoc; @@ -165,6 +168,17 @@ public: return new ComponentEditor (this, project, componentDoc); } + Component* createViewer() + { + if (componentDoc == 0) + { + jassertfalse; + return 0; + } + + return new ComponentViewer (this, project, componentDoc); + } + private: Project* project; FileModificationDetector modDetector; @@ -231,6 +245,11 @@ public: return new DrawableEditor (this, project, drawableDoc); } + Component* createViewer() + { + return createEditor(); //xxx + } + private: Project* project; FileModificationDetector modDetector; @@ -259,6 +278,7 @@ public: void reloadFromFile() { fileModificationTime = file.getLastModificationTime(); } const String getName() const { return file.getFileName(); } Component* createEditor() { return new ItemPreviewComponent (file); } + Component* createViewer() { return createEditor(); } void fileHasBeenRenamed (const File& newFile) { file = newFile; } const String getType() const @@ -293,14 +313,14 @@ OpenDocumentManager::~OpenDocumentManager() juce_ImplementSingleton_SingleThreaded (OpenDocumentManager); //============================================================================== -void OpenDocumentManager::registerEditor (DocumentEditorComponent* editor) +void OpenDocumentManager::addListener (DocumentCloseListener* listener) { - editors.add (editor); + listeners.addIfNotAlreadyThere (listener); } -void OpenDocumentManager::deregisterEditor (DocumentEditorComponent* editor) +void OpenDocumentManager::removeListener (DocumentCloseListener* listener) { - editors.removeValue (editor); + listeners.removeValue (listener); } //============================================================================== @@ -396,9 +416,8 @@ bool OpenDocumentManager::closeDocument (int index, bool saveIfNeeded) return false; } - for (int i = editors.size(); --i >= 0;) - if (editors.getUnchecked(i)->getDocument() == doc) - editors.getUnchecked(i)->deleteSelf(); + for (int i = listeners.size(); --i >= 0;) + listeners.getUnchecked(i)->documentAboutToClose (doc); documents.remove (index); commandManager->commandStatusChanged(); diff --git a/extras/Jucer (experimental)/Source/ui/jucer_OpenDocumentManager.h b/extras/Jucer (experimental)/Source/ui/jucer_OpenDocumentManager.h index 1b93419e72..0e5f6adaad 100644 --- a/extras/Jucer (experimental)/Source/ui/jucer_OpenDocumentManager.h +++ b/extras/Jucer (experimental)/Source/ui/jucer_OpenDocumentManager.h @@ -28,7 +28,6 @@ #include "../model/Project/jucer_Project.h" #include "../model/Drawable/jucer_DrawableDocument.h" -class DocumentEditorComponent; //============================================================================== @@ -61,6 +60,7 @@ public: virtual bool hasFileBeenModifiedExternally() = 0; virtual void reloadFromFile() = 0; virtual Component* createEditor() = 0; + virtual Component* createViewer() = 0; virtual void fileHasBeenRenamed (const File& newFile) = 0; }; @@ -83,15 +83,24 @@ public: void fileHasBeenRenamed (const File& oldFile, const File& newFile); //============================================================================== - void registerEditor (DocumentEditorComponent* editor); - void deregisterEditor (DocumentEditorComponent* editor); + class DocumentCloseListener + { + public: + DocumentCloseListener() {} + virtual ~DocumentCloseListener() {} + + virtual void documentAboutToClose (Document* document) = 0; + }; + + void addListener (DocumentCloseListener* listener); + void removeListener (DocumentCloseListener* listener); //============================================================================== juce_UseDebuggingNewOperator private: OwnedArray documents; - SortedSet editors; + Array listeners; }; diff --git a/extras/amalgamator/Builds/Linux/Makefile b/extras/amalgamator/Builds/Linux/Makefile index 96818919aa..ee24beb5bd 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 "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + CPPFLAGS := $(DEPFLAGS) -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=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 "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + RESFLAGS := -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=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 "LINUX=1" -D "NDEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + CPPFLAGS := $(DEPFLAGS) -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=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 "LINUX=1" -D "NDEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + RESFLAGS := -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=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 a3c0e2c9f2..4d13e999ef 100644 --- a/extras/amalgamator/Builds/MacOSX/Amalgamator.xcodeproj/project.pbxproj +++ b/extras/amalgamator/Builds/MacOSX/Amalgamator.xcodeproj/project.pbxproj @@ -74,6 +74,7 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_PREPROCESSOR_DEFINITIONS = ( + "JUCER_XCODE_MAC_F6D2F4CF=1", "_DEBUG=1", "DEBUG=1 "); }; name = Debug; }; 4DFAC29D863495AD1E31B6B9 = { isa = XCBuildConfiguration; buildSettings = { @@ -86,6 +87,7 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( + "JUCER_XCODE_MAC_F6D2F4CF=1", "_NDEBUG=1", "NDEBUG=1 "); }; name = Release; }; 4EAD81574ACF05AC27D04B76 = { isa = XCBuildConfiguration; buildSettings = { diff --git a/extras/amalgamator/Builds/VisualStudio2005/Amalgamator.vcproj b/extras/amalgamator/Builds/VisualStudio2005/Amalgamator.vcproj index f8ead20775..59e5fc71c3 100644 --- a/extras/amalgamator/Builds/VisualStudio2005/Amalgamator.vcproj +++ b/extras/amalgamator/Builds/VisualStudio2005/Amalgamator.vcproj @@ -33,7 +33,7 @@ BufferSecurityCheck="" DebugInformationFormat="4" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CONSOLE" + PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;_DEBUG;_CONSOLE" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -89,7 +89,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CONSOLE" + PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;NDEBUG;_CONSOLE" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" diff --git a/extras/amalgamator/Builds/VisualStudio2008/Amalgamator.vcproj b/extras/amalgamator/Builds/VisualStudio2008/Amalgamator.vcproj index 1972640dc1..dc3abcfbe1 100644 --- a/extras/amalgamator/Builds/VisualStudio2008/Amalgamator.vcproj +++ b/extras/amalgamator/Builds/VisualStudio2008/Amalgamator.vcproj @@ -33,7 +33,7 @@ BufferSecurityCheck="" DebugInformationFormat="4" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CONSOLE" + PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;_DEBUG;_CONSOLE" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -89,7 +89,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CONSOLE" + PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;NDEBUG;_CONSOLE" 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 3a1e6599b5..7a5e0ddbe9 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 "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + CPPFLAGS := $(DEPFLAGS) -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=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 "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + RESFLAGS := -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -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 "LINUX=1" -D "NDEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + CPPFLAGS := $(DEPFLAGS) -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=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 "LINUX=1" -D "NDEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + RESFLAGS := -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=1" -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 bd0ee88fbb..97abeb141e 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,6 +112,7 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_PREPROCESSOR_DEFINITIONS = ( + "JUCER_XCODE_MAC_F6D2F4CF=1", "_DEBUG=1", "DEBUG=1 "); }; name = Debug; }; 90901561E3F7FD713257B23D = { isa = XCBuildConfiguration; buildSettings = { @@ -125,6 +126,7 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( + "JUCER_XCODE_MAC_F6D2F4CF=1", "_NDEBUG=1", "NDEBUG=1 "); }; name = Release; }; 8133D32BA8816D704BF648FA = { isa = XCBuildConfiguration; buildSettings = { diff --git a/extras/audio plugin host/Builds/VisualStudio2005/Plugin Host.vcproj b/extras/audio plugin host/Builds/VisualStudio2005/Plugin Host.vcproj index b4daf47447..18b4403334 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="WIN32;_WINDOWS;_DEBUG" + PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;_DEBUG" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -89,7 +89,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="c:\SDKs\vstsdk2.4" - PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG" + PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;NDEBUG" 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 8a12df5457..62dd8ad55b 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="WIN32;_WINDOWS;_DEBUG" + PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;_DEBUG" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -89,7 +89,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="c:\SDKs\vstsdk2.4" - PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG" + PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;NDEBUG" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" 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 a974a49de8..9f8d84cfb8 100644 --- a/extras/audio plugins/demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj +++ b/extras/audio plugins/demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj @@ -249,6 +249,7 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_PREPROCESSOR_DEFINITIONS = ( + "JUCER_XCODE_MAC_F6D2F4CF=1", "_DEBUG=1", "DEBUG=1 ", "JUCE_ObjCExtraSuffix=JuceDemo"); }; name = Debug; }; @@ -268,6 +269,7 @@ 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; }; diff --git a/extras/audio plugins/demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj b/extras/audio plugins/demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj index b7fa377df7..b0b4f5d97d 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="WIN32;_WINDOWS;_DEBUG" + PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;_DEBUG" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -89,7 +89,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="c:\SDKs\vstsdk2.4;..\..\JuceLibraryCode" - PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG" + PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;NDEBUG" 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 9f0f0f872a..c8b39303a3 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="WIN32;_WINDOWS;_DEBUG" + PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;_DEBUG" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -89,7 +89,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="c:\SDKs\vstsdk2.4;..\..\JuceLibraryCode" - PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG" + PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;NDEBUG" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" diff --git a/extras/binarybuilder/Builds/Linux/Makefile b/extras/binarybuilder/Builds/Linux/Makefile index 695bce9910..c3aa2fe4ee 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 "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + CPPFLAGS := $(DEPFLAGS) -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=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 "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + RESFLAGS := -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=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 "LINUX=1" -D "NDEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + CPPFLAGS := $(DEPFLAGS) -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=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 "LINUX=1" -D "NDEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + RESFLAGS := -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=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 53f2e9c022..a5ad178de2 100644 --- a/extras/binarybuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj +++ b/extras/binarybuilder/Builds/MacOSX/BinaryBuilder.xcodeproj/project.pbxproj @@ -74,6 +74,7 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_PREPROCESSOR_DEFINITIONS = ( + "JUCER_XCODE_MAC_F6D2F4CF=1", "_DEBUG=1", "DEBUG=1 "); }; name = Debug; }; D4E910481C9C05D598DC755B = { isa = XCBuildConfiguration; buildSettings = { @@ -86,6 +87,7 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( + "JUCER_XCODE_MAC_F6D2F4CF=1", "_NDEBUG=1", "NDEBUG=1 "); }; name = Release; }; C69BDE02D12775D4A17BFA17 = { isa = XCBuildConfiguration; buildSettings = { diff --git a/extras/binarybuilder/Builds/VisualStudio2005/BinaryBuilder.vcproj b/extras/binarybuilder/Builds/VisualStudio2005/BinaryBuilder.vcproj index 7f86ecfec3..d4155d4ea8 100644 --- a/extras/binarybuilder/Builds/VisualStudio2005/BinaryBuilder.vcproj +++ b/extras/binarybuilder/Builds/VisualStudio2005/BinaryBuilder.vcproj @@ -33,7 +33,7 @@ BufferSecurityCheck="" DebugInformationFormat="4" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CONSOLE" + PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;_DEBUG;_CONSOLE" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -89,7 +89,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CONSOLE" + PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;NDEBUG;_CONSOLE" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" diff --git a/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj b/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj index fa7242cee8..bb8aaf1037 100644 --- a/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj +++ b/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj @@ -33,7 +33,7 @@ BufferSecurityCheck="" DebugInformationFormat="4" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;_DEBUG;_CONSOLE" + PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;_DEBUG;_CONSOLE" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -89,7 +89,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG;_CONSOLE" + PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;NDEBUG;_CONSOLE" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" diff --git a/extras/example projects/Builds/Linux/Makefile b/extras/example projects/Builds/Linux/Makefile index eeb3858c24..4b48c5b328 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 "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + CPPFLAGS := $(DEPFLAGS) -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=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 "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + RESFLAGS := -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=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 "LINUX=1" -D "NDEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + CPPFLAGS := $(DEPFLAGS) -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=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 "LINUX=1" -D "NDEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + RESFLAGS := -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=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 5a8375238a..081301f728 100644 --- a/extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj +++ b/extras/example projects/Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj @@ -91,6 +91,7 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_PREPROCESSOR_DEFINITIONS = ( + "JUCER_XCODE_MAC_F6D2F4CF=1", "_DEBUG=1", "DEBUG=1 "); }; name = Debug; }; 2BF0DFE3F61DBC969BCBD0C4 = { isa = XCBuildConfiguration; buildSettings = { @@ -104,6 +105,7 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( + "JUCER_XCODE_MAC_F6D2F4CF=1", "_NDEBUG=1", "NDEBUG=1 "); }; name = Release; }; 1C939EADBAB81B95A46A6581 = { isa = XCBuildConfiguration; buildSettings = { diff --git a/extras/example projects/Builds/VisualStudio2005/HelloWorld.vcproj b/extras/example projects/Builds/VisualStudio2005/HelloWorld.vcproj index 6b03dd6c54..0364fc9660 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="WIN32;_WINDOWS;_DEBUG" + PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;_DEBUG" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -89,7 +89,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG" + PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;NDEBUG" 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 7474258d9a..99aa45aff7 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="WIN32;_WINDOWS;_DEBUG" + PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;_DEBUG" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -89,7 +89,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG" + PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;NDEBUG" 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 2d318c6308..c02358490b 100644 --- a/extras/example projects/Builds/iPhone/HelloWorld.xcodeproj/project.pbxproj +++ b/extras/example projects/Builds/iPhone/HelloWorld.xcodeproj/project.pbxproj @@ -76,6 +76,7 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_PREPROCESSOR_DEFINITIONS = ( + "JUCER_XCODE_IPHONE_25ADD7EF=1", "_DEBUG=1", "DEBUG=1 "); }; name = Debug; }; 2BF0DFE3F61DBC969BCBD0C4 = { isa = XCBuildConfiguration; buildSettings = { @@ -89,6 +90,7 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( + "JUCER_XCODE_IPHONE_25ADD7EF=1", "_NDEBUG=1", "NDEBUG=1 "); }; name = Release; }; 1C939EADBAB81B95A46A6581 = { isa = XCBuildConfiguration; buildSettings = { diff --git a/extras/juce demo/Builds/Linux/Makefile b/extras/juce demo/Builds/Linux/Makefile index 131093a021..6c44f3a40e 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 "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + CPPFLAGS := $(DEPFLAGS) -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=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 "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + RESFLAGS := -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "DEBUG=1" -D "_DEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" TARGET := JuceDemo BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) endif @@ -32,12 +32,12 @@ ifeq ($(CONFIG),Release) LIBDIR := build OBJDIR := build/intermediate/Release OUTDIR := build - CPPFLAGS := $(DEPFLAGS) -D "LINUX=1" -D "NDEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + CPPFLAGS := $(DEPFLAGS) -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=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 "LINUX=1" -D "NDEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" + RESFLAGS := -D "JUCER_LINUX_MAKE_7346DA2A=1" -D "LINUX=1" -D "NDEBUG=1" -I "/usr/include" -I "/usr/include/freetype2" TARGET := JuceDemo BLDCMD = $(CXX) -o $(OUTDIR)/$(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(TARGET_ARCH) endif 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 74ce8edc0d..33521cdca4 100644 --- a/extras/juce demo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj +++ b/extras/juce demo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj @@ -183,6 +183,7 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_PREPROCESSOR_DEFINITIONS = ( + "JUCER_XCODE_MAC_F6D2F4CF=1", "_DEBUG=1", "DEBUG=1 "); }; name = Debug; }; 8EF7C7FFD55219581A5075F3 = { isa = XCBuildConfiguration; buildSettings = { @@ -196,6 +197,7 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( + "JUCER_XCODE_MAC_F6D2F4CF=1", "_NDEBUG=1", "NDEBUG=1 "); }; name = Release; }; 7FA986B99AFC795723E00AB0 = { isa = XCBuildConfiguration; buildSettings = { diff --git a/extras/juce demo/Builds/VisualStudio2005/Juce Demo.vcproj b/extras/juce demo/Builds/VisualStudio2005/Juce Demo.vcproj index 14e2fab842..deda1d534f 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="WIN32;_WINDOWS;_DEBUG" + PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;_DEBUG" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -89,7 +89,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG" + PreprocessorDefinitions="JUCER_VS2005_78A5003;WIN32;_WINDOWS;NDEBUG" 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 21144e1332..3d27f40dc6 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="WIN32;_WINDOWS;_DEBUG" + PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;_DEBUG" RuntimeLibrary="1" RuntimeTypeInfo="true" UsePrecompiledHeader="0" @@ -89,7 +89,7 @@ InlineFunctionExpansion="1" StringPooling="true" AdditionalIncludeDirectories="" - PreprocessorDefinitions="WIN32;_WINDOWS;NDEBUG" + PreprocessorDefinitions="JUCER_VS2008_78A5006;WIN32;_WINDOWS;NDEBUG" RuntimeLibrary="0" RuntimeTypeInfo="true" UsePrecompiledHeader="0" 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 bad3df05cd..b9f8781482 100644 --- a/extras/juce demo/Builds/iPhone/Juce Demo.xcodeproj/project.pbxproj +++ b/extras/juce demo/Builds/iPhone/Juce Demo.xcodeproj/project.pbxproj @@ -168,6 +168,7 @@ GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_PREPROCESSOR_DEFINITIONS = ( + "JUCER_XCODE_IPHONE_25ADD7EF=1", "_DEBUG=1", "DEBUG=1 "); }; name = Debug; }; 8EF7C7FFD55219581A5075F3 = { isa = XCBuildConfiguration; buildSettings = { @@ -181,6 +182,7 @@ GCC_GENERATE_DEBUGGING_SYMBOLS = NO; GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_PREPROCESSOR_DEFINITIONS = ( + "JUCER_XCODE_IPHONE_25ADD7EF=1", "_NDEBUG=1", "NDEBUG=1 "); }; name = Release; }; 7FA986B99AFC795723E00AB0 = { isa = XCBuildConfiguration; buildSettings = {