From a8f5fc9d09b742bbe88a087328195737a890c616 Mon Sep 17 00:00:00 2001 From: Tim Uebelhoer <tim.uebelhoer@rwth-aachen.de> Date: Fri, 16 Mar 2018 17:49:50 +0100 Subject: [PATCH] Updated project settings for latest Windows SDK. And removed includes to shared items projects (finally and thank god for vs 15.6) --- BackendTests/BackendTests.vcxproj | 2 +- MC_Backend_Linux/MC_Backend_Linux.vcxproj | 12 ++++++------ MC_Backend_Win/MC_Backend_Win.vcxproj | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/BackendTests/BackendTests.vcxproj b/BackendTests/BackendTests.vcxproj index 3cdc6d9..bfea3d3 100644 --- a/BackendTests/BackendTests.vcxproj +++ b/BackendTests/BackendTests.vcxproj @@ -23,7 +23,7 @@ <ProjectGuid>{500F1104-28C6-4BE4-A180-8028843972AC}</ProjectGuid> <Keyword>Win32Proj</Keyword> <RootNamespace>BackendTests</RootNamespace> - <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion> + <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> <ProjectSubType>NativeUnitTestProject</ProjectSubType> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> diff --git a/MC_Backend_Linux/MC_Backend_Linux.vcxproj b/MC_Backend_Linux/MC_Backend_Linux.vcxproj index 972f3a5..4981b9f 100644 --- a/MC_Backend_Linux/MC_Backend_Linux.vcxproj +++ b/MC_Backend_Linux/MC_Backend_Linux.vcxproj @@ -106,7 +106,7 @@ <SharedLibrarySearchPath>%(SharedLibrarySearchPath)</SharedLibrarySearchPath> </Link> <ClCompile> - <AdditionalIncludeDirectories>UtilityClasses;CreatedGrpc_Linux;FMU-Core/NativeFmuShared;Simulation;Files;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalOptions>-DBOOST_DATE_TIME_NO_LIB -DBOOST_REGEX_NO_LIB </AdditionalOptions> <CppLanguageStandard>c++1y</CppLanguageStandard> </ClCompile> @@ -120,7 +120,7 @@ <SharedLibrarySearchPath>%(SharedLibrarySearchPath)</SharedLibrarySearchPath> </Link> <ClCompile> - <AdditionalIncludeDirectories>UtilityClasses;CreatedGrpc_Linux;FMU-Core/NativeFmuShared;Simulation;Files;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalOptions>-DBOOST_DATE_TIME_NO_LIB -DBOOST_REGEX_NO_LIB </AdditionalOptions> <CppLanguageStandard>c++1y</CppLanguageStandard> </ClCompile> @@ -134,7 +134,7 @@ <SharedLibrarySearchPath>%(SharedLibrarySearchPath)</SharedLibrarySearchPath> </Link> <ClCompile> - <AdditionalIncludeDirectories>UtilityClasses;CreatedGrpc_Linux;FMU-Core/NativeFmuShared;Simulation;Files;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalOptions>-DBOOST_DATE_TIME_NO_LIB -DBOOST_REGEX_NO_LIB</AdditionalOptions> <CppLanguageStandard>c++1y</CppLanguageStandard> </ClCompile> @@ -152,7 +152,7 @@ <SharedLibrarySearchPath>%(SharedLibrarySearchPath)</SharedLibrarySearchPath> </Link> <ClCompile> - <AdditionalIncludeDirectories>UtilityClasses;CreatedGrpc_Linux;FMU-Core/NativeFmuShared;Simulation;Files;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalOptions>-DBOOST_DATE_TIME_NO_LIB -DBOOST_REGEX_NO_LIB</AdditionalOptions> <CppLanguageStandard>c++1y</CppLanguageStandard> </ClCompile> @@ -170,7 +170,7 @@ <SharedLibrarySearchPath>%(SharedLibrarySearchPath)</SharedLibrarySearchPath> </Link> <ClCompile> - <AdditionalIncludeDirectories>UtilityClasses;CreatedGrpc_Linux;FMU-Core/NativeFmuShared;Simulation;Files;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalOptions>-DBOOST_DATE_TIME_NO_LIB -DBOOST_REGEX_NO_LIB</AdditionalOptions> <CppLanguageStandard>c++1y</CppLanguageStandard> </ClCompile> @@ -184,7 +184,7 @@ <SharedLibrarySearchPath>%(SharedLibrarySearchPath)</SharedLibrarySearchPath> </Link> <ClCompile> - <AdditionalIncludeDirectories>UtilityClasses;CreatedGrpc_Linux;FMU-Core/NativeFmuShared;Simulation;Files;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalOptions>-DBOOST_DATE_TIME_NO_LIB -DBOOST_REGEX_NO_LIB</AdditionalOptions> <CppLanguageStandard>c++1y</CppLanguageStandard> </ClCompile> diff --git a/MC_Backend_Win/MC_Backend_Win.vcxproj b/MC_Backend_Win/MC_Backend_Win.vcxproj index 22d8a57..8f91f72 100644 --- a/MC_Backend_Win/MC_Backend_Win.vcxproj +++ b/MC_Backend_Win/MC_Backend_Win.vcxproj @@ -23,7 +23,7 @@ <ProjectGuid>{87F7A408-7C05-47A8-A1D7-4A53CA350666}</ProjectGuid> <Keyword>Win32Proj</Keyword> <RootNamespace>MC_Backend_Win</RootNamespace> - <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion> + <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> -- GitLab