Skip to content
This repository was archived by the owner on Jul 19, 2024. It is now read-only.

Commit 1ebce68

Browse files
keveleighkeveleigh
authored
Merge pull request #155 from fieldsJacksonG/master
Update spectator view dependencies to latest versions
2 parents 811065b + df11091 commit 1ebce68

File tree

15 files changed

+121
-68
lines changed

15 files changed

+121
-68
lines changed

‎SpectatorView/Calibration/Calibration/Calibration.vcxproj‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\directxtk_desktop_2015.2016.4.26.1\build\native\directxtk_desktop_2015.props" Condition="Exists('..\packages\directxtk_desktop_2015.2016.4.26.1\build\native\directxtk_desktop_2015.props')" />
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\directxtk_desktop_2015.2017.6.21.1\build\native\directxtk_desktop_2015.props" Condition="Exists('..\packages\directxtk_desktop_2015.2017.6.21.1\build\native\directxtk_desktop_2015.props')" />
44
<Import Project="packages\directxtk_desktop_2015.2016.2.23.1\build\native\directxtk_desktop_2015.props" Condition="Exists('packages\directxtk_desktop_2015.2016.2.23.1\build\native\directxtk_desktop_2015.props')" />
55
<ItemGroup Label="ProjectConfigurations">
66
<ProjectConfiguration Include="Debug|x64">
@@ -16,20 +16,20 @@
1616
<RootNamespace>Calibration</RootNamespace>
1717
<ProjectGuid>{70239410-43ff-4f2b-acbb-e640437f7289}</ProjectGuid>
1818
<Keyword>Win32Proj</Keyword>
19-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
19+
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
2020
</PropertyGroup>
2121
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2222
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
2323
<ConfigurationType>Application</ConfigurationType>
2424
<UseDebugLibraries>true</UseDebugLibraries>
25-
<PlatformToolset>v140</PlatformToolset>
25+
<PlatformToolset>v141</PlatformToolset>
2626
<CharacterSet>Unicode</CharacterSet>
2727
<WindowsAppContainer>false</WindowsAppContainer>
2828
</PropertyGroup>
2929
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
3030
<ConfigurationType>Application</ConfigurationType>
3131
<UseDebugLibraries>false</UseDebugLibraries>
32-
<PlatformToolset>v140</PlatformToolset>
32+
<PlatformToolset>v141</PlatformToolset>
3333
<WholeProgramOptimization>true</WholeProgramOptimization>
3434
<CharacterSet>Unicode</CharacterSet>
3535
<WindowsAppContainer>false</WindowsAppContainer>
@@ -207,7 +207,15 @@ if EXIST "$(Elgato_Filter)" xcopy /y "$(Elgato_Filter)" ..\..\Compositor\Composi
207207
<ImportGroup Label="ExtensionTargets">
208208
<Import Project="packages\directxtk_desktop_2015.2016.2.23.1\build\native\directxtk_desktop_2015.targets" Condition="Exists('packages\directxtk_desktop_2015.2016.2.23.1\build\native\directxtk_desktop_2015.targets')" />
209209
<Import Project="packages\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.2.8.0\build\native\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.targets" Condition="Exists('packages\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.2.8.0\build\native\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.targets')" />
210-
<Import Project="..\packages\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.2.8.0\build\native\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.targets" Condition="Exists('..\packages\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.2.8.0\build\native\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.targets')" />
211-
<Import Project="..\packages\directxtk_desktop_2015.2016.4.26.1\build\native\directxtk_desktop_2015.targets" Condition="Exists('..\packages\directxtk_desktop_2015.2016.4.26.1\build\native\directxtk_desktop_2015.targets')" />
210+
<Import Project="..\packages\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.2.9.1\build\native\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.targets" Condition="Exists('..\packages\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.2.9.1\build\native\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.targets')" />
211+
<Import Project="..\packages\directxtk_desktop_2015.2017.6.21.1\build\native\directxtk_desktop_2015.targets" Condition="Exists('..\packages\directxtk_desktop_2015.2017.6.21.1\build\native\directxtk_desktop_2015.targets')" />
212212
</ImportGroup>
213+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
214+
<PropertyGroup>
215+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
216+
</PropertyGroup>
217+
<Error Condition="!Exists('..\packages\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.2.9.1\build\native\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.2.9.1\build\native\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.targets'))" />
218+
<Error Condition="!Exists('..\packages\directxtk_desktop_2015.2017.6.21.1\build\native\directxtk_desktop_2015.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtk_desktop_2015.2017.6.21.1\build\native\directxtk_desktop_2015.props'))" />
219+
<Error Condition="!Exists('..\packages\directxtk_desktop_2015.2017.6.21.1\build\native\directxtk_desktop_2015.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtk_desktop_2015.2017.6.21.1\build\native\directxtk_desktop_2015.targets'))" />
220+
</Target>
213221
</Project>

