Skip to content

Commit adbe3b8

Browse files
michaelrsweetmichaelrsweet
committed
Fix Windows build.
1 parent 17aa7d0 commit adbe3b8

File tree

6 files changed

+17
-18
lines changed

6 files changed

+17
-18
lines changed

‎vcnet/ipptool.vcxproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
</Midl>
5858
<ClCompile>
5959
<Optimization>Disabled</Optimization>
60-
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.7.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
60+
<AdditionalIncludeDirectories>..\pdfio;..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.7.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6161
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6262
<MinimalRebuild>true</MinimalRebuild>
6363
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -79,7 +79,7 @@
7979
<TargetEnvironment>X64</TargetEnvironment>
8080
</Midl>
8181
<ClCompile>
82-
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.7.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
82+
<AdditionalIncludeDirectories>..\pdfio;..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.7.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8383
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8484
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
8585
<PrecompiledHeader />
@@ -100,6 +100,9 @@
100100
<ClCompile Include="..\tools\ipptool.c" />
101101
</ItemGroup>
102102
<ItemGroup>
103+
<ProjectReference Include="..\pdfio\pdfio.vcxproj">
104+
<Project>{98f2de9e-2978-4387-af71-82532bedb29e}</Project>
105+
</ProjectReference>
103106
<ProjectReference Include="libcups3.vcxproj">
104107
<Project>{cb4aa6f2-3e84-45be-b505-95cd375e8be3}</Project>
105108
</ProjectReference>

‎vcnet/ipptransform.vcxproj‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
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\pdfio_native.1.2.0\build\native\pdfio_native.props" Condition="Exists('packages\pdfio_native.1.2.0\build\native\pdfio_native.props')" />
43
<ItemGroup Label="ProjectConfigurations">
54
<ProjectConfiguration Include="Debug|x64">
65
<Configuration>Debug</Configuration>
@@ -58,7 +57,7 @@
5857
</Midl>
5958
<ClCompile>
6059
<Optimization>Disabled</Optimization>
61-
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.7.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
60+
<AdditionalIncludeDirectories>..\pdfio;..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.7.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
6261
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
6362
<MinimalRebuild>true</MinimalRebuild>
6463
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -80,7 +79,7 @@
8079
<TargetEnvironment>X64</TargetEnvironment>
8180
</Midl>
8281
<ClCompile>
83-
<AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.7.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
82+
<AdditionalIncludeDirectories>..\pdfio;..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.7.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8483
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
8584
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
8685
<PrecompiledHeader />
@@ -105,6 +104,9 @@
105104
<ClInclude Include="..\tools\ipp-options.h" />
106105
</ItemGroup>
107106
<ItemGroup>
107+
<ProjectReference Include="..\pdfio\pdfio.vcxproj">
108+
<Project>{98f2de9e-2978-4387-af71-82532bedb29e}</Project>
109+
</ProjectReference>
108110
<ProjectReference Include="libcups3.vcxproj">
109111
<Project>{cb4aa6f2-3e84-45be-b505-95cd375e8be3}</Project>
110112
</ProjectReference>
@@ -121,10 +123,4 @@
121123
<Import Project="packages\zlib_native.redist.1.2.11\build\native\zlib_native.redist.targets" Condition="Exists('packages\zlib_native.redist.1.2.11\build\native\zlib_native.redist.targets')" />
122124
<Import Project="packages\zlib_native.1.2.11\build\native\zlib_native.targets" Condition="Exists('packages\zlib_native.1.2.11\build\native\zlib_native.targets')" />
123125
</ImportGroup>
124-
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
125-
<PropertyGroup>
126-
<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>
127-
</PropertyGroup>
128-
<Error Condition="!Exists('packages\pdfio_native.1.2.0\build\native\pdfio_native.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\pdfio_native.1.2.0\build\native\pdfio_native.props'))" />
129-
</Target>
130126
</Project>

‎vcnet/libcups.sln‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ EndProject
2121
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ipptool", "ipptool.vcxproj", "{B246D91E-61F2-4433-BFD2-6C2A96FBD4D4}"
2222
ProjectSection(ProjectDependencies) = postProject
2323
{C0899B3A-43E7-4BC3-A785-659E1FD2EA83} = {C0899B3A-43E7-4BC3-A785-659E1FD2EA83}
24+
{98F2DE9E-2978-4387-AF71-82532BEDB29E} = {98F2DE9E-2978-4387-AF71-82532BEDB29E}
2425
EndProjectSection
2526
EndProject
2627
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ipptransform", "ipptransform.vcxproj", "{54A05B7D-E945-459B-B05A-3B37AB5B1154}"

