Skip to content

Commit a43ae2a

Browse files
smasherprogsmasherprog
committed
Library now successfully builds
Changed libturbo to be a nuget package
1 parent 9300d2e commit a43ae2a

23 files changed

+126
-3453
lines changed

‎RemoteDesktopServer_Library/RemoteDesktopServer_Library.vcxproj

Lines changed: 15 additions & 5 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="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -28,27 +28,27 @@
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2929
<ConfigurationType>StaticLibrary</ConfigurationType>
3030
<UseDebugLibraries>true</UseDebugLibraries>
31-
<PlatformToolset>v120</PlatformToolset>
31+
<PlatformToolset>v140</PlatformToolset>
3232
<CharacterSet>Unicode</CharacterSet>
3333
<UseOfMfc>false</UseOfMfc>
3434
</PropertyGroup>
3535
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3636
<ConfigurationType>StaticLibrary</ConfigurationType>
3737
<UseDebugLibraries>true</UseDebugLibraries>
38-
<PlatformToolset>v120</PlatformToolset>
38+
<PlatformToolset>v140</PlatformToolset>
3939
<CharacterSet>Unicode</CharacterSet>
4040
</PropertyGroup>
4141
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4242
<ConfigurationType>StaticLibrary</ConfigurationType>
4343
<UseDebugLibraries>false</UseDebugLibraries>
44-
<PlatformToolset>v120</PlatformToolset>
44+
<PlatformToolset>v140</PlatformToolset>
4545
<WholeProgramOptimization>true</WholeProgramOptimization>
4646
<CharacterSet>Unicode</CharacterSet>
4747
</PropertyGroup>
4848
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4949
<ConfigurationType>StaticLibrary</ConfigurationType>
5050
<UseDebugLibraries>false</UseDebugLibraries>
51-
<PlatformToolset>v120</PlatformToolset>
51+
<PlatformToolset>v140</PlatformToolset>
5252
<WholeProgramOptimization>true</WholeProgramOptimization>
5353
<CharacterSet>Unicode</CharacterSet>
5454
</PropertyGroup>
@@ -258,7 +258,17 @@
258258
<ItemGroup>
259259
<ResourceCompile Include="RemoteDesktopServer_Library.rc" />
260260
</ItemGroup>
261+
<ItemGroup>
262+
<None Include="packages.config" />
263+
</ItemGroup>
261264
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
262265
<ImportGroup Label="ExtensionTargets">
266+
<Import Project="..\packages\Libjpeg-Turbo.1.4.2.15\build\native\Libjpeg-Turbo.targets" Condition="Exists('..\packages\Libjpeg-Turbo.1.4.2.15\build\native\Libjpeg-Turbo.targets')" />
263267
</ImportGroup>
268+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
269+
<PropertyGroup>
270+
<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>
271+
</PropertyGroup>
272+
<Error Condition="!Exists('..\packages\Libjpeg-Turbo.1.4.2.15\build\native\Libjpeg-Turbo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Libjpeg-Turbo.1.4.2.15\build\native\Libjpeg-Turbo.targets'))" />
273+
</Target>
264274
</Project>

‎RemoteDesktopServer_Library/RemoteDesktopServer_Library.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,7 @@
104104
<ItemGroup>
105105
<ResourceCompile Include="RemoteDesktopServer_Library.rc" />
106106
</ItemGroup>
107+
<ItemGroup>
108+
<None Include="packages.config" />
109+
</ItemGroup>
107110
</Project>

‎RemoteDesktopServer_Library/packages.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Libjpeg-Turbo" version="1.4.2.15" targetFramework="native" />
4+
</packages>

‎RemoteDesktopViewer_Library/RemoteDesktopViewer_Library.vcxproj

