From f1bbead360f51dc0a7a00e145661c16e64141a6c Mon Sep 17 00:00:00 2001
From: tpoole <t.b.poole@gmail.com>
Date: Tue, 14 Feb 2017 10:48:33 +0000
Subject: [PATCH] Set the default Visual Studio exporter settings to separate
 build products by architecture

---
 .../Builds/VisualStudio2013/Projucer (App).vcxproj        | 8 ++++----
 .../Builds/VisualStudio2015/Projucer (App).vcxproj        | 8 ++++----
 .../Source/Project Saving/jucer_ProjectExport_MSVC.h      | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/extras/Projucer/Builds/VisualStudio2013/Projucer (App).vcxproj b/extras/Projucer/Builds/VisualStudio2013/Projucer (App).vcxproj
index 2b6c7b8ed3..2bc4a7611c 100644
--- a/extras/Projucer/Builds/VisualStudio2013/Projucer (App).vcxproj	
+++ b/extras/Projucer/Builds/VisualStudio2013/Projucer (App).vcxproj	
@@ -46,12 +46,12 @@
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <TargetExt>.exe</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)\App\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\App\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\App\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\App\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Projucer</TargetName>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)\App\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\App\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\App\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\App\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Projucer</TargetName>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
     <PlatformToolset>v120</PlatformToolset>
diff --git a/extras/Projucer/Builds/VisualStudio2015/Projucer (App).vcxproj b/extras/Projucer/Builds/VisualStudio2015/Projucer (App).vcxproj
index 959d535506..cf46a43b69 100644
--- a/extras/Projucer/Builds/VisualStudio2015/Projucer (App).vcxproj	
+++ b/extras/Projucer/Builds/VisualStudio2015/Projucer (App).vcxproj	
@@ -46,12 +46,12 @@
   <PropertyGroup>
     <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
     <TargetExt>.exe</TargetExt>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)$(Configuration)\App\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Configuration)\App\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\App\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(Platform)\$(Configuration)\App\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Projucer</TargetName>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)$(Configuration)\App\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Configuration)\App\</IntDir>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)\$(Platform)\$(Configuration)\App\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(Platform)\$(Configuration)\App\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Projucer</TargetName>
     <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest>
     <PlatformToolset>v140</PlatformToolset>
diff --git a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_MSVC.h b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_MSVC.h
index e8485354ee..a81ecfa1ae 100644
--- a/extras/Projucer/Source/Project Saving/jucer_ProjectExport_MSVC.h	
+++ b/extras/Projucer/Source/Project Saving/jucer_ProjectExport_MSVC.h	
@@ -204,7 +204,7 @@ public:
         {
             const String binaryPath (config.getTargetBinaryRelativePathString().trim());
             if (binaryPath.isEmpty())
-                return "$(SolutionDir)$(Configuration)";
+                return "$(SolutionDir)\\$(Platform)\\$(Configuration)";
 
             RelativePath binaryRelPath (binaryPath, RelativePath::projectFolder);
 
@@ -223,7 +223,7 @@ public:
 
         String getIntermediatesPath (const MSVCBuildConfiguration& config) const
         {
-            String intDir = (config.getIntermediatesPath().isNotEmpty() ? config.getIntermediatesPath() : "$(Configuration)");
+            String intDir = (config.getIntermediatesPath().isNotEmpty() ? config.getIntermediatesPath() : "$(Platform)\\$(Configuration)");
             if (! intDir.endsWithChar (L'\\'))
                 intDir += L'\\';
 
@@ -1178,10 +1178,10 @@ public:
 
                     {
                         XmlElement* intdir = props->createNewChildElement("IntDir");
-                        setConditionAttribute(*intdir, config);
+                        setConditionAttribute (*intdir, config);
 
                         String intermediatesPath = getIntermediatesPath (config);
-                        if (!intermediatesPath.endsWith("\\"))
+                        if (! intermediatesPath.endsWith ("\\"))
                             intermediatesPath << "\\";
 
                         intdir->addTextElement (FileHelpers::windowsStylePath (intermediatesPath));