|
@@ -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>
|
|
@@ -28,28 +28,28 @@
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
|
|
<ConfigurationType>Application</ConfigurationType>
|
|
|
<UseDebugLibraries>true</UseDebugLibraries>
|
|
|
- <PlatformToolset>v140</PlatformToolset>
|
|
|
- <CharacterSet>Unicode</CharacterSet>
|
|
|
+ <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>
|
|
|
+ <CharacterSet>MultiByte</CharacterSet>
|
|
|
</PropertyGroup>
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
|
|
<ConfigurationType>Application</ConfigurationType>
|
|
|
<UseDebugLibraries>true</UseDebugLibraries>
|
|
|
- <PlatformToolset>v140</PlatformToolset>
|
|
|
- <CharacterSet>Unicode</CharacterSet>
|
|
|
+ <PlatformToolset>v141</PlatformToolset>
|
|
|
+ <CharacterSet>MultiByte</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>
|
|
|
+ <CharacterSet>MultiByte</CharacterSet>
|
|
|
</PropertyGroup>
|
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
|
|
<ImportGroup Label="ExtensionSettings">
|
|
@@ -71,15 +71,22 @@
|
|
|
<PropertyGroup Label="UserMacros" />
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
|
<LinkIncremental>true</LinkIncremental>
|
|
|
+ <IncludePath>..\..\Framework;$(IncludePath)</IncludePath>
|
|
|
</PropertyGroup>
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
|
<LinkIncremental>true</LinkIncremental>
|
|
|
+ <IncludePath>..\..\Framework;$(IncludePath)</IncludePath>
|
|
|
+ <LibraryPath>..\..\Framework\x64\Debug;$(LibraryPath)</LibraryPath>
|
|
|
</PropertyGroup>
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
|
<LinkIncremental>false</LinkIncremental>
|
|
|
+ <IncludePath>..\..\Framework;$(IncludePath)</IncludePath>
|
|
|
+ <LibraryPath>..\..\Framework\Release;$(LibraryPath)</LibraryPath>
|
|
|
</PropertyGroup>
|
|
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
|
<LinkIncremental>false</LinkIncremental>
|
|
|
+ <IncludePath>..\..\Framework;$(IncludePath)</IncludePath>
|
|
|
+ <LibraryPath>..\..\Framework\x64\Release;$(LibraryPath)</LibraryPath>
|
|
|
</PropertyGroup>
|
|
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
|
|
<ClCompile>
|
|
@@ -92,6 +99,7 @@
|
|
|
<Link>
|
|
|
<SubSystem>Windows</SubSystem>
|
|
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
|
+ <AdditionalDependencies>Framework.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
|
</Link>
|
|
|
</ItemDefinitionGroup>
|
|
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
|
@@ -105,7 +113,14 @@
|
|
|
<Link>
|
|
|
<SubSystem>Windows</SubSystem>
|
|
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
|
+ <AdditionalDependencies>Framework.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
|
</Link>
|
|
|
+ <CustomBuildStep>
|
|
|
+ <Command>copy "..\..\Framework\x64\Debug\Framework.dll" "Framework.dll"</Command>
|
|
|
+ </CustomBuildStep>
|
|
|
+ <CustomBuildStep>
|
|
|
+ <Outputs>kopieren;%(Outputs)</Outputs>
|
|
|
+ </CustomBuildStep>
|
|
|
</ItemDefinitionGroup>
|
|
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
|
|
<ClCompile>
|
|
@@ -122,6 +137,7 @@
|
|
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
|
<OptimizeReferences>true</OptimizeReferences>
|
|
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
|
+ <AdditionalDependencies>Framework.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
|
</Link>
|
|
|
</ItemDefinitionGroup>
|
|
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
|
@@ -139,9 +155,11 @@
|
|
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
|
|
<OptimizeReferences>true</OptimizeReferences>
|
|
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
|
|
+ <AdditionalDependencies>Framework.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
|
|
</Link>
|
|
|
</ItemDefinitionGroup>
|
|
|
<ItemGroup>
|
|
|
+ <ClCompile Include="Start.cpp" />
|
|
|
</ItemGroup>
|
|
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
|
|
<ImportGroup Label="ExtensionTargets">
|