From b114339c3f883a906130d9c4c796959ba60a3771 Mon Sep 17 00:00:00 2001 From: Julian Storer Date: Thu, 22 Sep 2011 15:44:42 +0100 Subject: [PATCH] New macro JUCE_DEFAULT_SOFTWARE_RENDERER to help replace the software renderer with a custom class. Removed some defunct Xcode settings. Small SVG workaround. --- .../MacOSX/The Introjucer.xcodeproj/project.pbxproj | 5 ----- .../Builds/VisualStudio2005/The Introjucer.vcproj | 10 ---------- .../Builds/VisualStudio2008/The Introjucer.vcproj | 10 ---------- .../Builds/VisualStudio2010/The Introjucer.vcxproj | 3 --- .../VisualStudio2010/The Introjucer.vcxproj.filters | 3 --- .../Source/Project Saving/jucer_ProjectExport_XCode.h | 2 -- .../Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj | 5 ----- .../JuceDemo/Builds/VisualStudio2005/Juce Demo.vcproj | 10 ---------- .../JuceDemo/Builds/VisualStudio2008/Juce Demo.vcproj | 10 ---------- .../JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj | 3 --- .../Builds/VisualStudio2010/Juce Demo.vcxproj.filters | 3 --- .../Builds/iOS/Juce Demo.xcodeproj/project.pbxproj | 5 ----- .../MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj | 5 ----- .../Builds/VisualStudio2005/JuceDemoPlugin.vcproj | 10 ---------- .../Builds/VisualStudio2008/JuceDemoPlugin.vcproj | 10 ---------- .../MacOSX/Plugin Host.xcodeproj/project.pbxproj | 7 +------ .../Builds/VisualStudio2005/Plugin Host.vcproj | 10 ---------- .../Builds/VisualStudio2008/Plugin Host.vcproj | 10 ---------- .../MacOSX/BinaryBuilder.xcodeproj/project.pbxproj | 3 --- .../Builds/MacOSX/HelloWorld.xcodeproj/project.pbxproj | 5 ----- .../Builds/VisualStudio2005/HelloWorld.vcproj | 10 ---------- .../Builds/VisualStudio2008/HelloWorld.vcproj | 10 ---------- .../Builds/iOS/HelloWorld.xcodeproj/project.pbxproj | 5 ----- .../Builds/MacOSX/juce.xcodeproj/project.pbxproj | 5 ----- .../static library/Builds/VisualStudio2008/juce.vcproj | 10 ---------- .../Builds/VisualStudio2010/juce.vcxproj | 3 --- .../Builds/VisualStudio2010/juce.vcxproj.filters | 3 --- .../Builds/MacOSX/Jucer.xcodeproj/project.pbxproj | 5 ----- extras/the jucer/Builds/VisualStudio2008/Jucer.vcproj | 10 ---------- extras/the jucer/Builds/VisualStudio2010/Jucer.vcxproj | 3 --- .../Builds/VisualStudio2010/Jucer.vcxproj.filters | 3 --- modules/juce_graphics/images/juce_Image.cpp | 2 +- modules/juce_graphics/juce_graphics.h | 8 ++++++++ modules/juce_gui_basics/drawables/juce_SVGParser.cpp | 3 +++ .../juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp | 3 ++- .../juce_gui_basics/native/juce_android_Windowing.cpp | 4 ++-- .../juce_gui_basics/native/juce_linux_Windowing.cpp | 4 ++-- .../native/juce_mac_NSViewComponentPeer.mm | 2 +- .../juce_gui_basics/native/juce_win32_Windowing.cpp | 4 ++-- 39 files changed, 22 insertions(+), 204 deletions(-) diff --git a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj index f31169ab69..32c9079027 100644 --- a/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj +++ b/extras/Introjucer/Builds/MacOSX/The Introjucer.xcodeproj/project.pbxproj @@ -696,7 +696,6 @@ EE690110171E1648FF2118B8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_Application.h"; path = "../../Source/Application/jucer_Application.h"; sourceTree = "SOURCE_ROOT"; }; EE775C35756DC364728D4675 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_DynamicObject.cpp"; path = "../../../../modules/juce_core/containers/juce_DynamicObject.cpp"; sourceTree = "SOURCE_ROOT"; }; EE8504403714A7CE606B5F34 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Logger.h"; path = "../../../../modules/juce_core/logging/juce_Logger.h"; sourceTree = "SOURCE_ROOT"; }; - EEC538BA073B56B58D43673B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Message.cpp"; path = "../../../../modules/juce_events/messages/juce_Message.cpp"; sourceTree = "SOURCE_ROOT"; }; F03E2BDD36E6F4F53AB767A8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "jucer_Headers.h"; path = "../../Source/jucer_Headers.h"; sourceTree = "SOURCE_ROOT"; }; F07EA5078D6BB60B698F5E12 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_SystemStats.cpp"; path = "../../../../modules/juce_core/native/juce_android_SystemStats.cpp"; sourceTree = "SOURCE_ROOT"; }; F08EB921DB62255A4B6DE85A = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_RectangleList.h"; path = "../../../../modules/juce_graphics/geometry/juce_RectangleList.h"; sourceTree = "SOURCE_ROOT"; }; @@ -1083,7 +1082,6 @@ DF7BB5B6B394EDEEF5F5B4B8, FAC03FFD051FA5B34EE9BA15, B7BE4498F5A592AAC43F0C93, - EEC538BA073B56B58D43673B, CB36CD7F57D0F4231DC98686, 0F382FC6B16658EF02D2C4F0, 8FF39B6B0D9DEB5BBE388A6F, @@ -1593,7 +1591,6 @@ 0FFEF043CA89142B18C79ABE, 92ABB8016546F41128399E9D ); name = Source; sourceTree = ""; }; EA0BCC969703B2D179089E55 = { isa = XCBuildConfiguration; buildSettings = { - PREBINDING = NO; HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)"; GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_FILE = Info.plist; @@ -1602,7 +1599,6 @@ ONLY_ACTIVE_ARCH = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "_DEBUG=1", "DEBUG=1", @@ -1610,7 +1606,6 @@ "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; B159CF4275B8A90122629FF4 = { isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - PREBINDING = NO; HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)"; GCC_OPTIMIZATION_LEVEL = 3; INFOPLIST_FILE = Info.plist; diff --git a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj index 612d9f088c..2fc0b88b64 100644 --- a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj +++ b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj @@ -1340,16 +1340,6 @@ - - - - - - - - - - - - - - - - true - - true - true diff --git a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters index eea7068933..0adbcd022d 100644 --- a/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters +++ b/extras/Introjucer/Builds/VisualStudio2010/The Introjucer.vcxproj.filters @@ -595,9 +595,6 @@ Juce Modules\juce_events\messages - - Juce Modules\juce_events\messages - Juce Modules\juce_events\messages diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h index 590f2f6810..b9a476a8a0 100644 --- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h +++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_XCode.h @@ -488,7 +488,6 @@ private: else if (arch == Project::BuildConfiguration::osxArch_64BitUniversal) s.add ("ARCHS = \"$(ARCHS_STANDARD_32_64_BIT)\""); else if (arch == Project::BuildConfiguration::osxArch_64Bit) s.add ("ARCHS = \"$(ARCHS_STANDARD_64_BIT)\""); - s.add ("PREBINDING = NO"); s.add ("HEADER_SEARCH_PATHS = \"" + replacePreprocessorTokens (config, getHeaderSearchPaths (config).joinIntoString (" ")) + " $(inherited)\""); s.add ("GCC_OPTIMIZATION_LEVEL = " + config.getGCCOptimisationFlag()); s.add ("INFOPLIST_FILE = " + infoPlistFile.getFileName()); @@ -578,7 +577,6 @@ private: s.add ("ONLY_ACTIVE_ARCH = YES"); s.add ("COPY_PHASE_STRIP = NO"); s.add ("GCC_DYNAMIC_NO_PIC = NO"); - s.add ("GCC_ENABLE_FIX_AND_CONTINUE = NO"); } else { diff --git a/extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj b/extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj index 5f1f9b4451..5d55ed7923 100644 --- a/extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj +++ b/extras/JuceDemo/Builds/MacOSX/Juce Demo.xcodeproj/project.pbxproj @@ -149,7 +149,6 @@ 1B3C2797B04E0FC6699DFDF0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_Windowing.cpp"; path = "../../../../modules/juce_gui_basics/native/juce_android_Windowing.cpp"; sourceTree = "SOURCE_ROOT"; }; 1BDF3CAE40B1FDD559BC3DD3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_InterprocessConnection.h"; path = "../../../../modules/juce_events/interprocess/juce_InterprocessConnection.h"; sourceTree = "SOURCE_ROOT"; }; 1C36F82D875B81C26A5752AF = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioPluginFormat.cpp"; path = "../../../../modules/juce_audio_processors/format/juce_AudioPluginFormat.cpp"; sourceTree = "SOURCE_ROOT"; }; - 1C4C1D61413449E5556F4154 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Message.cpp"; path = "../../../../modules/juce_events/messages/juce_Message.cpp"; sourceTree = "SOURCE_ROOT"; }; 1CCB7B18759F7CEBB065C31E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AppleRemote.h"; path = "../../../../modules/juce_gui_extra/misc/juce_AppleRemote.h"; sourceTree = "SOURCE_ROOT"; }; 1D0DD674EEEF98B1E1B8D8D8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FileListComponent.cpp"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FileListComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 1D3DA514A7B46A2A32A32060 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MidiKeyboardComponent.cpp"; path = "../../../../modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -1389,7 +1388,6 @@ C66E08F5118F529FC623733E, B6D34ED1DE5CC8010A1BE232, 96C8D0EE75ABEB02422AA41F, - 1C4C1D61413449E5556F4154, C4A730DEDDA33FA9A06CDA82, 52CAE85DCE0FA2692B8A85C7, 56CA808B4610A5C34730B4D2, @@ -1960,7 +1958,6 @@ 0AE68D12A51E59B084E046C1, 913372FE9DAAA74F5520A786 ); name = Source; sourceTree = ""; }; 2FE1E46B92ED7BD427F01D8C = { isa = XCBuildConfiguration; buildSettings = { - PREBINDING = NO; HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)"; GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_FILE = Info.plist; @@ -1969,7 +1966,6 @@ ONLY_ACTIVE_ARCH = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "_DEBUG=1", "DEBUG=1", @@ -1978,7 +1974,6 @@ "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; 9E3B64077ABD2AA72A51EE7C = { isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - PREBINDING = NO; HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)"; GCC_OPTIMIZATION_LEVEL = s; INFOPLIST_FILE = Info.plist; diff --git a/extras/JuceDemo/Builds/VisualStudio2005/Juce Demo.vcproj b/extras/JuceDemo/Builds/VisualStudio2005/Juce Demo.vcproj index ddd1a19e84..0a8afcba9c 100644 --- a/extras/JuceDemo/Builds/VisualStudio2005/Juce Demo.vcproj +++ b/extras/JuceDemo/Builds/VisualStudio2005/Juce Demo.vcproj @@ -2074,16 +2074,6 @@ - - - - - - - - - - - - - - - - true - - true - true diff --git a/extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj.filters b/extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj.filters index 8afebb1598..7e680504d3 100644 --- a/extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj.filters +++ b/extras/JuceDemo/Builds/VisualStudio2010/Juce Demo.vcxproj.filters @@ -886,9 +886,6 @@ Juce Modules\juce_events\messages - - Juce Modules\juce_events\messages - Juce Modules\juce_events\messages diff --git a/extras/JuceDemo/Builds/iOS/Juce Demo.xcodeproj/project.pbxproj b/extras/JuceDemo/Builds/iOS/Juce Demo.xcodeproj/project.pbxproj index 30c1858f74..c61ed7b599 100644 --- a/extras/JuceDemo/Builds/iOS/Juce Demo.xcodeproj/project.pbxproj +++ b/extras/JuceDemo/Builds/iOS/Juce Demo.xcodeproj/project.pbxproj @@ -141,7 +141,6 @@ 1B3C2797B04E0FC6699DFDF0 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_android_Windowing.cpp"; path = "../../../../modules/juce_gui_basics/native/juce_android_Windowing.cpp"; sourceTree = "SOURCE_ROOT"; }; 1BDF3CAE40B1FDD559BC3DD3 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_InterprocessConnection.h"; path = "../../../../modules/juce_events/interprocess/juce_InterprocessConnection.h"; sourceTree = "SOURCE_ROOT"; }; 1C36F82D875B81C26A5752AF = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_AudioPluginFormat.cpp"; path = "../../../../modules/juce_audio_processors/format/juce_AudioPluginFormat.cpp"; sourceTree = "SOURCE_ROOT"; }; - 1C4C1D61413449E5556F4154 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Message.cpp"; path = "../../../../modules/juce_events/messages/juce_Message.cpp"; sourceTree = "SOURCE_ROOT"; }; 1CCB7B18759F7CEBB065C31E = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AppleRemote.h"; path = "../../../../modules/juce_gui_extra/misc/juce_AppleRemote.h"; sourceTree = "SOURCE_ROOT"; }; 1D0DD674EEEF98B1E1B8D8D8 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FileListComponent.cpp"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FileListComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; 1D3DA514A7B46A2A32A32060 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MidiKeyboardComponent.cpp"; path = "../../../../modules/juce_audio_utils/gui/juce_MidiKeyboardComponent.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -1379,7 +1378,6 @@ C66E08F5118F529FC623733E, B6D34ED1DE5CC8010A1BE232, 96C8D0EE75ABEB02422AA41F, - 1C4C1D61413449E5556F4154, C4A730DEDDA33FA9A06CDA82, 52CAE85DCE0FA2692B8A85C7, 56CA808B4610A5C34730B4D2, @@ -1945,7 +1943,6 @@ 0AE68D12A51E59B084E046C1, 913372FE9DAAA74F5520A786 ); name = Source; sourceTree = ""; }; 2FE1E46B92ED7BD427F01D8C = { isa = XCBuildConfiguration; buildSettings = { - PREBINDING = NO; HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)"; GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_FILE = Info.plist; @@ -1953,7 +1950,6 @@ ONLY_ACTIVE_ARCH = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "_DEBUG=1", "DEBUG=1", @@ -1962,7 +1958,6 @@ "JUCER_XCODE_IPHONE_5BC26AE3=1"); }; name = Debug; }; 9E3B64077ABD2AA72A51EE7C = { isa = XCBuildConfiguration; buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; - PREBINDING = NO; HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)"; GCC_OPTIMIZATION_LEVEL = s; INFOPLIST_FILE = Info.plist; diff --git a/extras/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj b/extras/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj index 125fd254e8..fb518faec9 100644 --- a/extras/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj +++ b/extras/audio plugin demo/Builds/MacOSX/JuceDemoPlugin.xcodeproj/project.pbxproj @@ -338,7 +338,6 @@ 58E978708BAA8613A40F61E3 = { isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; }; 58FD5A3294F6D4F415B9CA60 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_FileListComponent.h"; path = "../../../../modules/juce_gui_basics/filebrowser/juce_FileListComponent.h"; sourceTree = "SOURCE_ROOT"; }; 59968E95CF78A0E8A03B1DA1 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Thread.cpp"; path = "../../../../modules/juce_core/threads/juce_Thread.cpp"; sourceTree = "SOURCE_ROOT"; }; - 59D9302900386CCFEFFC6A6C = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Message.cpp"; path = "../../../../modules/juce_events/messages/juce_Message.cpp"; sourceTree = "SOURCE_ROOT"; }; 5A15B77FF78B76ADDF1EB203 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Slider.h"; path = "../../../../modules/juce_gui_basics/widgets/juce_Slider.h"; sourceTree = "SOURCE_ROOT"; }; 5A7DAE7A1350D62B224EE51B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_NSViewComponentPeer.mm"; path = "../../../../modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm"; sourceTree = "SOURCE_ROOT"; }; 5A8AD212201DBF31CCA7ECBB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_XmlElement.h"; path = "../../../../modules/juce_core/xml/juce_XmlElement.h"; sourceTree = "SOURCE_ROOT"; }; @@ -1307,7 +1306,6 @@ E7EE2DFC483DD254C543EA60, E8FF8D2FF41B8F165A5BE5AF, E57F57DB7857820B9FC7BCFF, - 59D9302900386CCFEFFC6A6C, 4E98A99B73F9003D3C8F2B4B, D88796A40E58D524DE34989B, CBFB91131B82AA2F0BDD3EB7, @@ -1829,7 +1827,6 @@ 7EA0AEAFB626CDF5E0038ED5, 227AE5B2ACBB7881D9552404 ); name = Source; sourceTree = ""; }; 77D1D11FAA110A1B1F960A8F = { isa = XCBuildConfiguration; buildSettings = { - PREBINDING = NO; HEADER_SEARCH_PATHS = "~/SDKs/vstsdk2.4 ../../JuceLibraryCode $(DEVELOPER_DIR)/Extras/CoreAudio/PublicUtility $(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/Utility $(inherited)"; GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_FILE = Info.plist; @@ -1843,14 +1840,12 @@ ONLY_ACTIVE_ARCH = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "_DEBUG=1", "DEBUG=1", "JUCE_ObjCExtraSuffix=JuceDemo", "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; 76082281008CF5F891C856DA = { isa = XCBuildConfiguration; buildSettings = { - PREBINDING = NO; HEADER_SEARCH_PATHS = "~/SDKs/vstsdk2.4 ../../JuceLibraryCode $(DEVELOPER_DIR)/Extras/CoreAudio/PublicUtility $(DEVELOPER_DIR)/Extras/CoreAudio/AudioUnits/AUPublic/Utility $(inherited)"; GCC_OPTIMIZATION_LEVEL = s; INFOPLIST_FILE = Info.plist; diff --git a/extras/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj b/extras/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj index 86feac04b4..cbd3b43d7d 100644 --- a/extras/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj +++ b/extras/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj @@ -2011,16 +2011,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - true - true diff --git a/extras/static library/Builds/VisualStudio2010/juce.vcxproj.filters b/extras/static library/Builds/VisualStudio2010/juce.vcxproj.filters index 416d2a416b..89734cfd47 100644 --- a/extras/static library/Builds/VisualStudio2010/juce.vcxproj.filters +++ b/extras/static library/Builds/VisualStudio2010/juce.vcxproj.filters @@ -772,9 +772,6 @@ Juce Modules\juce_events\messages - - Juce Modules\juce_events\messages - Juce Modules\juce_events\messages diff --git a/extras/the jucer/Builds/MacOSX/Jucer.xcodeproj/project.pbxproj b/extras/the jucer/Builds/MacOSX/Jucer.xcodeproj/project.pbxproj index 36bcaab4e0..c048df53a6 100644 --- a/extras/the jucer/Builds/MacOSX/Jucer.xcodeproj/project.pbxproj +++ b/extras/the jucer/Builds/MacOSX/Jucer.xcodeproj/project.pbxproj @@ -322,7 +322,6 @@ 5A6407AC864832FB0645CF30 = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ChildProcess.cpp"; path = "../../../../modules/juce_core/threads/juce_ChildProcess.cpp"; sourceTree = "SOURCE_ROOT"; }; 5AD700319E9D8F4F3A6843AA = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = "juce_mac_AppleRemote.mm"; path = "../../../../modules/juce_gui_extra/native/juce_mac_AppleRemote.mm"; sourceTree = "SOURCE_ROOT"; }; 5AEF2EF969E6E65F9059FE10 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_Process.h"; path = "../../../../modules/juce_core/threads/juce_Process.h"; sourceTree = "SOURCE_ROOT"; }; - 5B50F8B2803D9703258A064E = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Message.cpp"; path = "../../../../modules/juce_events/messages/juce_Message.cpp"; sourceTree = "SOURCE_ROOT"; }; 5B779EFD38CCDD2B22D534EB = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_InterprocessConnectionServer.h"; path = "../../../../modules/juce_events/interprocess/juce_InterprocessConnectionServer.h"; sourceTree = "SOURCE_ROOT"; }; 5CEDA81592412BB2AEC2BD7B = { isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_FileSearchPath.cpp"; path = "../../../../modules/juce_core/files/juce_FileSearchPath.cpp"; sourceTree = "SOURCE_ROOT"; }; 5CFDB40C4E709755B51D1C16 = { isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AsyncUpdater.h"; path = "../../../../modules/juce_events/broadcasters/juce_AsyncUpdater.h"; sourceTree = "SOURCE_ROOT"; }; @@ -1128,7 +1127,6 @@ 2DF8116FA476D39EBC960A34, 3E37772DCDC386131BE078DE, FBE4CB87FF965A0B7B12F96B, - 5B50F8B2803D9703258A064E, 7653EA75D4324FD04CA530A6, FD4E80A1BDA0CAACC9AB1780, 27BC66BC4126E37CDA00A60C, @@ -1636,7 +1634,6 @@ 680BC5D164A7D17AAD7A2932, 593092CA73B75DE094D9E93D ); name = Source; sourceTree = ""; }; C4428643C14DD60BA895A378 = { isa = XCBuildConfiguration; buildSettings = { - PREBINDING = NO; HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)"; GCC_OPTIMIZATION_LEVEL = 0; INFOPLIST_FILE = Info.plist; @@ -1645,14 +1642,12 @@ ONLY_ACTIVE_ARCH = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_PREPROCESSOR_DEFINITIONS = ( "_DEBUG=1", "DEBUG=1", "JUCE_ObjCExtraSuffix=wQBvzo", "JUCER_XCODE_MAC_F6D2F4CF=1"); }; name = Debug; }; EB7F74BF01346F8C6BCC31A7 = { isa = XCBuildConfiguration; buildSettings = { - PREBINDING = NO; HEADER_SEARCH_PATHS = "../../JuceLibraryCode $(inherited)"; GCC_OPTIMIZATION_LEVEL = s; INFOPLIST_FILE = Info.plist; diff --git a/extras/the jucer/Builds/VisualStudio2008/Jucer.vcproj b/extras/the jucer/Builds/VisualStudio2008/Jucer.vcproj index ef2e8afb3f..d720039a6e 100644 --- a/extras/the jucer/Builds/VisualStudio2008/Jucer.vcproj +++ b/extras/the jucer/Builds/VisualStudio2008/Jucer.vcproj @@ -1235,16 +1235,6 @@ - - - - - - - - true - - true - true diff --git a/extras/the jucer/Builds/VisualStudio2010/Jucer.vcxproj.filters b/extras/the jucer/Builds/VisualStudio2010/Jucer.vcxproj.filters index d86e3d54d9..0a749ac101 100644 --- a/extras/the jucer/Builds/VisualStudio2010/Jucer.vcxproj.filters +++ b/extras/the jucer/Builds/VisualStudio2010/Jucer.vcxproj.filters @@ -589,9 +589,6 @@ Juce Modules\juce_events\messages - - Juce Modules\juce_events\messages - Juce Modules\juce_events\messages diff --git a/modules/juce_graphics/images/juce_Image.cpp b/modules/juce_graphics/images/juce_Image.cpp index 7266a76f9b..78a12398b2 100644 --- a/modules/juce_graphics/images/juce_Image.cpp +++ b/modules/juce_graphics/images/juce_Image.cpp @@ -56,7 +56,7 @@ public: LowLevelGraphicsContext* createLowLevelContext() { - return new LowLevelGraphicsSoftwareRenderer (Image (this)); + return new JUCE_DEFAULT_SOFTWARE_RENDERER_CLASS (Image (this)); } void initialiseBitmapData (Image::BitmapData& bitmap, int x, int y, Image::BitmapData::ReadWriteMode /*mode*/) diff --git a/modules/juce_graphics/juce_graphics.h b/modules/juce_graphics/juce_graphics.h index c694611321..ea3462104f 100644 --- a/modules/juce_graphics/juce_graphics.h +++ b/modules/juce_graphics/juce_graphics.h @@ -52,6 +52,14 @@ #define USE_COREGRAPHICS_RENDERING 1 #endif +// This macro will let you replace all uses of the LowLevelGraphicsSoftwareRenderer with +// a custom class if you want to. As well as setting this macro in your app settings header, +// you'll also need to actually provide the class definition in that header too, so that it's +// available for the internal library code. +#ifndef JUCE_DEFAULT_SOFTWARE_RENDERER_CLASS + #define JUCE_DEFAULT_SOFTWARE_RENDERER_CLASS LowLevelGraphicsSoftwareRenderer +#endif + //============================================================================= BEGIN_JUCE_NAMESPACE diff --git a/modules/juce_gui_basics/drawables/juce_SVGParser.cpp b/modules/juce_gui_basics/drawables/juce_SVGParser.cpp index 1594aa4058..9b05821a33 100644 --- a/modules/juce_gui_basics/drawables/juce_SVGParser.cpp +++ b/modules/juce_gui_basics/drawables/juce_SVGParser.cpp @@ -58,6 +58,9 @@ public: newState.width = getCoordLength (xml.getStringAttribute ("width", String (newState.width)), viewBoxW); newState.height = getCoordLength (xml.getStringAttribute ("height", String (newState.height)), viewBoxH); + if (newState.width <= 0) newState.width = 100; + if (newState.height <= 0) newState.height = 100; + if (xml.hasAttribute ("viewBox")) { const String viewBoxAtt (xml.getStringAttribute ("viewBox")); diff --git a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp index 075e8d1379..23c6b8bc8f 100644 --- a/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp +++ b/modules/juce_gui_basics/lookandfeel/juce_LookAndFeel.cpp @@ -802,7 +802,8 @@ void LookAndFeel::drawScrollbar (Graphics& g, const Colour thumbColour (scrollbar.findColour (ScrollBar::thumbColourId)); Colour trackColour1, trackColour2; - if (scrollbar.isColourSpecified (ScrollBar::trackColourId)) + if (scrollbar.isColourSpecified (ScrollBar::trackColourId) + || isColourSpecified (ScrollBar::trackColourId)) { trackColour1 = trackColour2 = scrollbar.findColour (ScrollBar::trackColourId); } diff --git a/modules/juce_gui_basics/native/juce_android_Windowing.cpp b/modules/juce_gui_basics/native/juce_android_Windowing.cpp index db82df0530..d1f7a74efa 100644 --- a/modules/juce_gui_basics/native/juce_android_Windowing.cpp +++ b/modules/juce_gui_basics/native/juce_android_Windowing.cpp @@ -394,7 +394,7 @@ public: dest, ! component->isOpaque())); { - LowLevelGraphicsSoftwareRenderer g (temp); + JUCE_DEFAULT_SOFTWARE_RENDERER_CLASS g (temp); g.setOrigin (-clip.getX(), -clip.getY()); handlePaint (g); } @@ -524,7 +524,7 @@ private: } Image::ImageType getType() const { return Image::SoftwareImage; } - LowLevelGraphicsContext* createLowLevelContext() { return new LowLevelGraphicsSoftwareRenderer (Image (this)); } + LowLevelGraphicsContext* createLowLevelContext() { return new JUCE_DEFAULT_SOFTWARE_RENDERER_CLASS (Image (this)); } void initialiseBitmapData (Image::BitmapData& bm, int x, int y, Image::BitmapData::ReadWriteMode mode) { diff --git a/modules/juce_gui_basics/native/juce_linux_Windowing.cpp b/modules/juce_gui_basics/native/juce_linux_Windowing.cpp index 6049aa567c..88e0be7bd9 100644 --- a/modules/juce_gui_basics/native/juce_linux_Windowing.cpp +++ b/modules/juce_gui_basics/native/juce_linux_Windowing.cpp @@ -571,7 +571,7 @@ public: LowLevelGraphicsContext* createLowLevelContext() { - return new LowLevelGraphicsSoftwareRenderer (Image (this)); + return new JUCE_DEFAULT_SOFTWARE_RENDERER_CLASS (Image (this)); } void initialiseBitmapData (Image::BitmapData& bitmap, int x, int y, Image::BitmapData::ReadWriteMode /*mode*/) @@ -1749,7 +1749,7 @@ private: RectangleList adjustedList (originalRepaintRegion); adjustedList.offsetAll (-totalArea.getX(), -totalArea.getY()); - LowLevelGraphicsSoftwareRenderer context (image, -totalArea.getX(), -totalArea.getY(), adjustedList); + JUCE_DEFAULT_SOFTWARE_RENDERER_CLASS context (image, -totalArea.getX(), -totalArea.getY(), adjustedList); if (peer->depth == 32) { diff --git a/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm b/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm index c139a61205..3c3a6f62d6 100644 --- a/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm +++ b/modules/juce_gui_basics/native/juce_mac_NSViewComponentPeer.mm @@ -1641,7 +1641,7 @@ void NSViewComponentPeer::drawRect (NSRect r) if (! clip.isEmpty()) { - LowLevelGraphicsSoftwareRenderer context (temp, xOffset, yOffset, clip); + JUCE_DEFAULT_SOFTWARE_RENDERER_CLASS context (temp, xOffset, yOffset, clip); insideDrawRect = true; handlePaint (context); diff --git a/modules/juce_gui_basics/native/juce_win32_Windowing.cpp b/modules/juce_gui_basics/native/juce_win32_Windowing.cpp index b9e8962626..6c75ceeab4 100644 --- a/modules/juce_gui_basics/native/juce_win32_Windowing.cpp +++ b/modules/juce_gui_basics/native/juce_win32_Windowing.cpp @@ -202,7 +202,7 @@ public: LowLevelGraphicsContext* createLowLevelContext() { - return new LowLevelGraphicsSoftwareRenderer (Image (this)); + return new JUCE_DEFAULT_SOFTWARE_RENDERER_CLASS (Image (this)); } void initialiseBitmapData (Image::BitmapData& bitmap, int x, int y, Image::BitmapData::ReadWriteMode /*mode*/) @@ -1302,7 +1302,7 @@ private: updateCurrentModifiers(); - LowLevelGraphicsSoftwareRenderer context (offscreenImage, -x, -y, contextClip); + JUCE_DEFAULT_SOFTWARE_RENDERER_CLASS context (offscreenImage, -x, -y, contextClip); handlePaint (context); if (! dontRepaint)