From 02c3c3967be5d93f12ce8243e35ddd790dae918b Mon Sep 17 00:00:00 2001
From: Person <Person@QCP2>
Date: Sat, 29 Sep 2018 23:12:22 -0700
Subject: [PATCH] --Code changes  -Update visual studio project files. 
 -Cleanup makedeps.bat.

---
 Builds/MSVC/VS2017/Ember.vcxproj        | 2 +-
 Builds/MSVC/VS2017/EmberAnimate.vcxproj | 2 +-
 Builds/MSVC/VS2017/EmberCL.vcxproj      | 4 ++--
 Builds/MSVC/VS2017/EmberGenome.vcxproj  | 2 +-
 Builds/MSVC/VS2017/EmberRender.vcxproj  | 2 +-
 Builds/MSVC/VS2017/EmberTester.vcxproj  | 2 +-
 Builds/MSVC/VS2017/Fractorium.vcxproj   | 2 +-
 makedeps.bat                            | 4 ++--
 8 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Builds/MSVC/VS2017/Ember.vcxproj b/Builds/MSVC/VS2017/Ember.vcxproj
index ef72749..e8162e1 100644
--- a/Builds/MSVC/VS2017/Ember.vcxproj
+++ b/Builds/MSVC/VS2017/Ember.vcxproj
@@ -15,7 +15,7 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>EmberNs</RootNamespace>
     <ProjectName>Ember</ProjectName>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
diff --git a/Builds/MSVC/VS2017/EmberAnimate.vcxproj b/Builds/MSVC/VS2017/EmberAnimate.vcxproj
index ed35c8a..4583e5e 100644
--- a/Builds/MSVC/VS2017/EmberAnimate.vcxproj
+++ b/Builds/MSVC/VS2017/EmberAnimate.vcxproj
@@ -15,7 +15,7 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>EmberAnimate</RootNamespace>
     <ProjectName>EmberAnimate</ProjectName>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
diff --git a/Builds/MSVC/VS2017/EmberCL.vcxproj b/Builds/MSVC/VS2017/EmberCL.vcxproj
index 073500c..688d096 100644
--- a/Builds/MSVC/VS2017/EmberCL.vcxproj
+++ b/Builds/MSVC/VS2017/EmberCL.vcxproj
@@ -15,7 +15,7 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>EmberCLns</RootNamespace>
     <ProjectName>EmberCL</ProjectName>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
@@ -45,7 +45,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
     <OutDir>$(SolutionDir)..\..\..\Bin\$(Platform)\$(Configuration)\</OutDir>
-    <IntDir>$(SolutionDir)Obj\$(Platform)\$(Configuration)\</IntDir>
+    <IntDir>$(SolutionDir)Obj\$(TargetName)\$(Platform)\$(Configuration)\</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <LinkIncremental>false</LinkIncremental>
diff --git a/Builds/MSVC/VS2017/EmberGenome.vcxproj b/Builds/MSVC/VS2017/EmberGenome.vcxproj
index c603a3c..770c33b 100644
--- a/Builds/MSVC/VS2017/EmberGenome.vcxproj
+++ b/Builds/MSVC/VS2017/EmberGenome.vcxproj
@@ -15,7 +15,7 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>EmberGenome</RootNamespace>
     <ProjectName>EmberGenome</ProjectName>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
diff --git a/Builds/MSVC/VS2017/EmberRender.vcxproj b/Builds/MSVC/VS2017/EmberRender.vcxproj
index d276c1a..61118f5 100644
--- a/Builds/MSVC/VS2017/EmberRender.vcxproj
+++ b/Builds/MSVC/VS2017/EmberRender.vcxproj
@@ -15,7 +15,7 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>EmberRender</RootNamespace>
     <ProjectName>EmberRender</ProjectName>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
diff --git a/Builds/MSVC/VS2017/EmberTester.vcxproj b/Builds/MSVC/VS2017/EmberTester.vcxproj
index 664d984..9477b4d 100644
--- a/Builds/MSVC/VS2017/EmberTester.vcxproj
+++ b/Builds/MSVC/VS2017/EmberTester.vcxproj
@@ -15,7 +15,7 @@
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>EmberTester</RootNamespace>
     <ProjectName>EmberTester</ProjectName>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
diff --git a/Builds/MSVC/VS2017/Fractorium.vcxproj b/Builds/MSVC/VS2017/Fractorium.vcxproj
index ba4accd..e5b1616 100644
--- a/Builds/MSVC/VS2017/Fractorium.vcxproj
+++ b/Builds/MSVC/VS2017/Fractorium.vcxproj
@@ -13,7 +13,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{6547D5FA-64CE-44BA-9D3C-B6E217456445}</ProjectGuid>
     <Keyword>Qt4VSv1.0</Keyword>
-    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0.17134.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
diff --git a/makedeps.bat b/makedeps.bat
index 33b06d2..f34090b 100644
--- a/makedeps.bat
+++ b/makedeps.bat
@@ -48,8 +48,8 @@ cd tbb\build\vs2013
 set "curdir=%cd%"
 devenv.exe makefile.sln /upgrade
 cd %curdir%
-Change PlatformToolset and WindowsTargetPlatformVersion to match whatever your version of Visual Studio supports. You can find this by opening makefile.sln in tbb\build\vs2013
-msbuild tbb.vcxproj /p:Configuration=Release /p:Platform=x64 /p:PlatformToolset=v141 /p:WindowsTargetPlatformVersion=10.0.16299.0
+REM Change PlatformToolset and WindowsTargetPlatformVersion to match whatever your version of Visual Studio supports. You can find this by opening makefile.sln in tbb\build\vs2013
+msbuild tbb.vcxproj /p:Configuration=Release /p:Platform=x64 /p:PlatformToolset=v141 /p:WindowsTargetPlatformVersion=10.0.17134.0
 copy X64\Release\tbb.dll ..\..\..\fractorium\Deps
 copy X64\Release\tbb.lib ..\..\..\fractorium\Deps
 cd ..\..\..