Skip to content

Commit df5d301

Browse files
michaelrsweetmichaelrsweet
committed
Try getting Windows code to build with NuGet libraries...
1 parent 77bec3f commit df5d301

File tree

6 files changed

+43
-69
lines changed

6 files changed

+43
-69
lines changed

‎vcnet/ghtmldoc.vcxproj‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -384,18 +384,6 @@
384384
<Project>{287d2fb4-9941-4b64-b973-55a6ec04eafc}</Project>
385385
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
386386
</ProjectReference>
387-
<ProjectReference Include="jpeg.vcxproj">
388-
<Project>{07169a72-08a9-4ec8-bc6c-ccbc1f01ea58}</Project>
389-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
390-
</ProjectReference>
391-
<ProjectReference Include="libpng.vcxproj">
392-
<Project>{1132a142-f8a1-4464-881c-7f50d77a1cd2}</Project>
393-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
394-
</ProjectReference>
395-
<ProjectReference Include="zlib.vcxproj">
396-
<Project>{f4b8b6f3-8198-4fc3-92a3-c944644b570a}</Project>
397-
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
398-
</ProjectReference>
399387
</ItemGroup>
400388
<ItemGroup>
401389
<None Include="packages.config" />

‎vcnet/htmldoc-installer.aip‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
2-
<DOCUMENT Type="Advanced Installer" CreateVersion="15.3" version="17.4" Modules="simple" RootPath="." Language="en" Id="{8101414C-E32A-4865-B7D9-ABB4FFFB336F}">
2+
<DOCUMENT Type="Advanced Installer" CreateVersion="15.3" version="18.2" Modules="simple" RootPath="." Language="en" Id="{8101414C-E32A-4865-B7D9-ABB4FFFB336F}">
33
<COMPONENT cid="caphyon.advinst.msicomp.MsiPropsComponent">
44
<ROW Property="AI_BITMAP_DISPLAY_MODE" Value="0"/>
5+
<ROW Property="AI_CURRENT_YEAR" Value="2021" ValueLocId="-"/>
56
<ROW Property="AI_PROPPATH_DIR_PERBUILD_ghtmldoc.exe" Value="x64\Release\ghtmldoc"/>
67
<ROW Property="AI_PROPPATH_DIR_PERBUILD_htmldoc.exe" Value="x64\Release\htmldoc"/>
78
<ROW Property="AI_PROPPATH_FILENAME_PERBUILD_ghtmldoc.exe" Value="ghtmldoc.exe"/>
@@ -13,10 +14,10 @@
1314
<ROW Property="ARPPRODUCTICON" Value="htmldoc.exe" Type="8"/>
1415
<ROW Property="ARPURLINFOABOUT" Value="https://www.msweet.org/htmldoc"/>
1516
<ROW Property="Manufacturer" Value="Michael R Sweet"/>
16-
<ROW Property="ProductCode" Value="1033:{B677E9E6-1277-4EAC-B5F9-9D7FF0FB7F53} " Type="16"/>
17+
<ROW Property="ProductCode" Value="1033:{4B1F115F-B6D6-4D95-A780-EC50A67251FE} " Type="16"/>
1718
<ROW Property="ProductLanguage" Value="1033"/>
1819
<ROW Property="ProductName" Value="HTMLDOC"/>
19-
<ROW Property="ProductVersion" Value="1.9.10.0" Type="32"/>
20+
<ROW Property="ProductVersion" Value="1.9.12.0" Type="32"/>
2021
<ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND"/>
2122
<ROW Property="UpgradeCode" Value="{4016A37E-404B-4785-B768-D4FF161DE6E9}"/>
2223
<ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>

‎vcnet/htmldoc.sln‎