‎SpectatorView/Calibration/Calibration/CalibrationApp.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939

4040
#include "opencv2/opencv.hpp"
4141

42-
//TODO: Update to the version of OpenCV you are using (if not 3.1)
43-
#pragma comment(lib, "opencv_world310")
42+
//TODO: Update to the version of OpenCV you are using (if not 3.2)
43+
#pragma comment(lib, "opencv_world320")
4444

4545
// For REST calls
4646
using namespace web::json;

‎SpectatorView/Calibration/Calibration/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn" version="2.8.0" targetFramework="native" />
4-
<package id="directxtk_desktop_2015" version="2016.4.26.1" targetFramework="native" />
3+
<package id="cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn" version="2.9.1" targetFramework="native" />
4+
<package id="directxtk_desktop_2015" version="2017.6.21.1" targetFramework="native" />
55
</packages>

‎SpectatorView/Compositor/CompositorDLL/CompositorDLL.vcxproj‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\packages\directxtk_desktop_2015.2016.9.1.2\build\native\directxtk_desktop_2015.props" Condition="Exists('..\packages\directxtk_desktop_2015.2016.9.1.2\build\native\directxtk_desktop_2015.props')" />
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\directxtk_desktop_2015.2017.6.21.1\build\native\directxtk_desktop_2015.props" Condition="Exists('..\packages\directxtk_desktop_2015.2017.6.21.1\build\native\directxtk_desktop_2015.props')" />
44
<ItemGroup Label="ProjectConfigurations">
55
<ProjectConfiguration Include="Debug|Win32">
66
<Configuration>Debug</Configuration>
@@ -23,32 +23,32 @@
2323
<ProjectGuid>{D390EF5F-0771-4FCD-876A-542EB8DBEAC3}</ProjectGuid>
2424
<Keyword>Win32Proj</Keyword>
2525
<RootNamespace>CompositorDLL</RootNamespace>
26-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
26+
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
2727
</PropertyGroup>
2828
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2929
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3030
<ConfigurationType>DynamicLibrary</ConfigurationType>
3131
<UseDebugLibraries>true</UseDebugLibraries>
32-
<PlatformToolset>v140</PlatformToolset>
32+
<PlatformToolset>v141</PlatformToolset>
3333
<CharacterSet>Unicode</CharacterSet>
3434
</PropertyGroup>
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3636
<ConfigurationType>DynamicLibrary</ConfigurationType>
3737
<UseDebugLibraries>false</UseDebugLibraries>
38-
<PlatformToolset>v140</PlatformToolset>
38+
<PlatformToolset>v141</PlatformToolset>
3939
<WholeProgramOptimization>true</WholeProgramOptimization>
4040
<CharacterSet>Unicode</CharacterSet>
4141
</PropertyGroup>
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
4444
<UseDebugLibraries>true</UseDebugLibraries>
45-
<PlatformToolset>v140</PlatformToolset>
45+
<PlatformToolset>v141</PlatformToolset>
4646
<CharacterSet>Unicode</CharacterSet>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4949
<ConfigurationType>DynamicLibrary</ConfigurationType>
5050
<UseDebugLibraries>false</UseDebugLibraries>
51-
<PlatformToolset>v140</PlatformToolset>
51+
<PlatformToolset>v141</PlatformToolset>
5252
<WholeProgramOptimization>true</WholeProgramOptimization>
5353
<CharacterSet>Unicode</CharacterSet>
5454
</PropertyGroup>
@@ -263,13 +263,13 @@ if EXIST "$(Elgato_Filter)" xcopy /y "$(Elgato_Filter)"</Command>
263263
</ItemGroup>
264264
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
265265
<ImportGroup Label="ExtensionTargets">
266-
<Import Project="..\packages\directxtk_desktop_2015.2016.9.1.2\build\native\directxtk_desktop_2015.targets" Condition="Exists('..\packages\directxtk_desktop_2015.2016.9.1.2\build\native\directxtk_desktop_2015.targets')" />
266+
<Import Project="..\packages\directxtk_desktop_2015.2017.6.21.1\build\native\directxtk_desktop_2015.targets" Condition="Exists('..\packages\directxtk_desktop_2015.2017.6.21.1\build\native\directxtk_desktop_2015.targets')" />
267267
</ImportGroup>
268268
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
269269
<PropertyGroup>
270270
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
271271
</PropertyGroup>
272-
<Error Condition="!Exists('..\packages\directxtk_desktop_2015.2016.9.1.2\build\native\directxtk_desktop_2015.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtk_desktop_2015.2016.9.1.2\build\native\directxtk_desktop_2015.props'))" />
273-
<Error Condition="!Exists('..\packages\directxtk_desktop_2015.2016.9.1.2\build\native\directxtk_desktop_2015.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtk_desktop_2015.2016.9.1.2\build\native\directxtk_desktop_2015.targets'))" />
272+
<Error Condition="!Exists('..\packages\directxtk_desktop_2015.2017.6.21.1\build\native\directxtk_desktop_2015.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtk_desktop_2015.2017.6.21.1\build\native\directxtk_desktop_2015.props'))" />
273+
<Error Condition="!Exists('..\packages\directxtk_desktop_2015.2017.6.21.1\build\native\directxtk_desktop_2015.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\directxtk_desktop_2015.2017.6.21.1\build\native\directxtk_desktop_2015.targets'))" />
274274
</Target>
275275
</Project>

