Commit Graph

249 Commits

Author SHA1 Message Date
jeremyl
a0dd5179db Add #elif to enable an external mz_crc32() to be linked in.
Adds '#elif defined(USE_EXTERNAL_MZCRC)' by the mz_crc32() definition
to enable the option of a user linking in an alternate crc implementation.

The main reason why this might be desired would be to use an SSE-accelerated
crc implementaiton, which would be faster, but not be reasonable to include
in this file.
2019-10-09 11:30:50 -07:00
Martin Raiber
107def8e36 Merge pull request #140 from dandrader/fixLfsCheck
Fix LFS check
2019-10-06 18:02:54 +02:00
Daniel d'Andrada
334e0d64ce Fix LFS check
Code should check for__USE_LARGEFILE64, not _LARGEFILE64_SOURCE

_LARGEFILE64_SOURCE should be used only for setting a preference
when compiling code (either explicitly or by the compiler itself).
Then, according to its value, features.h will take care define things
like __USE_LARGEFILE64 appropriately.

As a side-effect, this patch adds support for clang. When building
with clang one has to explicitly define _LARGEFILE64_SOURCE if he
want to use the *64 api.
2019-10-04 14:11:18 +02:00
Martin Raiber
0238ce2a3b Merge pull request #139 from andiwand/cmake-use-current-directories
use CMAKE_CURRENT_* directories
2019-10-01 13:38:34 +02:00
Andreas Stefl
cd99affed0 use CMAKE_CURRENT_* directories 2019-09-26 20:03:00 +02:00
Martin Raiber
bee490c712 Merge pull request #137 from dandrader/locateFileBool
mz_zip_reader_locate_file_v2 returns an mz_bool
2019-09-24 13:13:12 +02:00
Daniel d'Andrada
6ed35304fe mz_zip_reader_locate_file_v2 returns an mz_bool 2019-09-24 10:48:48 +02:00
Martin Raiber
e0c964c4a3 Merge pull request #135 from tamasmeszaros/cmake-dynlib
Add include location tolerance and stop forcing _GNU_SOURCE
2019-06-11 20:50:10 +02:00
tamasmeszaros
416f5ea723 Add include location tolerance and stop forcing _GNU_SOURCE.
_GNU_SOURCE will still be enabled if building static or shared library, but only as a PRIVATE compile definition. It will not leak into targets using miniz.
2019-06-04 09:38:33 +02:00
tamasmeszaros
e8ab1c9a6d Fix for misleading doc comment on mz_zip_reader_init_cfile function. 2019-06-03 15:48:11 +02:00
Martin Raiber
e71344bdd7 Merge pull request #134 from tamasmeszaros/cmake-dynlib
Support installation of amalgamated sources
2019-06-03 15:11:49 +02:00
tamasmeszaros
3b9a004a4f Create export script for amalgamated sources with correct version info.
Also added _GNU_SOURCE to on GNU compilers to support large files.
2019-06-03 10:44:40 +02:00
tamasmeszaros
d57872c77a Fix for older cmake versions and build of examples. 2019-06-03 10:02:13 +02:00
Martin Raiber
b713ca2b4a Merge pull request #132 from tamasmeszaros/cmake-dynlib
Use CMake export header for exporting symbols.
2019-06-02 21:30:46 +02:00
tamasmeszaros
185bc3c683 Use CMake export header for exporting symbols.
Only in shared library mode.
2019-05-28 11:57:37 +02:00
Martin Raiber
ff06fbaafc Merge pull request #131 from tamasmeszaros/cmake-dynlib
Modified cmake script to support shared library mode and find_package.
2019-05-27 18:10:45 +02:00
tamasmeszaros
1261dfa9ad Modified cmake script to support shared library mode and find_package. 2019-05-27 14:16:27 +02:00
Martin Raiber
ea41268ac9 Merge pull request #129 from rbsheth/cmake_updates
CMake updates and CMake-based amalgamation step
2019-05-23 19:55:02 +02:00
Rahul Sheth
c3e5de6699 remove bash-specific amalgamation code 2019-05-22 19:52:19 -04:00
Rahul Sheth
a3aeeb3307 fix examples with amalgamation 2019-05-22 19:25:54 -04:00
Rahul Sheth
4ec19d6731 Initial CMake update 2019-05-22 19:17:28 -04:00
Martin
a4264837ae Fix type issue 2.1.0 2019-04-11 02:35:18 +02:00
Martin
b4936524bc Update ChangeLog 2019-03-31 14:40:12 +02:00
Martin Raiber
e9020723b3 Merge pull request #124 from Cgettys/add-unaligned-defined-guard
Add !defined check on MINIZ_USE_ALIGNED_LOADS_AND_STORES
2019-03-31 14:33:13 +02:00
Charlie Gettys
5ba89c135d Add !defined check on MINIZ_USE_ALIGNED_LOADS_AND_STORES
Add !defined check so that one can override MINIZ_USE_ALIGNED_LOADS_AND_STORES in case a given compiler does not support it (this issue has been seen in the wild, #assimp/assimp#2389
2019-03-27 10:46:41 -04:00
Martin
25de35faec Remove check that path of file added to archive contains ':' or '\' 2019-03-07 14:37:56 +01:00
Martin
4d1d5b6771 Merge branch 'master' of github.com:richgel999/miniz 2019-03-07 14:08:22 +01:00
Martin Raiber
034f0228eb Merge pull request #122 from FrancescAlted/fix-msvc-warning2
More fixes for warnings MSVC
2019-03-07 14:06:42 +01:00
Martin Raiber
4b8c4f432c Merge pull request #121 from FrancescAlted/fix-msvc-warning
Fix a MSVC 2013 warning
2019-03-07 14:05:31 +01:00
Martin Raiber
9d79ea2245 Merge pull request #119 from andiwand/cmake-use-target_include_directories
use target_include_directories
2019-03-07 14:04:51 +01:00
Martin
6db3c0d290 Don't warn if _LARGEFILE64_SOURCE is not defined 2019-03-07 14:04:15 +01:00
Francesc Alted
96f0da1db9 Yet another fix 2019-03-06 14:34:39 +01:00
Francesc Alted
93c6567773 More fixes for MSVC 2019-03-06 14:07:45 +01:00
Francesc Alted
2b45f89867 Fix a MSVC 2013 warning 2019-03-06 09:51:03 +01:00
Andreas Stefl
5c62e23e04 use target_include_directories 2019-03-03 19:35:13 +01:00
Martin Raiber
f3461d636a Merge pull request #109 from mcgouganp/master
Fix large file support under Windows
2019-01-23 17:44:13 +01:00
paul
45a080c050 Fix large file support under Windows
Under Windows _stat maps to _stat64i32 which only supports max int32_t file sizes.
Change to _stat64 which uses 64bit file sizes and file modification times.
2019-01-23 12:36:25 +10:00
Martin Raiber
2e15a3ff77 Merge pull request #107 from lumag/fix-alloc
Move comp/decomp alloc/free  prototypes under guarding #ifndef
2019-01-17 13:24:21 +01:00
Dmitry Eremin-Solenikov
d31e119d4d Move comp/decomp alloc/free prototypes under guarding #ifndef
Function implemenations are already guarded by #ifndef MZ_NO_MALLOC, so
let's put prototypes under the same #ifndef. Also, while we are at it,
make those prototypes standard-compliant by adding void argument.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
2019-01-17 12:52:11 +03:00
Martin Raiber
3a884afaa7 Merge pull request #106 from lumag/inflateReset
Implement inflateReset() function
2018-12-18 12:59:48 +01:00
Dmitry Eremin-Solenikov
ae423e65b4 Implement inflateReset() function
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
2018-12-18 14:26:37 +03:00
Martin Raiber
336fca3bd4 Merge pull request #105 from zdevito/master
guard memcpy when n == 0 because buffer may be NULL
2018-11-30 02:23:29 +01:00
Zach DeVito
a3ca94f833 guard memcpy when n == 0 because buffer may be NULL 2018-11-29 16:56:13 -08:00
Martin
9ce0d0ddff Fix out of bounds read while reading Zip64 extended information 2018-11-11 19:11:47 +01:00
Martin
f8600923fc Incremented version 2018-11-11 19:10:51 +01:00
Martin
306edd2022 New function to read files via callback functions when adding them 2018-11-11 19:10:35 +01:00
Martin
407d298c14 Remove inline for c90 support 2018-11-05 18:32:42 +01:00
Martin
53bfef515c More instances of memcpy instead of cast and use memcpy per default 2018-10-27 17:14:33 +02:00
Martin
91fa285a27 Fix grammar errors in ChangeLog 2018-10-27 17:12:43 +02:00
Martin
df65d5a1de Update ChangeLog 2.0.8 2018-09-19 12:48:59 +02:00