‎vcnet/libcups3_native.nuspec‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
<id>libcups3_native</id>
55
<title>OpenPrinting CUPS Library for VS2019+</title>
6-
<version>3.0.0</version>
6+
<version>3.0.0.0</version>
77
<authors>Michael R Sweet, OpenPrinting</authors>
88
<owners>michaelrsweet</owners>
99
<projectUrl>https://github.com/OpenPrinting/cups</projectUrl>
@@ -12,10 +12,10 @@
1212
<readme>build/native/README.md</readme>
1313
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1414
<description>OpenPrinting CUPS is a standards-based, open source printing system for Linux® and other Unix®-like operating systems. The CUPS library provides a convenient API for communicating with Internet Printing Protocol printers. CUPS is licensed under the Apache License Version 2.0 with an exception to allow linking against GNU GPL2-only software.</description>
15-
<copyright>Copyright © 2020-2023 by OpenPrinting, Copyright © 2007-2019 by Apple Inc., Copyright © 1997-2007 by Easy Software Products.</copyright>
15+
<copyright>Copyright © 2020-2024 by OpenPrinting, Copyright © 2007-2019 by Apple Inc., Copyright © 1997-2007 by Easy Software Products.</copyright>
1616
<tags>http ipp native</tags>
1717
<dependencies>
18-
<dependency id="libcups3_native.redist" version="3.0.0" />
18+
<dependency id="libcups3_native.redist" version="3.0.0.0" />
1919
</dependencies>
2020
</metadata>
2121
<files>
@@ -34,6 +34,7 @@
3434
<file src="..\cups\json.h" target="build\native\include\cups" />
3535
<file src="..\cups\jwt.h" target="build\native\include\cups" />
3636
<file src="..\cups\language.h" target="build\native\include\cups" />
37+
<file src="..\cups\oauth.h" target="build\native\include\cups" />
3738
<file src="..\cups\pwg.h" target="build\native\include\cups" />
3839
<file src="..\cups\raster.h" target="build\native\include\cups" />
3940
<file src="..\cups\thread.h" target="build\native\include\cups" />

‎vcnet/libcups3_native.redist.nuspec‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<metadata>
44
<id>libcups3_native.redist</id>
55
<title>OpenPrinting CUPS Library for VS2019+ Redist</title>
6-
<version>3.0.0</version>
6+
<version>3.0.0.0</version>
77
<authors>Michael R Sweet, OpenPrinting</authors>
88
<owners>michaelrsweet</owners>
99
<projectUrl>https://github.com/OpenPrinting/cups</projectUrl>
@@ -12,7 +12,7 @@
1212
<readme>build/native/README.md</readme>
1313
<requireLicenseAcceptance>false</requireLicenseAcceptance>
1414
<description>OpenPrinting CUPS is a standards-based, open source printing system for Linux® and other Unix®-like operating systems. This package provides the redistributable content for the CUPS library. CUPS is licensed under the Apache License Version 2.0 with an exception to allow linking against GNU GPL2-only software.</description>
15-
<copyright>Copyright © 2020-2023 by OpenPrinting, Copyright © 2007-2019 by Apple Inc., Copyright © 1997-2007 by Easy Software Products.</copyright>
15+
<copyright>Copyright © 2020-2024 by OpenPrinting, Copyright © 2007-2019 by Apple Inc., Copyright © 1997-2007 by Easy Software Products.</copyright>
1616
<tags>http ipp native</tags>
1717
<dependencies>
1818
<dependency id="zlib_native.redist" version="1.2.11" />

‎vcnet/packages.config‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
<packages>
33
<package id="libressl_native" version="3.7.3.0" targetFramework="native" />
44
<package id="libressl_native.redist" version="3.7.3.0" targetFramework="native" />
5-
<package id="pdfio_native" version="1.2.0" targetFramework="native" />
6-
<package id="pdfio_native.redist" version="1.2.0" targetFramework="native" />
75
<package id="zlib_native" version="1.2.11" targetFramework="native" />
86
<package id="zlib_native.redist" version="1.2.11" targetFramework="native" />
97
</packages>

0 commit comments

Comments
 (0)