From 24bce65869f0a02e5ff9da91b1fb85f411318fcb Mon Sep 17 00:00:00 2001 From: jules Date: Mon, 16 Feb 2015 10:21:12 +0000 Subject: [PATCH] Introjucer: modified the MSVC exporter to leave it up to MSVC to choose the default binary folder name unless you specifically set a value for it. --- .../Builds/VisualStudio2010/AnimationAppExample.vcxproj | 2 -- .../Builds/VisualStudio2010/AudioAppExample.vcxproj | 2 -- .../VisualStudio2013/BouncingBallWavetableDemo.vcxproj | 2 -- examples/Demo/Builds/VisualStudio2010/JuceDemo.vcxproj | 2 -- examples/Demo/Builds/VisualStudio2012/JuceDemo.vcxproj | 2 -- examples/Demo/Builds/VisualStudio2013/JuceDemo.vcxproj | 2 -- .../HelloWorld/Builds/VisualStudio2005/HelloWorld.vcproj | 2 -- .../HelloWorld/Builds/VisualStudio2008/HelloWorld.vcproj | 2 -- .../Builds/VisualStudio2010/OpenGLAppExample.vcxproj | 2 -- .../Builds/VisualStudio2013/PluckedStringsDemo.vcxproj | 2 -- .../Builds/VisualStudio2013/SimpleFFTExample.vcxproj | 2 -- .../Builds/VisualStudio2005/JuceDemoPlugin.vcproj | 2 -- .../Builds/VisualStudio2008/JuceDemoPlugin.vcproj | 2 -- .../Builds/VisualStudio2010/JuceDemoPlugin.vcxproj | 2 -- .../Builds/VisualStudio2010/Plugin Host.vcxproj | 2 -- .../Builds/VisualStudio2005/The Introjucer.vcproj | 2 -- .../Builds/VisualStudio2008/The Introjucer.vcproj | 2 -- .../Builds/VisualStudio2010/The Introjucer.vcxproj | 2 -- .../Builds/VisualStudio2012/The Introjucer.vcxproj | 2 -- .../Builds/VisualStudio2013/The Introjucer.vcxproj | 2 -- .../Source/Project Saving/jucer_ProjectExport_MSVC.h | 7 +++++-- .../Builds/VisualStudio2008/BinaryBuilder.vcproj | 2 -- extras/windows dll/Builds/VisualStudio2008/juce_dll.vcproj | 2 -- 23 files changed, 5 insertions(+), 46 deletions(-) diff --git a/examples/AnimationAppExample/Builds/VisualStudio2010/AnimationAppExample.vcxproj b/examples/AnimationAppExample/Builds/VisualStudio2010/AnimationAppExample.vcxproj index 4eed46b80a..da40ef126b 100644 --- a/examples/AnimationAppExample/Builds/VisualStudio2010/AnimationAppExample.vcxproj +++ b/examples/AnimationAppExample/Builds/VisualStudio2010/AnimationAppExample.vcxproj @@ -33,10 +33,8 @@ <_ProjectFileVersion>10.0.30319.1 - .\Debug\ AnimationAppExample true - .\Release\ AnimationAppExample true diff --git a/examples/AudioAppExample/Builds/VisualStudio2010/AudioAppExample.vcxproj b/examples/AudioAppExample/Builds/VisualStudio2010/AudioAppExample.vcxproj index 1f52888d8a..11818b1a87 100644 --- a/examples/AudioAppExample/Builds/VisualStudio2010/AudioAppExample.vcxproj +++ b/examples/AudioAppExample/Builds/VisualStudio2010/AudioAppExample.vcxproj @@ -33,10 +33,8 @@ <_ProjectFileVersion>10.0.30319.1 - .\Debug\ AudioAppExample true - .\Release\ AudioAppExample true diff --git a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo.vcxproj b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo.vcxproj index 1754e9a227..0c0e96c581 100644 --- a/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo.vcxproj +++ b/examples/BouncingBallWavetableDemo/Builds/VisualStudio2013/BouncingBallWavetableDemo.vcxproj @@ -38,10 +38,8 @@ <_ProjectFileVersion>10.0.30319.1 - .\Debug\ WavetableBouncingEditor true - .\Release\ WavetableBouncingEditor true v120 diff --git a/examples/Demo/Builds/VisualStudio2010/JuceDemo.vcxproj b/examples/Demo/Builds/VisualStudio2010/JuceDemo.vcxproj index 32ca2b7cf0..e6fc9ccf4f 100644 --- a/examples/Demo/Builds/VisualStudio2010/JuceDemo.vcxproj +++ b/examples/Demo/Builds/VisualStudio2010/JuceDemo.vcxproj @@ -33,10 +33,8 @@ <_ProjectFileVersion>10.0.30319.1 - .\Debug\ JuceDemo true - .\Release\ JuceDemo true diff --git a/examples/Demo/Builds/VisualStudio2012/JuceDemo.vcxproj b/examples/Demo/Builds/VisualStudio2012/JuceDemo.vcxproj index e05b3caf1e..7da5c5098b 100644 --- a/examples/Demo/Builds/VisualStudio2012/JuceDemo.vcxproj +++ b/examples/Demo/Builds/VisualStudio2012/JuceDemo.vcxproj @@ -38,10 +38,8 @@ <_ProjectFileVersion>10.0.30319.1 - .\Debug\ JuceDemo true - .\Release\ JuceDemo true v110 diff --git a/examples/Demo/Builds/VisualStudio2013/JuceDemo.vcxproj b/examples/Demo/Builds/VisualStudio2013/JuceDemo.vcxproj index 25990d8847..a5d7eeb29a 100644 --- a/examples/Demo/Builds/VisualStudio2013/JuceDemo.vcxproj +++ b/examples/Demo/Builds/VisualStudio2013/JuceDemo.vcxproj @@ -38,10 +38,8 @@ <_ProjectFileVersion>10.0.30319.1 - .\Debug\ JuceDemo true - .\Release\ JuceDemo true v120 diff --git a/examples/HelloWorld/Builds/VisualStudio2005/HelloWorld.vcproj b/examples/HelloWorld/Builds/VisualStudio2005/HelloWorld.vcproj index deb926c479..3ba2b61c8b 100644 --- a/examples/HelloWorld/Builds/VisualStudio2005/HelloWorld.vcproj +++ b/examples/HelloWorld/Builds/VisualStudio2005/HelloWorld.vcproj @@ -11,7 +11,6 @@ <_ProjectFileVersion>10.0.30319.1 - .\Debug\ OpenGLAppExample true - .\Release\ OpenGLAppExample true diff --git a/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo.vcxproj b/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo.vcxproj index 0759c414c0..7f56eaa471 100644 --- a/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo.vcxproj +++ b/examples/PluckedStringsDemo/Builds/VisualStudio2013/PluckedStringsDemo.vcxproj @@ -38,10 +38,8 @@ <_ProjectFileVersion>10.0.30319.1 - .\Debug\ PluckedStringsDemo true - .\Release\ PluckedStringsDemo true v120 diff --git a/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample.vcxproj b/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample.vcxproj index 9ee7fbb45d..038f6151ae 100644 --- a/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample.vcxproj +++ b/examples/SimpleFFTExample/Builds/VisualStudio2013/SimpleFFTExample.vcxproj @@ -38,10 +38,8 @@ <_ProjectFileVersion>10.0.30319.1 - .\Debug\ SimpleFFTExample true - .\Release\ SimpleFFTExample true v120 diff --git a/examples/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj b/examples/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj index ba19a915f0..d9516f2a4e 100644 --- a/examples/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj +++ b/examples/audio plugin demo/Builds/VisualStudio2005/JuceDemoPlugin.vcproj @@ -11,7 +11,6 @@ <_ProjectFileVersion>10.0.30319.1 - .\Debug\ JuceDemoPlugin true - .\Release\ JuceDemoPlugin true diff --git a/examples/audio plugin host/Builds/VisualStudio2010/Plugin Host.vcxproj b/examples/audio plugin host/Builds/VisualStudio2010/Plugin Host.vcxproj index 7e7b8e0ff9..418462a1a4 100644 --- a/examples/audio plugin host/Builds/VisualStudio2010/Plugin Host.vcxproj +++ b/examples/audio plugin host/Builds/VisualStudio2010/Plugin Host.vcxproj @@ -33,10 +33,8 @@ <_ProjectFileVersion>10.0.30319.1 - .\Debug\ Plugin Host true - .\Release\ Plugin Host true diff --git a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj index 4f43178e14..4975fec09f 100644 --- a/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj +++ b/extras/Introjucer/Builds/VisualStudio2005/The Introjucer.vcproj @@ -11,7 +11,6 @@ <_ProjectFileVersion>10.0.30319.1 - .\Debug\ Introjucer true - .\Release\ Introjucer true diff --git a/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj b/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj index 6aac4382d4..0a13de7bfb 100644 --- a/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj +++ b/extras/Introjucer/Builds/VisualStudio2012/The Introjucer.vcxproj @@ -38,10 +38,8 @@ <_ProjectFileVersion>10.0.30319.1 - .\Debug\ The Introjucer true - .\Release\ The Introjucer true v110 diff --git a/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj b/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj index cc1c42e20f..f9bb01b9b4 100644 --- a/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj +++ b/extras/Introjucer/Builds/VisualStudio2013/The Introjucer.vcxproj @@ -38,10 +38,8 @@ <_ProjectFileVersion>10.0.30319.1 - .\Debug\ The Introjucer true - .\Release\ The Introjucer true v120 diff --git a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_MSVC.h b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_MSVC.h index 615efccb21..901ae81a39 100644 --- a/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_MSVC.h +++ b/extras/Introjucer/Source/Project Saving/jucer_ProjectExport_MSVC.h @@ -221,7 +221,7 @@ protected: { const String binaryPath (config.getTargetBinaryRelativePathString().trim()); if (binaryPath.isEmpty()) - return prependDot (File::createLegalFileName (config.getName().trim())); + return binaryPath; RelativePath binaryRelPath (binaryPath, RelativePath::projectFolder); @@ -708,7 +708,9 @@ protected: const bool isDebug = config.isDebug(); xml.setAttribute ("Name", createConfigName (config)); - xml.setAttribute ("OutputDirectory", FileHelpers::windowsStylePath (getConfigTargetPath (config))); + + if (getConfigTargetPath (config).isNotEmpty()) + xml.setAttribute ("OutputDirectory", FileHelpers::windowsStylePath (getConfigTargetPath (config))); if (config.getIntermediatesPath().isNotEmpty()) xml.setAttribute ("IntermediateDirectory", FileHelpers::windowsStylePath (config.getIntermediatesPath())); @@ -1149,6 +1151,7 @@ protected: { const VC2010BuildConfiguration& config = dynamic_cast (*i); + if (getConfigTargetPath (config).isNotEmpty()) { XmlElement* outdir = props->createNewChildElement ("OutDir"); setConditionAttribute (*outdir, config); diff --git a/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj b/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj index 73571eca66..cade39374f 100644 --- a/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj +++ b/extras/binarybuilder/Builds/VisualStudio2008/BinaryBuilder.vcproj @@ -11,7 +11,6 @@