Lines changed: 15 additions & 5 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="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -28,26 +28,26 @@
2828
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2929
<ConfigurationType>DynamicLibrary</ConfigurationType>
3030
<UseDebugLibraries>true</UseDebugLibraries>
31-
<PlatformToolset>v120</PlatformToolset>
31+
<PlatformToolset>v140</PlatformToolset>
3232
<CharacterSet>Unicode</CharacterSet>
3333
</PropertyGroup>
3434
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3535
<ConfigurationType>DynamicLibrary</ConfigurationType>
3636
<UseDebugLibraries>true</UseDebugLibraries>
37-
<PlatformToolset>v120</PlatformToolset>
37+
<PlatformToolset>v140</PlatformToolset>
3838
<CharacterSet>Unicode</CharacterSet>
3939
</PropertyGroup>
4040
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4141
<ConfigurationType>DynamicLibrary</ConfigurationType>
4242
<UseDebugLibraries>false</UseDebugLibraries>
43-
<PlatformToolset>v120</PlatformToolset>
43+
<PlatformToolset>v140</PlatformToolset>
4444
<WholeProgramOptimization>true</WholeProgramOptimization>
4545
<CharacterSet>Unicode</CharacterSet>
4646
</PropertyGroup>
4747
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4848
<ConfigurationType>DynamicLibrary</ConfigurationType>
4949
<UseDebugLibraries>false</UseDebugLibraries>
50-
<PlatformToolset>v120</PlatformToolset>
50+
<PlatformToolset>v140</PlatformToolset>
5151
<WholeProgramOptimization>true</WholeProgramOptimization>
5252
<CharacterSet>Unicode</CharacterSet>
5353
</PropertyGroup>
@@ -197,7 +197,17 @@
197197
<ItemGroup>
198198
<ResourceCompile Include="RemoteDesktopViewer_Library.rc" />
199199
</ItemGroup>
200+
<ItemGroup>
201+
<None Include="packages.config" />
202+
</ItemGroup>
200203
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
201204
<ImportGroup Label="ExtensionTargets">
205+
<Import Project="..\packages\Libjpeg-Turbo.1.4.2.15\build\native\Libjpeg-Turbo.targets" Condition="Exists('..\packages\Libjpeg-Turbo.1.4.2.15\build\native\Libjpeg-Turbo.targets')" />
202206
</ImportGroup>
207+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
208+
<PropertyGroup>
209+
<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>
210+
</PropertyGroup>
211+
<Error Condition="!Exists('..\packages\Libjpeg-Turbo.1.4.2.15\build\native\Libjpeg-Turbo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Libjpeg-Turbo.1.4.2.15\build\native\Libjpeg-Turbo.targets'))" />
212+
</Target>
203213
</Project>

‎RemoteDesktopViewer_Library/RemoteDesktopViewer_Library.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,7 @@
4444
<ItemGroup>
4545
<ResourceCompile Include="RemoteDesktopViewer_Library.rc" />
4646
</ItemGroup>
47+
<ItemGroup>
48+
<None Include="packages.config" />
49+
</ItemGroup>
4750
</Project>

‎RemoteDesktopViewer_Library/packages.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Libjpeg-Turbo" version="1.4.2.15" targetFramework="native" />
4+
</packages>

