Skip to content

Include minizip's headers in the nuget pkg#7

Merged
BillHoag merged 3 commits intovs2017from
exposeMinizipHeaders
Jun 17, 2021
Merged

Include minizip's headers in the nuget pkg#7
BillHoag merged 3 commits intovs2017from
exposeMinizipHeaders

Conversation

@BillHoag
Copy link
Copy Markdown

@BillHoag BillHoag commented Jun 10, 2021

  • make minizip's headers available to consumers of the zlib nuget pkg
  • add param iMatchJustFileName to unzLocateFile ()

Zlib.autopkg Outdated
{
nestedInclude: { #destination=${d_include}Zlib; *.h };
nested2Include: { #destination=${d_include}Zlib; "*.h" };
nested1Include: { #destination=${d_include}contrib\minizip; "*.h" };
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not correct. It means that all headers should go under contrib\minizip
image
(BTW you can open up the nuget package with 7zip, no need to install the package)

Copy link
Copy Markdown

@David-Defoort David-Defoort Jun 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it should be something like (untested):

{ #destination=${d_include}Zlib\contrib\minizip; "contrib\minizip\*.h" };
                           ^

We want the contrib to go under Zlib, so that the consumer does:
#include <ZLib/contrib/minizip/ioapi.h>
instead of
#include <contrib/minizip/ioapi.h> <<<< not Zlib specific, it does not look good.

Copy link
Copy Markdown
Author

@BillHoag BillHoag Jun 11, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤦 I thought I saw the correct ones there before - I'm sorry waste your time with this one. Re 7zip, yeah, I've got *.nupkg associated with 7zip. Fixed nupkg is here. Corrected autopkg has been force pushed.

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the update and np on me trying out that version. Will test it on Monday!
Was it built on your machine?

One thing that I still have to look into is that pesky warning:
warning LNK4098: defaultlib 'libcmt.lib' conflicts with use of other libs; use /NODEFAULTLIB:library
Not exactly sure what project is "at fault" and how I can solve this but I will look on Monday

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, built on my machine. Time permitting, I'll try your branch and this nupkg on my branch today, and see if I can learn anything about that warning.

Copy link
Copy Markdown

@David-Defoort David-Defoort left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The resulting nuget package does not have the files that we need ioapi.h and unzip.h

@BillHoag BillHoag force-pushed the exposeMinizipHeaders branch from 69679e3 to 15b51e2 Compare June 11, 2021 11:41
{
nestedInclude: { #destination=${d_include}Zlib; *.h };
nested2Include: { #destination=${d_include}Zlib; "*.h" };
nested1Include: { #destination=${d_include}Zlib\contrib\minizip; "contrib\minizip\*.h" };
Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Will test on Monday :)

Bill Hoag added 2 commits June 15, 2021 21:29
This is necessary so the minizip headers will be found by the compiler and
successfully compiled in SnagitWin when using the zlib NuGet pkg.
@BillHoag BillHoag force-pushed the exposeMinizipHeaders branch 3 times, most recently from a45d440 to 8658568 Compare June 17, 2021 02:50
@David-Defoort David-Defoort changed the base branch from main to vs2017 June 17, 2021 13:02
@BillHoag BillHoag force-pushed the exposeMinizipHeaders branch from 8658568 to 98d3044 Compare June 17, 2021 13:39
@David-Defoort
Copy link
Copy Markdown

It all looks good. Used the nuget package that @BillHoag built locally and confirm this would work just fine in SnagitWin 👍

@BillHoag BillHoag merged commit 3a6d0d3 into vs2017 Jun 17, 2021
@BillHoag BillHoag deleted the exposeMinizipHeaders branch June 17, 2021 14:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants