Skip to content

Commit 0fa8f6b

Browse files
michaelrsweetmichaelrsweet
committed
Update dependencies.
1 parent 583f1e8 commit 0fa8f6b

9 files changed

Lines changed: 33 additions & 21 deletions

‎vcnet/cupstestppd.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
</Midl>
6262
<ClCompile>
6363
<Optimization>Disabled</Optimization>
64-
<AdditionalIncludeDirectories>..;..\vcnet;packages\libressl_native.3.7.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
64+
<AdditionalIncludeDirectories>..;..\vcnet;..\vcnet\regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6565
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6666
<MinimalRebuild>true</MinimalRebuild>
6767
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -83,7 +83,7 @@
8383
<TargetEnvironment>X64</TargetEnvironment>
8484
</Midl>
8585
<ClCompile>
86-
<AdditionalIncludeDirectories>..;..\vcnet;packages\libressl_native.3.7.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
86+
<AdditionalIncludeDirectories>..;..\vcnet;..\vcnet\regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8787
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8888
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
8989
<PrecompiledHeader />

‎vcnet/ippeveprinter.vcxproj‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="packages\libressl_native.3.7.3\build\native\libressl_native.props" Condition="Exists('packages\libressl_native.3.7.3\build\native\libressl_native.props')" />
34
<ItemGroup Label="ProjectConfigurations">
45
<ProjectConfiguration Include="Debug|x64">
56
<Configuration>Debug</Configuration>
@@ -33,8 +34,7 @@
3334
<CharacterSet>Unicode</CharacterSet>
3435
</PropertyGroup>
3536
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
36-
<ImportGroup Label="ExtensionSettings">
37-
</ImportGroup>
37+
<ImportGroup Label="ExtensionSettings" />
3838
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
3939
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
4040
</ImportGroup>
@@ -61,7 +61,7 @@
6161
</Midl>
6262
<ClCompile>
6363
<Optimization>Disabled</Optimization>
64-
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.7.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
64+
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6565
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6666
<MinimalRebuild>false</MinimalRebuild>
6767
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -84,7 +84,7 @@
8484
<TargetEnvironment>X64</TargetEnvironment>
8585
</Midl>
8686
<ClCompile>
87-
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.7.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
87+
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8888
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8989
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
9090
<PrecompiledHeader />
@@ -118,4 +118,10 @@
118118
<None Include="packages.config" />
119119
</ItemGroup>
120120
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
121+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
122+
<PropertyGroup>
123+
<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>
124+
</PropertyGroup>
125+
<Error Condition="!Exists('packages\libressl_native.3.7.3\build\native\libressl_native.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\libressl_native.3.7.3\build\native\libressl_native.props'))" />
126+
</Target>
121127
</Project>

‎vcnet/ippfind.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
</Midl>
6262
<ClCompile>
6363
<Optimization>Disabled</Optimization>
64-
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.7.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
64+
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6565
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6666
<MinimalRebuild>true</MinimalRebuild>
6767
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -84,7 +84,7 @@
8484
<TargetEnvironment>X64</TargetEnvironment>
8585
</Midl>
8686
<ClCompile>
87-
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.7.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
87+
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8888
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8989
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
9090
<PrecompiledHeader />

‎vcnet/ipptool.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
</Midl>
6262
<ClCompile>
6363
<Optimization>Disabled</Optimization>
64-
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.7.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
64+
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6565
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6666
<MinimalRebuild>true</MinimalRebuild>
6767
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -83,7 +83,7 @@
8383
<TargetEnvironment>X64</TargetEnvironment>
8484
</Midl>
8585
<ClCompile>
86-
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.7.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
86+
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8787
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8888
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
8989
<PrecompiledHeader />

‎vcnet/libcups2.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
</Midl>
6363
<ClCompile>
6464
<Optimization>Disabled</Optimization>
65-
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.7.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
65+
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6666
<PreprocessorDefinitions>DEBUG;_DEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6767
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
6868
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -88,7 +88,7 @@
8888
</Midl>
8989
<ClCompile>
9090
<Optimization>MinSpace</Optimization>
91-
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.7.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
91+
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9292
<PreprocessorDefinitions>DEBUG;NDEBUG;_WINDOWS;_USRDLL;LIBCUPS2_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
9393
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
9494
<PrecompiledHeader />

‎vcnet/libcups2.vcxproj.filters‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,6 @@
105105
<ClCompile Include="..\cups\request.c">
106106
<Filter>Source Files</Filter>
107107
</ClCompile>
108-
<ClCompile Include="..\cups\snprintf.c">
109-
<Filter>Source Files</Filter>
110-
</ClCompile>
111108
<ClCompile Include="..\cups\string.c">
112109
<Filter>Source Files</Filter>
113110
</ClCompile>
@@ -189,6 +186,12 @@
189186
<ClCompile Include="..\cups\rand.c">
190187
<Filter>Source Files</Filter>
191188
</ClCompile>
189+
<ClCompile Include="..\cups\clock.c">
190+
<Filter>Source Files</Filter>
191+
</ClCompile>
192+
<ClCompile Include="..\cups\oauth.c">
193+
<Filter>Source Files</Filter>
194+
</ClCompile>
192195
</ItemGroup>
193196
<ItemGroup>
194197
<None Include="..\cups\libcups2.def">
@@ -299,5 +302,8 @@
299302
<ClInclude Include="..\cups\base.h">
300303
<Filter>Header Files</Filter>
301304
</ClInclude>
305+
<ClInclude Include="..\cups\oauth.h">
306+
<Filter>Header Files</Filter>
307+
</ClInclude>
302308
</ItemGroup>
303309
</Project>

‎vcnet/packages.config‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="libressl_native" version="3.7.3.0" targetFramework="native" />
4-
<package id="libressl_native.redist" version="3.7.3.0" targetFramework="native" />
3+
<package id="libressl_native" version="4.0.0" targetFramework="native" />
4+
<package id="libressl_native.redist" version="4.0.0" targetFramework="native" />
55
<package id="zlib_native" version="1.2.11" targetFramework="native" />
66
<package id="zlib_native.redist" version="1.2.11" targetFramework="native" />
77
</packages>

‎vcnet/testfile.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
5959
<ClCompile>
6060
<Optimization>Disabled</Optimization>
61-
<AdditionalIncludeDirectories>..\vcnet;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
61+
<AdditionalIncludeDirectories>..\vcnet;..\vcnet\regex;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6262
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6363
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
6464
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -79,7 +79,7 @@
7979
</ItemDefinitionGroup>
8080
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8181
<ClCompile>
82-
<AdditionalIncludeDirectories>..\vcnet;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
82+
<AdditionalIncludeDirectories>..\vcnet;..\vcnet\regex;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8383
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8484
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
8585
<PrecompiledHeader>

‎vcnet/testhttp.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
5959
<ClCompile>
6060
<Optimization>Disabled</Optimization>
61-
<AdditionalIncludeDirectories>..\vcnet;..;packages\libressl_native.3.7.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
61+
<AdditionalIncludeDirectories>..\vcnet;..\vcnet\regex;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6262
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6363
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
6464
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -79,7 +79,7 @@
7979
</ItemDefinitionGroup>
8080
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
8181
<ClCompile>
82-
<AdditionalIncludeDirectories>..\vcnet;..;packages\libressl_native.3.7.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
82+
<AdditionalIncludeDirectories>..\vcnet;..\vcnet\regex;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8383
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8484
<RuntimeLibrary>MultiThreaded</RuntimeLibrary>
8585
<PrecompiledHeader>

0 commit comments

Comments
 (0)