Fix Windows build.

OpenPrinting · Sep 20, 2024 · adbe3b8 · adbe3b8
1 parent 17aa7d0
commit adbe3b8
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 18 deletions.
diff --git a/vcnet/ipptool.vcxproj b/vcnet/ipptool.vcxproj
@@ -57,7 +57,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.7.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\pdfio;..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.7.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -79,7 +79,7 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.7.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\pdfio;..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.7.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader />
@@ -100,6 +100,9 @@
     <ClCompile Include="..\tools\ipptool.c" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\pdfio\pdfio.vcxproj">
+      <Project>{98f2de9e-2978-4387-af71-82532bedb29e}</Project>
+    </ProjectReference>
     <ProjectReference Include="libcups3.vcxproj">
       <Project>{cb4aa6f2-3e84-45be-b505-95cd375e8be3}</Project>
     </ProjectReference>

diff --git a/vcnet/ipptransform.vcxproj b/vcnet/ipptransform.vcxproj
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <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')" />
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|x64">
       <Configuration>Debug</Configuration>
@@ -58,7 +57,7 @@
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.7.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\pdfio;..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.7.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MinimalRebuild>true</MinimalRebuild>
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@@ -80,7 +79,7 @@
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
     <ClCompile>
-      <AdditionalIncludeDirectories>..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.7.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>..\pdfio;..\vcnet;..;..\vcnet\regex;packages\libressl_native.3.7.3\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <PrecompiledHeader />
@@ -105,6 +104,9 @@
     <ClInclude Include="..\tools\ipp-options.h" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\pdfio\pdfio.vcxproj">
+      <Project>{98f2de9e-2978-4387-af71-82532bedb29e}</Project>
+    </ProjectReference>
     <ProjectReference Include="libcups3.vcxproj">
       <Project>{cb4aa6f2-3e84-45be-b505-95cd375e8be3}</Project>
     </ProjectReference>
@@ -121,10 +123,4 @@
     <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')" />
     <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')" />
   </ImportGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <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>
-    </PropertyGroup>
-    <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'))" />
-  </Target>
 </Project>
diff --git a/vcnet/libcups.sln b/vcnet/libcups.sln
@@ -21,6 +21,7 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ipptool", "ipptool.vcxproj", "{B246D91E-61F2-4433-BFD2-6C2A96FBD4D4}"
 	ProjectSection(ProjectDependencies) = postProject
 		{C0899B3A-43E7-4BC3-A785-659E1FD2EA83} = {C0899B3A-43E7-4BC3-A785-659E1FD2EA83}
+		{98F2DE9E-2978-4387-AF71-82532BEDB29E} = {98F2DE9E-2978-4387-AF71-82532BEDB29E}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ipptransform", "ipptransform.vcxproj", "{54A05B7D-E945-459B-B05A-3B37AB5B1154}"

diff --git a/vcnet/libcups3_native.nuspec b/vcnet/libcups3_native.nuspec
@@ -3,7 +3,7 @@
     <metadata>
         <id>libcups3_native</id>
         <title>OpenPrinting CUPS Library for VS2019+</title>
-        <version>3.0.0</version>
+        <version>3.0.0.0</version>
         <authors>Michael R Sweet, OpenPrinting</authors>
         <owners>michaelrsweet</owners>
         <projectUrl>https://github.com/OpenPrinting/cups</projectUrl>
@@ -12,10 +12,10 @@
         <readme>build/native/README.md</readme>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <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>
-        <copyright>Copyright © 2020-2023 by OpenPrinting, Copyright © 2007-2019 by Apple Inc., Copyright © 1997-2007 by Easy Software Products.</copyright>
+        <copyright>Copyright © 2020-2024 by OpenPrinting, Copyright © 2007-2019 by Apple Inc., Copyright © 1997-2007 by Easy Software Products.</copyright>
         <tags>http ipp native</tags>
 	<dependencies>
-	    <dependency id="libcups3_native.redist" version="3.0.0" />
+	    <dependency id="libcups3_native.redist" version="3.0.0.0" />
 	</dependencies>
     </metadata>
     <files>
@@ -34,6 +34,7 @@
         <file src="..\cups\json.h" target="build\native\include\cups" />
         <file src="..\cups\jwt.h" target="build\native\include\cups" />
         <file src="..\cups\language.h" target="build\native\include\cups" />
+        <file src="..\cups\oauth.h" target="build\native\include\cups" />
         <file src="..\cups\pwg.h" target="build\native\include\cups" />
         <file src="..\cups\raster.h" target="build\native\include\cups" />
         <file src="..\cups\thread.h" target="build\native\include\cups" />

diff --git a/vcnet/libcups3_native.redist.nuspec b/vcnet/libcups3_native.redist.nuspec
@@ -3,7 +3,7 @@
     <metadata>
         <id>libcups3_native.redist</id>
         <title>OpenPrinting CUPS Library for VS2019+ Redist</title>
-        <version>3.0.0</version>
+        <version>3.0.0.0</version>
         <authors>Michael R Sweet, OpenPrinting</authors>
         <owners>michaelrsweet</owners>
         <projectUrl>https://github.com/OpenPrinting/cups</projectUrl>
@@ -12,7 +12,7 @@
         <readme>build/native/README.md</readme>
         <requireLicenseAcceptance>false</requireLicenseAcceptance>
         <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>
-        <copyright>Copyright © 2020-2023 by OpenPrinting, Copyright © 2007-2019 by Apple Inc., Copyright © 1997-2007 by Easy Software Products.</copyright>
+        <copyright>Copyright © 2020-2024 by OpenPrinting, Copyright © 2007-2019 by Apple Inc., Copyright © 1997-2007 by Easy Software Products.</copyright>
         <tags>http ipp native</tags>
 	<dependencies>
 	    <dependency id="zlib_native.redist" version="1.2.11" />

diff --git a/vcnet/packages.config b/vcnet/packages.config
@@ -2,8 +2,6 @@
 <packages>
   <package id="libressl_native" version="3.7.3.0" targetFramework="native" />
   <package id="libressl_native.redist" version="3.7.3.0" targetFramework="native" />
-  <package id="pdfio_native" version="1.2.0" targetFramework="native" />
-  <package id="pdfio_native.redist" version="1.2.0" targetFramework="native" />
   <package id="zlib_native" version="1.2.11" targetFramework="native" />
   <package id="zlib_native.redist" version="1.2.11" targetFramework="native" />
 </packages>