Update Target (VS 2017)

Mikescher · Jun 25, 2017 · 5ebd603 · 5ebd603
1 parent 88f4a3c
commit 5ebd603
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 3,891 deletions.
diff --git a/BefunRun.vcxproj b/BefunRun.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
  <ProjectConfiguration Include="Debug|Win32">
  <Configuration>Debug</Configuration>
@@ -22,32 +22,32 @@
  <ProjectGuid>{D4F614AE-E843-4BCD-9F5C-8F97A8EF68AF}</ProjectGuid>
  <Keyword>Win32Proj</Keyword>
  <RootNamespace>BefunRun</RootNamespace>
- <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+ <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
  <ConfigurationType>Application</ConfigurationType>
  <UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
  <CharacterSet>MultiByte</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
  <ConfigurationType>Application</ConfigurationType>
  <UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
  <WholeProgramOptimization>true</WholeProgramOptimization>
  <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
  <ConfigurationType>Application</ConfigurationType>
  <UseDebugLibraries>true</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
  <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
  <ConfigurationType>Application</ConfigurationType>
  <UseDebugLibraries>false</UseDebugLibraries>
- <PlatformToolset>v140</PlatformToolset>
+ <PlatformToolset>v141</PlatformToolset>
  <WholeProgramOptimization>true</WholeProgramOptimization>
  <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
@@ -153,7 +153,7 @@
  <ClInclude Include="source\BefungeRunner3.h" />
  <ClInclude Include="source\BefungeRunnerInfo.h" />
  <ClInclude Include="source\BFRunException.h" />
- <ClInclude Include="source\format.h" />
+ <ClInclude Include="source\external\format.h" />
  <ClInclude Include="source\HelperMethods.h" />
  <ClInclude Include="source\IBefungeRunner.h" />
  <ClInclude Include="source\stdafx.h" />
@@ -166,7 +166,7 @@
  <ClCompile Include="source\BefungeRunner3.cpp" />
  <ClCompile Include="source\BefungeRunnerInfo.cpp" />
  <ClCompile Include="source\BefunRun.cpp" />
- <ClCompile Include="source\format.cpp" />
+ <ClCompile Include="source\external\format.cpp" />
  <ClCompile Include="source\HelperMethods.cpp" />
  <ClCompile Include="source\stdafx.cpp">
  <PrecompiledHeader>Create</PrecompiledHeader>

diff --git a/BefunRun.vcxproj.filters b/BefunRun.vcxproj.filters
@@ -48,7 +48,7 @@
  <ClInclude Include="source\BefungeRunnerInfo.h">
  <Filter>Header Files</Filter>
  </ClInclude>
- <ClInclude Include="source\format.h">
+ <ClInclude Include="source\external\format.h">
  <Filter>Header Files</Filter>
  </ClInclude>
  </ItemGroup>
@@ -77,7 +77,7 @@
  <ClCompile Include="source\BefungeRunnerInfo.cpp">
  <Filter>Source Files</Filter>
  </ClCompile>
- <ClCompile Include="source\format.cpp">
+ <ClCompile Include="source\external\format.cpp">
  <Filter>Source Files</Filter>
  </ClCompile>
  </ItemGroup>

diff --git a/source/BefungeRunnerInfo.cpp b/source/BefungeRunnerInfo.cpp
@@ -2,7 +2,7 @@
 #include "BefungeRunnerInfo.h"
 #include "BFRunException.h"
 #include "HelperMethods.h"
-#include "format.h"
+#include "external/format.h"
 
 
 BefungeRunnerInfo::BefungeRunnerInfo(int w, int h)

diff --git a/source/format.cpp → source/external/format.cpp b/source/format.cpp → source/external/format.cpp
diff --git a/format.h → source/external/format.h b/format.h → source/external/format.h
@@ -28,7 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef FMT_FORMAT_H_
 #define FMT_FORMAT_H_
 
-#include "s"
+//#include "stdafx.h"
 
 #include <cassert>
 #include <clocale>