diff options
author | Yasha Jannoo <alledodo@gmail.com> | 2019-09-14 12:15:04 +0100 |
---|---|---|
committer | Yasha Jannoo <alledodo@gmail.com> | 2019-09-14 12:51:21 +0100 |
commit | f2e1338eba568ac7caa0051d57f1f6a10ae81801 (patch) | |
tree | 4a6589fb83fe95308b75a76505d97a972f2bd7be /zlib/contrib/minizip/Makefile | |
parent | e31b0c1803d976e29b258c7307e32fd0d63821e5 (diff) | |
download | starshatter-f2e1338eba568ac7caa0051d57f1f6a10ae81801.zip starshatter-f2e1338eba568ac7caa0051d57f1f6a10ae81801.tar.gz starshatter-f2e1338eba568ac7caa0051d57f1f6a10ae81801.tar.bz2 |
Update zlib 3rd party code to v1.2.11
zlib source code, version 1.2.11. https://www.zlib.net/.
Include all the gynmastics involved in:
- making sure we compile zlibstat and set the output files locations and filename to those expected by the starshatter setup.
- turning off the ASM includes as they are invalid for the new versions of zlib (and crash when running).
- matching the calling conventions of the Starshatter code by ommiting ZLIB_WINAPI from the zlib preprocessor defines.
- fix debug build compile error in zlibstatic:
https://stackoverflow.com/questions/31867018/unresolved-external-symbol-except-handler4-common-in-visual-studio-2015
This fixes some string warnings.
Diffstat (limited to 'zlib/contrib/minizip/Makefile')
-rw-r--r-- | zlib/contrib/minizip/Makefile | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/zlib/contrib/minizip/Makefile b/zlib/contrib/minizip/Makefile new file mode 100644 index 0000000..84eaad2 --- /dev/null +++ b/zlib/contrib/minizip/Makefile @@ -0,0 +1,25 @@ +CC=cc +CFLAGS=-O -I../.. + +UNZ_OBJS = miniunz.o unzip.o ioapi.o ../../libz.a +ZIP_OBJS = minizip.o zip.o ioapi.o ../../libz.a + +.c.o: + $(CC) -c $(CFLAGS) $*.c + +all: miniunz minizip + +miniunz: $(UNZ_OBJS) + $(CC) $(CFLAGS) -o $@ $(UNZ_OBJS) + +minizip: $(ZIP_OBJS) + $(CC) $(CFLAGS) -o $@ $(ZIP_OBJS) + +test: miniunz minizip + ./minizip test readme.txt + ./miniunz -l test.zip + mv readme.txt readme.old + ./miniunz test.zip + +clean: + /bin/rm -f *.o *~ minizip miniunz |