Lines changed: 0 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ghtmldoc", "ghtmldoc.vcxpro
66
EndProject
77
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "htmldoc", "htmldoc.vcxproj", "{287D2FB4-9941-4B64-B973-55A6EC04EAFC}"
88
EndProject
9-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "jpeg", "jpeg.vcxproj", "{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}"
10-
EndProject
11-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libpng", "libpng.vcxproj", "{1132A142-F8A1-4464-881C-7F50D77A1CD2}"
12-
EndProject
13-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "zlib.vcxproj", "{F4B8B6F3-8198-4FC3-92A3-C944644B570A}"
14-
EndProject
159
Project("{840C416C-B8F3-42BC-B0DD-F6BB14C9F8CB}") = "htmldoc-installer", "htmldoc-installer.aiproj", "{D89318D0-BC34-4D85-A73D-2580C6B30CA8}"
1610
EndProject
1711
Global
@@ -58,54 +52,6 @@ Global
5852
{287D2FB4-9941-4B64-B973-55A6EC04EAFC}.Release|Win32.Build.0 = Release|Win32
5953
{287D2FB4-9941-4B64-B973-55A6EC04EAFC}.Release|x64.ActiveCfg = Release|x64
6054
{287D2FB4-9941-4B64-B973-55A6EC04EAFC}.Release|x64.Build.0 = Release|x64
61-
{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.All|Win32.ActiveCfg = Release|Win32
62-
{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.All|Win32.Build.0 = Release|Win32
63-
{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.All|x64.ActiveCfg = Release|x64
64-
{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.All|x64.Build.0 = Release|x64
65-
{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.Debug|Win32.ActiveCfg = Debug|Win32
66-
{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.Debug|Win32.Build.0 = Debug|Win32
67-
{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.Debug|x64.ActiveCfg = Debug|x64
68-
{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.Debug|x64.Build.0 = Debug|x64
69-
{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.DefaultBuild|Win32.ActiveCfg = Debug|Win32
70-
{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.DefaultBuild|Win32.Build.0 = Debug|Win32
71-
{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.DefaultBuild|x64.ActiveCfg = Debug|x64
72-
{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.DefaultBuild|x64.Build.0 = Debug|x64
73-
{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.Release|Win32.ActiveCfg = Release|Win32
74-
{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.Release|Win32.Build.0 = Release|Win32
75-
{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.Release|x64.ActiveCfg = Release|x64
76-
{07169A72-08A9-4EC8-BC6C-CCBC1F01EA58}.Release|x64.Build.0 = Release|x64
77-
{1132A142-F8A1-4464-881C-7F50D77A1CD2}.All|Win32.ActiveCfg = Release|Win32
78-
{1132A142-F8A1-4464-881C-7F50D77A1CD2}.All|Win32.Build.0 = Release|Win32
79-
{1132A142-F8A1-4464-881C-7F50D77A1CD2}.All|x64.ActiveCfg = Release|x64
80-
{1132A142-F8A1-4464-881C-7F50D77A1CD2}.All|x64.Build.0 = Release|x64
81-
{1132A142-F8A1-4464-881C-7F50D77A1CD2}.Debug|Win32.ActiveCfg = Debug|Win32
82-
{1132A142-F8A1-4464-881C-7F50D77A1CD2}.Debug|Win32.Build.0 = Debug|Win32
83-
{1132A142-F8A1-4464-881C-7F50D77A1CD2}.Debug|x64.ActiveCfg = Debug|x64
84-
{1132A142-F8A1-4464-881C-7F50D77A1CD2}.Debug|x64.Build.0 = Debug|x64
85-
{1132A142-F8A1-4464-881C-7F50D77A1CD2}.DefaultBuild|Win32.ActiveCfg = Debug|Win32
86-
{1132A142-F8A1-4464-881C-7F50D77A1CD2}.DefaultBuild|Win32.Build.0 = Debug|Win32
87-
{1132A142-F8A1-4464-881C-7F50D77A1CD2}.DefaultBuild|x64.ActiveCfg = Debug|x64
88-
{1132A142-F8A1-4464-881C-7F50D77A1CD2}.DefaultBuild|x64.Build.0 = Debug|x64
89-
{1132A142-F8A1-4464-881C-7F50D77A1CD2}.Release|Win32.ActiveCfg = Release|Win32
90-
{1132A142-F8A1-4464-881C-7F50D77A1CD2}.Release|Win32.Build.0 = Release|Win32
91-
{1132A142-F8A1-4464-881C-7F50D77A1CD2}.Release|x64.ActiveCfg = Release|x64
92-
{1132A142-F8A1-4464-881C-7F50D77A1CD2}.Release|x64.Build.0 = Release|x64
93-
{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.All|Win32.ActiveCfg = Release|Win32
94-
{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.All|Win32.Build.0 = Release|Win32
95-
{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.All|x64.ActiveCfg = Release|x64
96-
{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.All|x64.Build.0 = Release|x64
97-
{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.Debug|Win32.ActiveCfg = Debug|Win32
98-
{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.Debug|Win32.Build.0 = Debug|Win32
99-
{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.Debug|x64.ActiveCfg = Debug|x64
100-
{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.Debug|x64.Build.0 = Debug|x64
101-
{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.DefaultBuild|Win32.ActiveCfg = Debug|Win32
102-
{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.DefaultBuild|Win32.Build.0 = Debug|Win32
103-
{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.DefaultBuild|x64.ActiveCfg = Debug|x64
104-
{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.DefaultBuild|x64.Build.0 = Debug|x64
105-
{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.Release|Win32.ActiveCfg = Release|Win32
106-
{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.Release|Win32.Build.0 = Release|Win32
107-
{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.Release|x64.ActiveCfg = Release|x64
108-
{F4B8B6F3-8198-4FC3-92A3-C944644B570A}.Release|x64.Build.0 = Release|x64
10955
{D89318D0-BC34-4D85-A73D-2580C6B30CA8}.All|Win32.ActiveCfg = DefaultBuild
11056
{D89318D0-BC34-4D85-A73D-2580C6B30CA8}.All|Win32.Build.0 = DefaultBuild
11157
{D89318D0-BC34-4D85-A73D-2580C6B30CA8}.All|x64.ActiveCfg = DefaultBuild

‎vcnet/htmldoc.vcxproj‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
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\YY.NuGet.Import.Helper.1.0.0.4\build\native\YY.NuGet.Import.Helper.props" Condition="Exists('packages\YY.NuGet.Import.Helper.1.0.0.4\build\native\YY.NuGet.Import.Helper.props')" />
4+
<Import Project="packages\libjpeg-turbo-v142.2.0.4.3\build\native\libjpeg-turbo-v142.props" Condition="Exists('packages\libjpeg-turbo-v142.2.0.4.3\build\native\libjpeg-turbo-v142.props')" />
35
<ItemGroup Label="ProjectConfigurations">
46
<ProjectConfiguration Include="Debug|Win32">
57
<Configuration>Debug</Configuration>
@@ -407,7 +409,26 @@
407409
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
408410
</ProjectReference>
409411
</ItemGroup>
412+
<ItemGroup>
413+
<None Include="packages.config" />
414+
</ItemGroup>
415+
<ItemGroup>
416+
<Text Include="any\any\zlib.static.txt" />
417+
</ItemGroup>
410418
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
411419
<ImportGroup Label="ExtensionTargets">
420+
<Import Project="packages\libpng-msvc-x64.1.6.33.8807\build\native\libpng-msvc-x64.targets" Condition="Exists('packages\libpng-msvc-x64.1.6.33.8807\build\native\libpng-msvc-x64.targets')" />
421+
<Import Project="packages\YY.NuGet.Import.Helper.1.0.0.4\build\native\YY.NuGet.Import.Helper.targets" Condition="Exists('packages\YY.NuGet.Import.Helper.1.0.0.4\build\native\YY.NuGet.Import.Helper.targets')" />
422+
<Import Project="packages\zlib.static.1.2.5\build\native\zlib.static.targets" Condition="Exists('packages\zlib.static.1.2.5\build\native\zlib.static.targets')" />
412423
</ImportGroup>
424+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
425+
<PropertyGroup>
426+
<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>
427+
</PropertyGroup>
428+
<Error Condition="!Exists('packages\libpng-msvc-x64.1.6.33.8807\build\native\libpng-msvc-x64.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\libpng-msvc-x64.1.6.33.8807\build\native\libpng-msvc-x64.targets'))" />
429+
<Error Condition="!Exists('packages\libjpeg-turbo-v142.2.0.4.3\build\native\libjpeg-turbo-v142.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\libjpeg-turbo-v142.2.0.4.3\build\native\libjpeg-turbo-v142.props'))" />
430+
<Error Condition="!Exists('packages\YY.NuGet.Import.Helper.1.0.0.4\build\native\YY.NuGet.Import.Helper.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\YY.NuGet.Import.Helper.1.0.0.4\build\native\YY.NuGet.Import.Helper.props'))" />
431+
<Error Condition="!Exists('packages\YY.NuGet.Import.Helper.1.0.0.4\build\native\YY.NuGet.Import.Helper.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\YY.NuGet.Import.Helper.1.0.0.4\build\native\YY.NuGet.Import.Helper.targets'))" />
432+
<Error Condition="!Exists('packages\zlib.static.1.2.5\build\native\zlib.static.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\zlib.static.1.2.5\build\native\zlib.static.targets'))" />
433+
</Target>
413434
</Project>

‎vcnet/htmldoc.vcxproj.filters‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,12 @@
99
<UniqueIdentifier>{6d5f0e2e-804d-4c00-8307-6021e69f7392}</UniqueIdentifier>
1010
<Extensions>h</Extensions>
1111
</Filter>
12+
<Filter Include="any">
13+
<UniqueIdentifier>{41307285-61d1-4816-bca7-9a81137643fa}</UniqueIdentifier>
14+
</Filter>
15+
<Filter Include="any\any">
16+
<UniqueIdentifier>{9b98c423-450f-4ef5-a796-f2ac58688dd8}</UniqueIdentifier>
17+
</Filter>
1218
</ItemGroup>
1319
<ItemGroup>
1420
<ClCompile Include="..\htmldoc\file.c">
@@ -131,4 +137,12 @@
131137
<Filter>Headers</Filter>
132138
</ClInclude>
133139
</ItemGroup>
140+
<ItemGroup>
141+
<None Include="packages.config" />
142+
</ItemGroup>
143+
<ItemGroup>
144+
<Text Include="any\any\zlib.static.txt">
145+
<Filter>any\any</Filter>
146+
</Text>
147+
</ItemGroup>
134148
</Project>

‎vcnet/packages.config‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="fltk" version="1.3.3.33" targetFramework="native" />
4+
<package id="libjpeg-turbo-v142" version="2.0.4.3" targetFramework="native" />
5+
<package id="libpng-msvc-x64" version="1.6.33.8807" targetFramework="native" />
6+
<package id="YY.NuGet.Import.Helper" version="1.0.0.4" targetFramework="native" />
7+
<package id="zlib.static" version="1.2.5" targetFramework="native" />
48
</packages>

0 commit comments

Comments
 (0)