‎RemoteDesktop_Library/Image.cpp

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "stdafx.h"
22
#include "Image.h"
3-
#include "..\libjpeg-turbo\turbojpeg.h"
3+
#include "turbojpeg.h"
44
#include <memory>
55
#include "Timer.h"
66
#include "Handle_Wrapper.h"
@@ -28,9 +28,8 @@ void RemoteDesktop::Image::Compress(){
2828

2929
auto compfree = [](void* handle){tjDestroy(handle); };
3030

31-
static std::unique_ptr<void, decltype(compfree)> _jpegCompressor;
32-
if (_jpegCompressor.get() == nullptr) _jpegCompressor = std::unique_ptr<void, decltype(compfree)>(tjInitCompress(), compfree);
33-
static std::vector<char> compressBuffer;
31+
auto _jpegCompressor(std::unique_ptr<void, decltype(compfree)>(tjInitCompress(), compfree));
32+
std::vector<char> compressBuffer;
3433

3534
auto set = Image_Settings::GrazyScale ? TJSAMP_GRAY : TJSAMP_420;
3635

@@ -57,11 +56,9 @@ void RemoteDesktop::Image::Compress(){
5756
void RemoteDesktop::Image::Decompress(){
5857
if (!Compressed) return;//already done
5958

60-
//I Kind of cheat below by using static variables. . . This means the compress and decompress functions are NOT THREAD SAFE, but this isnt a problem yet
6159
auto compfree = [](void* handle){tjDestroy(handle); };
62-
static std::unique_ptr<void, decltype(compfree)> _jpegDecompressor;
63-
static std::vector<unsigned char> decompressBuffer;
64-
if (_jpegDecompressor.get() == nullptr) _jpegDecompressor = std::unique_ptr<void, decltype(compfree)>(tjInitDecompress(), compfree);
60+
auto _jpegDecompressor(std::unique_ptr<void, decltype(compfree)>(tjInitDecompress(), compfree));
61+
std::vector<unsigned char> decompressBuffer;
6562

6663
size_t maxsize = Width * Height * Pixel_Stride;
6764
if (decompressBuffer.capacity() < maxsize) decompressBuffer.reserve(maxsize + 16);

‎RemoteDesktop_Library/RemoteDesktop_Library.vcxproj

Lines changed: 23 additions & 13 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="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -27,26 +27,26 @@
2727
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2828
<ConfigurationType>StaticLibrary</ConfigurationType>
2929
<UseDebugLibraries>true</UseDebugLibraries>
30-
<PlatformToolset>v120</PlatformToolset>
30+
<PlatformToolset>v140</PlatformToolset>
3131
<CharacterSet>Unicode</CharacterSet>
3232
</PropertyGroup>
3333
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3434
<ConfigurationType>StaticLibrary</ConfigurationType>
3535
<UseDebugLibraries>true</UseDebugLibraries>
36-
<PlatformToolset>v120</PlatformToolset>
36+
<PlatformToolset>v140</PlatformToolset>
3737
<CharacterSet>Unicode</CharacterSet>
3838
</PropertyGroup>
3939
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4040
<ConfigurationType>StaticLibrary</ConfigurationType>
4141
<UseDebugLibraries>false</UseDebugLibraries>
42-
<PlatformToolset>v120</PlatformToolset>
42+
<PlatformToolset>v140</PlatformToolset>
4343
<WholeProgramOptimization>true</WholeProgramOptimization>
4444
<CharacterSet>Unicode</CharacterSet>
4545
</PropertyGroup>
4646
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4747
<ConfigurationType>StaticLibrary</ConfigurationType>
4848
<UseDebugLibraries>false</UseDebugLibraries>
49-
<PlatformToolset>v120</PlatformToolset>
49+
<PlatformToolset>v140</PlatformToolset>
5050
<WholeProgramOptimization>true</WholeProgramOptimization>
5151
<CharacterSet>Unicode</CharacterSet>
5252
</PropertyGroup>
@@ -69,28 +69,28 @@
6969
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
7070
<LinkIncremental>true</LinkIncremental>
7171
<IncludePath>..\;$(IncludePath)</IncludePath>
72-
<LibraryPath>$(SolutionDir)lib\$(PlatformTarget)\$(Configuration)\;$(LibraryPath)</LibraryPath>
72+
<LibraryPath>$(LibraryPath)</LibraryPath>
7373
<OutDir>$(SolutionDir)lib\$(PlatformTarget)\$(Configuration)\</OutDir>
7474
<IntDir>$(PlatformTarget)\$(Configuration)\</IntDir>
7575
</PropertyGroup>
7676
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
7777
<LinkIncremental>true</LinkIncremental>
7878
<IncludePath>..\;$(IncludePath)</IncludePath>
79-
<LibraryPath>$(SolutionDir)lib\$(PlatformTarget)\$(Configuration)\;$(LibraryPath)</LibraryPath>
79+
<LibraryPath>$(LibraryPath)</LibraryPath>
8080
<OutDir>$(SolutionDir)lib\$(PlatformTarget)\$(Configuration)\</OutDir>
8181
<IntDir>$(PlatformTarget)\$(Configuration)\</IntDir>
8282
</PropertyGroup>
8383
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
8484
<LinkIncremental>false</LinkIncremental>
8585
<IncludePath>..\;$(IncludePath)</IncludePath>
86-
<LibraryPath>$(SolutionDir)lib\$(PlatformTarget)\$(Configuration)\;$(LibraryPath)</LibraryPath>
86+
<LibraryPath>$(LibraryPath)</LibraryPath>
8787
<OutDir>$(SolutionDir)lib\$(PlatformTarget)\$(Configuration)\</OutDir>
8888
<IntDir>$(PlatformTarget)\$(Configuration)\</IntDir>
8989
</PropertyGroup>
9090
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
9191
<LinkIncremental>false</LinkIncremental>
9292
<IncludePath>..\;$(IncludePath)</IncludePath>
93-
<LibraryPath>$(SolutionDir)lib\$(PlatformTarget)\$(Configuration)\;$(LibraryPath)</LibraryPath>
93+
<LibraryPath>$(LibraryPath)</LibraryPath>
9494
<OutDir>$(SolutionDir)lib\$(PlatformTarget)\$(Configuration)\</OutDir>
9595
<IntDir>$(PlatformTarget)\$(Configuration)\</IntDir>
9696
</PropertyGroup>
@@ -109,7 +109,7 @@
109109
<AdditionalDependencies>turbojpeg-static_debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
110110
</Link>
111111
<Lib>
112-
<AdditionalDependencies>Userenv.lib;cryptlib.lib;turbojpeg-static.lib;Winhttp.lib;comsuppw.lib;Iphlpapi.lib;ole32.lib;oleaut32.lib;netapi32.lib</AdditionalDependencies>
112+
<AdditionalDependencies>Userenv.lib;Winhttp.lib;comsuppw.lib;Iphlpapi.lib;ole32.lib;oleaut32.lib;netapi32.lib</AdditionalDependencies>
113113
</Lib>
114114
</ItemDefinitionGroup>
115115
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -127,7 +127,7 @@
127127
<AdditionalDependencies>turbojpeg-static_debug.lib;%(AdditionalDependencies)</AdditionalDependencies>
128128
</Link>
129129
<Lib>
130-
<AdditionalDependencies>Userenv.lib;cryptlib.lib;turbojpeg-static.lib;Winhttp.lib;comsuppw.lib;Iphlpapi.lib;ole32.lib;oleaut32.lib;netapi32.lib</AdditionalDependencies>
130+
<AdditionalDependencies>Userenv.lib;Winhttp.lib;comsuppw.lib;Iphlpapi.lib;ole32.lib;oleaut32.lib;netapi32.lib</AdditionalDependencies>
131131
</Lib>
132132
</ItemDefinitionGroup>
133133
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -151,7 +151,7 @@
151151
<AdditionalDependencies>turbojpeg-static.lib;%(AdditionalDependencies)</AdditionalDependencies>
152152
</Link>
153153
<Lib>
154-
<AdditionalDependencies>Userenv.lib;cryptlib.lib;turbojpeg-static.lib;Winhttp.lib;comsuppw.lib;Iphlpapi.lib;ole32.lib;oleaut32.lib;netapi32.lib</AdditionalDependencies>
154+
<AdditionalDependencies>Userenv.lib;Winhttp.lib;comsuppw.lib;Iphlpapi.lib;ole32.lib;oleaut32.lib;netapi32.lib</AdditionalDependencies>
155155
</Lib>
156156
</ItemDefinitionGroup>
157157
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -175,7 +175,7 @@
175175
<AdditionalDependencies>turbojpeg-static.lib;%(AdditionalDependencies)</AdditionalDependencies>
176176
</Link>
177177
<Lib>
178-
<AdditionalDependencies>Userenv.lib;cryptlib.lib;turbojpeg-static.lib;Winhttp.lib;comsuppw.lib;Iphlpapi.lib;ole32.lib;oleaut32.lib;netapi32.lib</AdditionalDependencies>
178+
<AdditionalDependencies>Userenv.lib;Winhttp.lib;comsuppw.lib;Iphlpapi.lib;ole32.lib;oleaut32.lib;netapi32.lib</AdditionalDependencies>
179179
</Lib>
180180
</ItemDefinitionGroup>
181181
<ItemGroup>
@@ -295,7 +295,17 @@
295295
<Project>{3423ec9a-52e4-4a4d-9753-edebc38785ef}</Project>
296296
</ProjectReference>
297297
</ItemGroup>
298+
<ItemGroup>
299+
<None Include="packages.config" />
300+
</ItemGroup>
298301
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
299302
<ImportGroup Label="ExtensionTargets">
303+
<Import Project="..\packages\Libjpeg-Turbo.1.4.2.15\build\native\Libjpeg-Turbo.targets" Condition="Exists('..\packages\Libjpeg-Turbo.1.4.2.15\build\native\Libjpeg-Turbo.targets')" />
300304
</ImportGroup>
305+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
306+
<PropertyGroup>
307+
<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>
308+
</PropertyGroup>
309+
<Error Condition="!Exists('..\packages\Libjpeg-Turbo.1.4.2.15\build\native\Libjpeg-Turbo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Libjpeg-Turbo.1.4.2.15\build\native\Libjpeg-Turbo.targets'))" />
310+
</Target>
301311
</Project>

‎RemoteDesktop_Library/RemoteDesktop_Library.vcxproj.filters

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,4 +252,7 @@
252252
<Filter>Desktop</Filter>
253253
</ClCompile>
254254
</ItemGroup>
255+
<ItemGroup>
256+
<None Include="packages.config" />
257+
</ItemGroup>
255258
</Project>

‎RemoteDesktop_Library/packages.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Libjpeg-Turbo" version="1.4.2.15" targetFramework="native" />
4+
</packages>

‎RemoteDesktop_ServerGateway/RemoteDesktop_ServerGateway.vcxproj

Lines changed: 15 additions & 5 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="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<ItemGroup Label="ProjectConfigurations">
44
<ProjectConfiguration Include="Debug|Win32">
55
<Configuration>Debug</Configuration>
@@ -27,26 +27,26 @@
2727
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2828
<ConfigurationType>Application</ConfigurationType>
2929
<UseDebugLibraries>true</UseDebugLibraries>
30-
<PlatformToolset>v120</PlatformToolset>
30+
<PlatformToolset>v140</PlatformToolset>
3131
<CharacterSet>Unicode</CharacterSet>
3232
</PropertyGroup>
3333
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
3434
<ConfigurationType>Application</ConfigurationType>
3535
<UseDebugLibraries>true</UseDebugLibraries>
36-
<PlatformToolset>v120</PlatformToolset>
36+
<PlatformToolset>v140</PlatformToolset>
3737
<CharacterSet>Unicode</CharacterSet>
3838
</PropertyGroup>
3939
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
4040
<ConfigurationType>Application</ConfigurationType>
4141
<UseDebugLibraries>false</UseDebugLibraries>
42-
<PlatformToolset>v120</PlatformToolset>
42+
<PlatformToolset>v140</PlatformToolset>
4343
<WholeProgramOptimization>true</WholeProgramOptimization>
4444
<CharacterSet>Unicode</CharacterSet>
4545
</PropertyGroup>
4646
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
4747
<ConfigurationType>Application</ConfigurationType>
4848
<UseDebugLibraries>false</UseDebugLibraries>
49-
<PlatformToolset>v120</PlatformToolset>
49+
<PlatformToolset>v140</PlatformToolset>
5050
<WholeProgramOptimization>true</WholeProgramOptimization>
5151
<CharacterSet>Unicode</CharacterSet>
5252
</PropertyGroup>
@@ -217,7 +217,17 @@
217217
<ItemGroup>
218218
<ResourceCompile Include="RemoteDesktop_ServerGateway.rc" />
219219
</ItemGroup>
220+
<ItemGroup>
221+
<None Include="packages.config" />
222+
</ItemGroup>
220223
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
221224
<ImportGroup Label="ExtensionTargets">
225+
<Import Project="..\packages\Libjpeg-Turbo.1.4.2.15\build\native\Libjpeg-Turbo.targets" Condition="Exists('..\packages\Libjpeg-Turbo.1.4.2.15\build\native\Libjpeg-Turbo.targets')" />
222226
</ImportGroup>
227+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
228+
<PropertyGroup>
229+
<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>
230+
</PropertyGroup>
231+
<Error Condition="!Exists('..\packages\Libjpeg-Turbo.1.4.2.15\build\native\Libjpeg-Turbo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Libjpeg-Turbo.1.4.2.15\build\native\Libjpeg-Turbo.targets'))" />
232+
</Target>
223233
</Project>

‎RemoteDesktop_ServerGateway/packages.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Libjpeg-Turbo" version="1.4.2.15" targetFramework="native" />
4+
</packages>

0 commit comments

Comments
 (0)