‎SpectatorView/Compositor/CompositorDLL/OpenCVFrameProvider.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#pragma once
55
#if USE_OPENCV
66

7-
#pragma comment(lib, "opencv_world310")
7+
#pragma comment(lib, "opencv_world320")
88
#include "opencv2/opencv.hpp"
99

1010
#include "DirectXHelper.h"

‎SpectatorView/Compositor/CompositorDLL/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="directxtk_desktop_2015" version="2016.9.1.2" targetFramework="native" />
3+
<package id="directxtk_desktop_2015" version="2017.6.21.1" targetFramework="native" />
44
</packages>

‎SpectatorView/Compositor/SharedHeaders/SharedHeaders.vcxproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -21,32 +21,32 @@
2121
<PropertyGroup Label="Globals">
2222
<ProjectGuid>{4082D64F-05AF-4B6A-AC80-2435A0F58AD3}</ProjectGuid>
2323
<RootNamespace>SharedHeaders</RootNamespace>
24-
<WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
24+
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
2525
</PropertyGroup>
2626
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2727
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2828
<ConfigurationType>Application</ConfigurationType>
2929
<UseDebugLibraries>true</UseDebugLibraries>
30-
<PlatformToolset>v140</PlatformToolset>
30+
<PlatformToolset>v141</PlatformToolset>
3131
<CharacterSet>MultiByte</CharacterSet>
3232
</PropertyGroup>
3333
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
3434
<ConfigurationType>Application</ConfigurationType>
3535
<UseDebugLibraries>false</UseDebugLibraries>
36-
<PlatformToolset>v140</PlatformToolset>
36+
<PlatformToolset>v141</PlatformToolset>
3737
<WholeProgramOptimization>true</WholeProgramOptimization>
3838
<CharacterSet>MultiByte</CharacterSet>
3939
</PropertyGroup>
4040
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
4141
<ConfigurationType>Application</ConfigurationType>
4242
<UseDebugLibraries>true</UseDebugLibraries>
43-
<PlatformToolset>v140</PlatformToolset>
43+
<PlatformToolset>v141</PlatformToolset>
4444
<CharacterSet>MultiByte</CharacterSet>
4545
</PropertyGroup>
4646
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4747
<ConfigurationType>Application</ConfigurationType>
4848
<UseDebugLibraries>false</UseDebugLibraries>
49-
<PlatformToolset>v140</PlatformToolset>
49+
<PlatformToolset>v141</PlatformToolset>
5050
<WholeProgramOptimization>true</WholeProgramOptimization>
5151
<CharacterSet>MultiByte</CharacterSet>
5252
</PropertyGroup>

