From dd678f7e8213792831cfb1c64d9fd2fd8c05c664 Mon Sep 17 00:00:00 2001 From: jules Date: Sun, 19 Oct 2014 10:51:18 +0100 Subject: [PATCH] Added some VC14 feature support, and moved C++11 detection into its own header file. --- .../MacOSX/JuceDemo.xcodeproj/project.pbxproj | 2 + .../Builds/VisualStudio2010/JuceDemo.vcxproj | 1 + .../VisualStudio2010/JuceDemo.vcxproj.filters | 3 + .../Builds/VisualStudio2012/JuceDemo.vcxproj | 1 + .../VisualStudio2012/JuceDemo.vcxproj.filters | 3 + .../Builds/VisualStudio2013/JuceDemo.vcxproj | 1 + .../VisualStudio2013/JuceDemo.vcxproj.filters | 3 + .../iOS/JuceDemo.xcodeproj/project.pbxproj | 2 + .../Builds/CodeBlocks/The Introjucer.cbp | 4 + .../The Introjucer.xcodeproj/project.pbxproj | 6 +- .../VisualStudio2005/The Introjucer.vcproj | 1 + .../VisualStudio2008/The Introjucer.vcproj | 1 + .../VisualStudio2010/The Introjucer.vcxproj | 1 + .../The Introjucer.vcxproj.filters | 3 + .../VisualStudio2012/The Introjucer.vcxproj | 1 + .../The Introjucer.vcxproj.filters | 3 + .../VisualStudio2013/The Introjucer.vcxproj | 1 + .../The Introjucer.vcxproj.filters | 3 + .../JuceDemoPlugin.xcodeproj/project.pbxproj | 2 + .../VisualStudio2005/JuceDemoPlugin.vcproj | 1 + .../VisualStudio2008/JuceDemoPlugin.vcproj | 1 + .../VisualStudio2010/JuceDemoPlugin.vcxproj | 1 + .../JuceDemoPlugin.vcxproj.filters | 3 + .../Plugin Host.xcodeproj/project.pbxproj | 2 + .../VisualStudio2010/Plugin Host.vcxproj | 1 + .../Plugin Host.vcxproj.filters | 3 + .../BinaryBuilder.xcodeproj/project.pbxproj | 2 + .../VisualStudio2008/BinaryBuilder.vcproj | 1 + .../HelloWorld.xcodeproj/project.pbxproj | 2 + .../Builds/VisualStudio2005/HelloWorld.vcproj | 1 + .../Builds/VisualStudio2008/HelloWorld.vcproj | 1 + .../iOS/HelloWorld.xcodeproj/project.pbxproj | 2 + .../Builds/VisualStudio2008/juce_dll.vcproj | 1 + modules/juce_core/juce_core.h | 1 + .../juce_core/system/juce_CompilerSupport.h | 147 ++++++++++++++++++ modules/juce_core/system/juce_PlatformDefs.h | 92 ----------- .../juce_core/system/juce_StandardHeader.h | 1 + 37 files changed, 211 insertions(+), 94 deletions(-) create mode 100644 modules/juce_core/system/juce_CompilerSupport.h diff --git a/extras/Demo/Builds/MacOSX/JuceDemo.xcodeproj/project.pbxproj b/extras/Demo/Builds/MacOSX/JuceDemo.xcodeproj/project.pbxproj index 6b7a4bdf4e..309f42e995 100644 --- a/extras/Demo/Builds/MacOSX/JuceDemo.xcodeproj/project.pbxproj +++ b/extras/Demo/Builds/MacOSX/JuceDemo.xcodeproj/project.pbxproj @@ -575,6 +575,7 @@ 7F2A233FFE5CDB2681F0DC28 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MidiBuffer.cpp"; path = "../../../../modules/juce_audio_basics/midi/juce_MidiBuffer.cpp"; sourceTree = "SOURCE_ROOT"; }; 7F7EAF366320BA71741B68C3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioFormatReader.h"; path = "../../../../modules/juce_audio_formats/format/juce_AudioFormatReader.h"; sourceTree = "SOURCE_ROOT"; }; 7FC3D3D142D1B4398D07FFC7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ComponentListener.cpp"; path = "../../../../modules/juce_gui_basics/components/juce_ComponentListener.cpp"; sourceTree = "SOURCE_ROOT"; }; + 80202384D81020DAE2072A1A = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CompilerSupport.h"; path = "../../../../modules/juce_core/system/juce_CompilerSupport.h"; sourceTree = "SOURCE_ROOT"; }; 806A7A3BFC684B4D9E25ABDF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_audio_devices.h"; path = "../../../../modules/juce_audio_devices/juce_audio_devices.h"; sourceTree = "SOURCE_ROOT"; }; 807F5EE489018BC1956AAD5C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Sampler.cpp"; path = "../../../../modules/juce_audio_formats/sampler/juce_Sampler.cpp"; sourceTree = "SOURCE_ROOT"; }; 80A57920E6EA9C2E881BC3E5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MACAddress.cpp"; path = "../../../../modules/juce_core/network/juce_MACAddress.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -1457,6 +1458,7 @@ DD4A812225F47E590FCF2E29, 6141692AC9282411091C8157, ); name = logging; sourceTree = ""; }; C8E2FB2013388FB97CB0E404 = {isa = PBXGroup; children = ( + 80202384D81020DAE2072A1A, 218E36147FA4309F072C1949, 33F3182598E9A84AD25A9184, 8BDC3161654344162ECDCB32, diff --git a/extras/Demo/Builds/VisualStudio2010/JuceDemo.vcxproj b/extras/Demo/Builds/VisualStudio2010/JuceDemo.vcxproj index 5403e93383..c9ae3c2f2c 100644 --- a/extras/Demo/Builds/VisualStudio2010/JuceDemo.vcxproj +++ b/extras/Demo/Builds/VisualStudio2010/JuceDemo.vcxproj @@ -1464,6 +1464,7 @@ + diff --git a/extras/Demo/Builds/VisualStudio2010/JuceDemo.vcxproj.filters b/extras/Demo/Builds/VisualStudio2010/JuceDemo.vcxproj.filters index c13a9a8448..fcda89a595 100644 --- a/extras/Demo/Builds/VisualStudio2010/JuceDemo.vcxproj.filters +++ b/extras/Demo/Builds/VisualStudio2010/JuceDemo.vcxproj.filters @@ -2211,6 +2211,9 @@ Juce Modules\juce_core\logging + + Juce Modules\juce_core\system + Juce Modules\juce_core\system diff --git a/extras/Demo/Builds/VisualStudio2012/JuceDemo.vcxproj b/extras/Demo/Builds/VisualStudio2012/JuceDemo.vcxproj index b7767e67f0..accec42def 100644 --- a/extras/Demo/Builds/VisualStudio2012/JuceDemo.vcxproj +++ b/extras/Demo/Builds/VisualStudio2012/JuceDemo.vcxproj @@ -1470,6 +1470,7 @@ + diff --git a/extras/Demo/Builds/VisualStudio2012/JuceDemo.vcxproj.filters b/extras/Demo/Builds/VisualStudio2012/JuceDemo.vcxproj.filters index c13a9a8448..fcda89a595 100644 --- a/extras/Demo/Builds/VisualStudio2012/JuceDemo.vcxproj.filters +++ b/extras/Demo/Builds/VisualStudio2012/JuceDemo.vcxproj.filters @@ -2211,6 +2211,9 @@ Juce Modules\juce_core\logging + + Juce Modules\juce_core\system + Juce Modules\juce_core\system diff --git a/extras/Demo/Builds/VisualStudio2013/JuceDemo.vcxproj b/extras/Demo/Builds/VisualStudio2013/JuceDemo.vcxproj index ee4a4114ae..060a96b3e2 100644 --- a/extras/Demo/Builds/VisualStudio2013/JuceDemo.vcxproj +++ b/extras/Demo/Builds/VisualStudio2013/JuceDemo.vcxproj @@ -1470,6 +1470,7 @@ + diff --git a/extras/Demo/Builds/VisualStudio2013/JuceDemo.vcxproj.filters b/extras/Demo/Builds/VisualStudio2013/JuceDemo.vcxproj.filters index d0a2e2684a..f55502b515 100644 --- a/extras/Demo/Builds/VisualStudio2013/JuceDemo.vcxproj.filters +++ b/extras/Demo/Builds/VisualStudio2013/JuceDemo.vcxproj.filters @@ -2211,6 +2211,9 @@ Juce Modules\juce_core\logging + + Juce Modules\juce_core\system + Juce Modules\juce_core\system diff --git a/extras/Demo/Builds/iOS/JuceDemo.xcodeproj/project.pbxproj b/extras/Demo/Builds/iOS/JuceDemo.xcodeproj/project.pbxproj index c7ba68976d..647ff5739b 100644 --- a/extras/Demo/Builds/iOS/JuceDemo.xcodeproj/project.pbxproj +++ b/extras/Demo/Builds/iOS/JuceDemo.xcodeproj/project.pbxproj @@ -568,6 +568,7 @@ 7F2A233FFE5CDB2681F0DC28 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MidiBuffer.cpp"; path = "../../../../modules/juce_audio_basics/midi/juce_MidiBuffer.cpp"; sourceTree = "SOURCE_ROOT"; }; 7F7EAF366320BA71741B68C3 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_AudioFormatReader.h"; path = "../../../../modules/juce_audio_formats/format/juce_AudioFormatReader.h"; sourceTree = "SOURCE_ROOT"; }; 7FC3D3D142D1B4398D07FFC7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_ComponentListener.cpp"; path = "../../../../modules/juce_gui_basics/components/juce_ComponentListener.cpp"; sourceTree = "SOURCE_ROOT"; }; + 80202384D81020DAE2072A1A = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_CompilerSupport.h"; path = "../../../../modules/juce_core/system/juce_CompilerSupport.h"; sourceTree = "SOURCE_ROOT"; }; 806A7A3BFC684B4D9E25ABDF = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "juce_audio_devices.h"; path = "../../../../modules/juce_audio_devices/juce_audio_devices.h"; sourceTree = "SOURCE_ROOT"; }; 807F5EE489018BC1956AAD5C = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_Sampler.cpp"; path = "../../../../modules/juce_audio_formats/sampler/juce_Sampler.cpp"; sourceTree = "SOURCE_ROOT"; }; 80A57920E6EA9C2E881BC3E5 = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "juce_MACAddress.cpp"; path = "../../../../modules/juce_core/network/juce_MACAddress.cpp"; sourceTree = "SOURCE_ROOT"; }; @@ -1449,6 +1450,7 @@ DD4A812225F47E590FCF2E29, 6141692AC9282411091C8157, ); name = logging; sourceTree = ""; }; C8E2FB2013388FB97CB0E404 = {isa = PBXGroup; children = ( + 80202384D81020DAE2072A1A, 218E36147FA4309F072C1949, 33F3182598E9A84AD25A9184, 8BDC3161654344162ECDCB32, diff --git a/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp b/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp index 35b0bc668a..f61cd6c21b 100644 --- a/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp +++ b/extras/Introjucer/Builds/CodeBlocks/The Introjucer.cbp @@ -1217,6 +1217,10 @@