| @@ -46,12 +46,12 @@ | |||||
| <PropertyGroup> | <PropertyGroup> | ||||
| <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> | <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> | ||||
| <TargetExt>.exe</TargetExt> | <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> | <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Projucer</TargetName> | ||||
| <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest> | <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> | <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Projucer</TargetName> | ||||
| <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest> | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest> | ||||
| <PlatformToolset>v120</PlatformToolset> | <PlatformToolset>v120</PlatformToolset> | ||||
| @@ -46,12 +46,12 @@ | |||||
| <PropertyGroup> | <PropertyGroup> | ||||
| <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> | <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion> | ||||
| <TargetExt>.exe</TargetExt> | <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> | <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Projucer</TargetName> | ||||
| <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</GenerateManifest> | <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> | <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Projucer</TargetName> | ||||
| <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest> | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</GenerateManifest> | ||||
| <PlatformToolset>v140</PlatformToolset> | <PlatformToolset>v140</PlatformToolset> | ||||
| @@ -204,7 +204,7 @@ public: | |||||
| { | { | ||||
| const String binaryPath (config.getTargetBinaryRelativePathString().trim()); | const String binaryPath (config.getTargetBinaryRelativePathString().trim()); | ||||
| if (binaryPath.isEmpty()) | if (binaryPath.isEmpty()) | ||||
| return "$(SolutionDir)$(Configuration)"; | |||||
| return "$(SolutionDir)\\$(Platform)\\$(Configuration)"; | |||||
| RelativePath binaryRelPath (binaryPath, RelativePath::projectFolder); | RelativePath binaryRelPath (binaryPath, RelativePath::projectFolder); | ||||
| @@ -223,7 +223,7 @@ public: | |||||
| String getIntermediatesPath (const MSVCBuildConfiguration& config) const | 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'\\')) | if (! intDir.endsWithChar (L'\\')) | ||||
| intDir += L'\\'; | intDir += L'\\'; | ||||
| @@ -1178,10 +1178,10 @@ public: | |||||
| { | { | ||||
| XmlElement* intdir = props->createNewChildElement("IntDir"); | XmlElement* intdir = props->createNewChildElement("IntDir"); | ||||
| setConditionAttribute(*intdir, config); | |||||
| setConditionAttribute (*intdir, config); | |||||
| String intermediatesPath = getIntermediatesPath (config); | String intermediatesPath = getIntermediatesPath (config); | ||||
| if (!intermediatesPath.endsWith("\\")) | |||||
| if (! intermediatesPath.endsWith ("\\")) | |||||
| intermediatesPath << "\\"; | intermediatesPath << "\\"; | ||||
| intdir->addTextElement (FileHelpers::windowsStylePath (intermediatesPath)); | intdir->addTextElement (FileHelpers::windowsStylePath (intermediatesPath)); | ||||