From 8aa79285676215ace2d1235f2f4c15969c43e3fc Mon Sep 17 00:00:00 2001
From: SoftCoder <mark_vejvoda@hotmail.com>
Date: Wed, 28 Oct 2015 22:34:30 -0700
Subject: [PATCH] - correct msvc intermediate folders for some projects to
 avoid compile collisions

---
 mk/windoze/vc2015/g2xml.vcxproj           | 3 ++-
 mk/windoze/vc2015/megaglest_tests.vcxproj | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/mk/windoze/vc2015/g2xml.vcxproj b/mk/windoze/vc2015/g2xml.vcxproj
index b804e48a..316c5ba5 100644
--- a/mk/windoze/vc2015/g2xml.vcxproj
+++ b/mk/windoze/vc2015/g2xml.vcxproj
@@ -39,6 +39,7 @@
     <RootNamespace>g2xml</RootNamespace>
     <Keyword>Win32Proj</Keyword>
     <ProjectName>g2xml</ProjectName>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
@@ -124,7 +125,7 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">.\..\..\data\glest_game\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">.\..\..\data\glest_game\</OutDir>
     <OutDir Condition="'$(Configuration)|$(Platform)'=='Release_NO_STREFLOP|Win32'">.\..\..\data\glest_game\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)/$(ProjectName)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">$(Configuration)\</IntDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='Release_NO_STREFLOP|Win32'">$(Configuration)\</IntDir>
     <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
diff --git a/mk/windoze/vc2015/megaglest_tests.vcxproj b/mk/windoze/vc2015/megaglest_tests.vcxproj
index 440fc476..881ec912 100644
--- a/mk/windoze/vc2015/megaglest_tests.vcxproj
+++ b/mk/windoze/vc2015/megaglest_tests.vcxproj
@@ -39,6 +39,7 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>megaglest_tests</RootNamespace>
     <ProjectName>megaglest_tests</ProjectName>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
@@ -134,6 +135,7 @@
     <LinkIncremental>false</LinkIncremental>
     <OutDir>.\..\..\..\data\glest_game\</OutDir>
     <TargetName>megaglest_tests</TargetName>
+    <IntDir>$(Configuration)/$(ProjectName)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release_WITHOUT_STREFLOP|Win32'">
     <LinkIncremental>false</LinkIncremental>