‎SpectatorView/Compositor/SpatialPerceptionHelper/SpatialPerceptionHelper.vcxproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -34,43 +34,43 @@
3434
<MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
3535
<AppContainerApplication>true</AppContainerApplication>
3636
<ApplicationType>Windows Store</ApplicationType>
37-
<WindowsTargetPlatformVersion>10.0.14393.0</WindowsTargetPlatformVersion>
38-
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
37+
<WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
38+
<WindowsTargetPlatformMinVersion>10.0.15063.0</WindowsTargetPlatformMinVersion>
3939
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
4040
</PropertyGroup>
4141
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
4444
<UseDebugLibraries>true</UseDebugLibraries>
45-
<PlatformToolset>v140</PlatformToolset>
45+
<PlatformToolset>v141</PlatformToolset>
4646
</PropertyGroup>
4747
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
4848
<ConfigurationType>DynamicLibrary</ConfigurationType>
4949
<UseDebugLibraries>true</UseDebugLibraries>
50-
<PlatformToolset>v140</PlatformToolset>
50+
<PlatformToolset>v141</PlatformToolset>
5151
</PropertyGroup>
5252
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5353
<ConfigurationType>DynamicLibrary</ConfigurationType>
5454
<UseDebugLibraries>true</UseDebugLibraries>
55-
<PlatformToolset>v140</PlatformToolset>
55+
<PlatformToolset>v141</PlatformToolset>
5656
</PropertyGroup>
5757
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
5858
<ConfigurationType>DynamicLibrary</ConfigurationType>
5959
<UseDebugLibraries>false</UseDebugLibraries>
6060
<WholeProgramOptimization>true</WholeProgramOptimization>
61-
<PlatformToolset>v140</PlatformToolset>
61+
<PlatformToolset>v141</PlatformToolset>
6262
</PropertyGroup>
6363
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
6464
<ConfigurationType>DynamicLibrary</ConfigurationType>
6565
<UseDebugLibraries>false</UseDebugLibraries>
6666
<WholeProgramOptimization>true</WholeProgramOptimization>
67-
<PlatformToolset>v140</PlatformToolset>
67+
<PlatformToolset>v141</PlatformToolset>
6868
</PropertyGroup>
6969
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7070
<ConfigurationType>DynamicLibrary</ConfigurationType>
7171
<UseDebugLibraries>false</UseDebugLibraries>
7272
<WholeProgramOptimization>true</WholeProgramOptimization>
73-
<PlatformToolset>v140</PlatformToolset>
73+
<PlatformToolset>v141</PlatformToolset>
7474
</PropertyGroup>
7575
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
7676
<ImportGroup Label="ExtensionSettings">

0 commit comments

Comments
 (0)