Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Include minizip's headers in the nuget pkg #7

Merged
merged 3 commits into from
Jun 17, 2021
Merged

Include minizip's headers in the nuget pkg #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6a3924
Use relative paths for zlib includes in minizip
Jun 16, 2021
4091dfd
Include minizip's headers in the nuget pkg
Jun 16, 2021
98d3044
Rev version to 1.2.11.3
Jun 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions Zlib.autopkg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ nuget
nuspec
{
id = zlib-tsc-package;
version: 1.2.11.2;
version: 1.2.11.3;
title: zlib compression library;
authors: { TechSmith Corporation, Jean-loup Gailly, Mark Adler };
owners: { TechSmith Corporation };
Expand All @@ -22,18 +22,22 @@ nuget
summary: @"Zlib Compression Library for use in TechSmith products";
description: @"Zlib is a compression library written in C.
New features:
Breaking changes:
Bug fixes:
Misc:
- Updated toolset to v141 for Visual Studio 2017
Breaking changes:
Changes:
- 1.2.11.3 Include contrib/minizip header files
- 1.2.11.2 Updated toolset to v141 for Visual Studio 2017
- 1.2.11.1 Removed ASMV & ASMINF from Release
- 1.2.11 Initial version
";
copyright: @"Copyright (c) 2018.";
tags: { zlib, CoApp, compression, vs2017, native };
};

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

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 :)

libpdb: { #destination=${d_lib}; };
("Win32", "v141", "Debug,Release") =>
{
Expand Down Expand Up @@ -72,4 +76,4 @@ nuget
// package. Such defines may be set either globally or only set under specific
// conditions.
}
}
}
2 changes: 1 addition & 1 deletion contrib/minizip/ioapi.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

#include <stdio.h>
#include <stdlib.h>
#include "zlib.h"
#include "../../zlib.h"

#if defined(USE_FILE32API)
#define fopen64 fopen
Expand Down
2 changes: 1 addition & 1 deletion contrib/minizip/mztools.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ extern "C" {
#endif

#ifndef _ZLIB_H
#include "zlib.h"
#include "../../zlib.h"
#endif

#include "unzip.h"
Expand Down
2 changes: 1 addition & 1 deletion contrib/minizip/unzip.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ extern "C" {
#endif

#ifndef _ZLIB_H
#include "zlib.h"
#include "../../zlib.h"
#endif

#ifndef _ZLIBIOAPI_H
Expand Down
2 changes: 1 addition & 1 deletion contrib/minizip/zip.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ extern "C" {
//#define HAVE_BZIP2

#ifndef _ZLIB_H
#include "zlib.h"
#include "../../zlib.h"
#endif

#ifndef _ZLIBIOAPI_H
Expand Down