diff options
102 files changed, 3820 insertions, 7399 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ea0fa99..b129ef2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -50,7 +50,7 @@ endif() | |||
| 50 | # | 50 | # |
| 51 | # Check for unistd.h | 51 | # Check for unistd.h |
| 52 | # | 52 | # |
| 53 | check_include_file(unistd.h HAVE_UNISTD_H) | 53 | check_include_file(unistd.h Z_HAVE_UNISTD_H) |
| 54 | 54 | ||
| 55 | # | 55 | # |
| 56 | # Check for errno.h | 56 | # Check for errno.h |
| @@ -65,6 +65,21 @@ if(MSVC) | |||
| 65 | add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) | 65 | add_definitions(-D_CRT_NONSTDC_NO_DEPRECATE) |
| 66 | endif() | 66 | endif() |
| 67 | 67 | ||
| 68 | if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR) | ||
| 69 | # If we're doing an out of source build and the user has a zconf.h | ||
| 70 | # in their source tree... | ||
| 71 | if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h) | ||
| 72 | message(FATAL_ERROR "You must remove zconf.h from the source tree. This f | ||
| 73 | ile is generated by the ./configure script shipped with zlib. CMake generates t | ||
| 74 | his file for you automatically in the build directory") | ||
| 75 | endif() | ||
| 76 | endif() | ||
| 77 | |||
| 78 | configure_file(${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.in | ||
| 79 | ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h @ONLY) | ||
| 80 | include_directories(${CMAKE_CURRENT_BINARY_DIR}) | ||
| 81 | |||
| 82 | |||
| 68 | #============================================================================ | 83 | #============================================================================ |
| 69 | # zlib | 84 | # zlib |
| 70 | #============================================================================ | 85 | #============================================================================ |
| @@ -90,7 +105,6 @@ set(ZLIB_SRCS | |||
| 90 | crc32.c | 105 | crc32.c |
| 91 | deflate.c | 106 | deflate.c |
| 92 | gzclose.c | 107 | gzclose.c |
| 93 | gzio.c | ||
| 94 | gzlib.c | 108 | gzlib.c |
| 95 | gzread.c | 109 | gzread.c |
| 96 | gzwrite.c | 110 | gzwrite.c |
| @@ -1,6 +1,25 @@ | |||
| 1 | 1 | ||
| 2 | ChangeLog file for zlib | 2 | ChangeLog file for zlib |
| 3 | 3 | ||
| 4 | Changes in 1.2.3.9 (21 Feb 2010) | ||
| 5 | - Expunge gzio.c | ||
| 6 | - Move as400 build information to old | ||
| 7 | - Fix updates in contrib/minizip and contrib/vstudio | ||
| 8 | - Add const to vsnprintf test in configure to avoid warnings [Weigelt] | ||
| 9 | - Delete zconf.h (made by configure) [Weigelt] | ||
| 10 | - Change zconf.in.h to zconf.h.in per convention [Weigelt] | ||
| 11 | - Check for NULL buf in gzgets() | ||
| 12 | - Return empty string for gzgets() with len == 1 (like fgets()) | ||
| 13 | - Fix description of gzgets() in zlib.h for end-of-file, NULL return | ||
| 14 | - Update minizip to 1.1 [Vollant] | ||
| 15 | - Avoid MSVC loss of data warnings in gzread.c, gzwrite.c | ||
| 16 | - Note in zlib.h that gzerror() should be used to distinguish from EOF | ||
| 17 | - Remove use of snprintf() from gzlib.c | ||
| 18 | - Fix bug in gzseek() | ||
| 19 | - Update contrib/vstudio, adding vc9 and vc10 [Kuno, Vollant] | ||
| 20 | - Fix zconf.h generation in CMakeLists.txt [Lowman] | ||
| 21 | - Improve comments in zconf.h where modified by configure | ||
| 22 | |||
| 4 | Changes in 1.2.3.8 (13 Feb 2010) | 23 | Changes in 1.2.3.8 (13 Feb 2010) |
| 5 | - Clean up text files (tabs, trailing whitespace, etc.) [Oberhumer] | 24 | - Clean up text files (tabs, trailing whitespace, etc.) [Oberhumer] |
| 6 | - Use z_off64_t in gz_zero() and gz_skip() to match state->skip | 25 | - Use z_off64_t in gz_zero() and gz_skip() to match state->skip |
| @@ -7,7 +7,7 @@ README guess what | |||
| 7 | configure configure script for Unix | 7 | configure configure script for Unix |
| 8 | make_vms.com makefile for VMS | 8 | make_vms.com makefile for VMS |
| 9 | treebuild.xml XML description of source file dependencies | 9 | treebuild.xml XML description of source file dependencies |
| 10 | zconf.in.h zconf.h template for configure | 10 | zconf.h.in zconf.h template for configure |
| 11 | zlib.3 Man page for zlib | 11 | zlib.3 Man page for zlib |
| 12 | zlib.map Linux symbol information | 12 | zlib.map Linux symbol information |
| 13 | zlib.pc.in Template for pkg-config descriptor | 13 | zlib.pc.in Template for pkg-config descriptor |
| @@ -28,7 +28,7 @@ watcom/ makefiles for OpenWatcom | |||
| 28 | win32/ makefiles for Windows | 28 | win32/ makefiles for Windows |
| 29 | 29 | ||
| 30 | zlib public header files (required for library use): | 30 | zlib public header files (required for library use): |
| 31 | zconf.h | 31 | zconf.h (made by configure) |
| 32 | zlib.h | 32 | zlib.h |
| 33 | 33 | ||
| 34 | private source files used to build the zlib library: | 34 | private source files used to build the zlib library: |
| @@ -40,7 +40,6 @@ deflate.c | |||
| 40 | deflate.h | 40 | deflate.h |
| 41 | gzclose.c | 41 | gzclose.c |
| 42 | gzguts.h | 42 | gzguts.h |
| 43 | gzio.c | ||
| 44 | gzlib.c | 43 | gzlib.c |
| 45 | gzread.c | 44 | gzread.c |
| 46 | gzwrite.c | 45 | gzwrite.c |
diff --git a/Makefile.in b/Makefile.in index a8d10ba..c1cbeb5 100644 --- a/Makefile.in +++ b/Makefile.in | |||
| @@ -32,7 +32,7 @@ CPP=$(CC) -E | |||
| 32 | 32 | ||
| 33 | STATICLIB=libz.a | 33 | STATICLIB=libz.a |
| 34 | SHAREDLIB=libz.so | 34 | SHAREDLIB=libz.so |
| 35 | SHAREDLIBV=libz.so.1.2.3.8 | 35 | SHAREDLIBV=libz.so.1.2.3.9 |
| 36 | SHAREDLIBM=libz.so.1 | 36 | SHAREDLIBM=libz.so.1 |
| 37 | LIBS=$(STATICLIB) $(SHAREDLIB) $(SHAREDLIBV) | 37 | LIBS=$(STATICLIB) $(SHAREDLIB) $(SHAREDLIBV) |
| 38 | 38 | ||
| @@ -50,10 +50,10 @@ mandir = ${prefix}/share/man | |||
| 50 | man3dir = ${mandir}/man3 | 50 | man3dir = ${mandir}/man3 |
| 51 | pkgconfigdir = ${libdir}/pkgconfig | 51 | pkgconfigdir = ${libdir}/pkgconfig |
| 52 | 52 | ||
| 53 | OBJC = adler32.o compress.o crc32.o deflate.o gzclose.o gzio.o gzlib.o gzread.o \ | 53 | OBJC = adler32.o compress.o crc32.o deflate.o gzclose.o gzlib.o gzread.o \ |
| 54 | gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o | 54 | gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o |
| 55 | 55 | ||
| 56 | PIC_OBJC = adler32.lo compress.lo crc32.lo deflate.lo gzclose.lo gzio.lo gzlib.lo gzread.lo \ | 56 | PIC_OBJC = adler32.lo compress.lo crc32.lo deflate.lo gzclose.lo gzlib.lo gzread.lo \ |
| 57 | gzwrite.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo uncompr.lo zutil.lo | 57 | gzwrite.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo uncompr.lo zutil.lo |
| 58 | 58 | ||
| 59 | # to use the asm code: make OBJA=match.o, PIC_OBJA=match.lo | 59 | # to use the asm code: make OBJA=match.o, PIC_OBJA=match.lo |
| @@ -204,8 +204,8 @@ clean: | |||
| 204 | 204 | ||
| 205 | maintainer-clean: distclean | 205 | maintainer-clean: distclean |
| 206 | distclean: clean | 206 | distclean: clean |
| 207 | cp -p zconf.in.h zconf.h | 207 | rm -f Makefile zconf.h zlib.pc |
| 208 | rm -f zlib.pc .DS_Store | 208 | -@rm -f .DS_Store |
| 209 | -@printf 'all:\n\t-@echo "Use ./configure first. Thank you."\n' > Makefile | 209 | -@printf 'all:\n\t-@echo "Use ./configure first. Thank you."\n' > Makefile |
| 210 | -@touch -r Makefile.in Makefile | 210 | -@touch -r Makefile.in Makefile |
| 211 | 211 | ||
| @@ -217,7 +217,7 @@ depend: | |||
| 217 | 217 | ||
| 218 | # DO NOT DELETE THIS LINE -- make depend depends on it. | 218 | # DO NOT DELETE THIS LINE -- make depend depends on it. |
| 219 | 219 | ||
| 220 | adler32.o gzio.o zutil.o: zutil.h zlib.h zconf.h | 220 | adler32.o zutil.o: zutil.h zlib.h zconf.h |
| 221 | gzclose.o gzlib.o gzread.o gzwrite.o: zlib.h zconf.h gzguts.h | 221 | gzclose.o gzlib.o gzread.o gzwrite.o: zlib.h zconf.h gzguts.h |
| 222 | compress.o example.o minigzip.o uncompr.o: zlib.h zconf.h | 222 | compress.o example.o minigzip.o uncompr.o: zlib.h zconf.h |
| 223 | crc32.o: zutil.h zlib.h zconf.h crc32.h | 223 | crc32.o: zutil.h zlib.h zconf.h crc32.h |
| @@ -227,7 +227,7 @@ inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h | |||
| 227 | inftrees.o: zutil.h zlib.h zconf.h inftrees.h | 227 | inftrees.o: zutil.h zlib.h zconf.h inftrees.h |
| 228 | trees.o: deflate.h zutil.h zlib.h zconf.h trees.h | 228 | trees.o: deflate.h zutil.h zlib.h zconf.h trees.h |
| 229 | 229 | ||
| 230 | adler32.lo gzio.lo zutil.lo: zutil.h zlib.h zconf.h | 230 | adler32.lo zutil.lo: zutil.h zlib.h zconf.h |
| 231 | gzclose.lo gzlib.lo gzread.lo gzwrite.lo: zlib.h zconf.h gzguts.h | 231 | gzclose.lo gzlib.lo gzread.lo gzwrite.lo: zlib.h zconf.h gzguts.h |
| 232 | compress.lo example.lo minigzip.lo uncompr.lo: zlib.h zconf.h | 232 | compress.lo example.lo minigzip.lo uncompr.lo: zlib.h zconf.h |
| 233 | crc32.lo: zutil.h zlib.h zconf.h crc32.h | 233 | crc32.lo: zutil.h zlib.h zconf.h crc32.h |
| @@ -1,6 +1,6 @@ | |||
| 1 | ZLIB DATA COMPRESSION LIBRARY | 1 | ZLIB DATA COMPRESSION LIBRARY |
| 2 | 2 | ||
| 3 | zlib 1.2.3.8 is a general purpose data compression library. All the code is | 3 | zlib 1.2.3.9 is a general purpose data compression library. All the code is |
| 4 | thread safe. The data format used by the zlib library is described by RFCs | 4 | thread safe. The data format used by the zlib library is described by RFCs |
| 5 | (Request for Comments) 1950 to 1952 in the files | 5 | (Request for Comments) 1950 to 1952 in the files |
| 6 | http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) | 6 | http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format) |
| @@ -33,7 +33,7 @@ Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan. 1997 | |||
| 33 | issue of Dr. Dobb's Journal; a copy of the article is available in | 33 | issue of Dr. Dobb's Journal; a copy of the article is available in |
| 34 | http://dogma.net/markn/articles/zlibtool/zlibtool.htm | 34 | http://dogma.net/markn/articles/zlibtool/zlibtool.htm |
| 35 | 35 | ||
| 36 | The changes made in version 1.2.3.8 are documented in the file ChangeLog. | 36 | The changes made in version 1.2.3.9 are documented in the file ChangeLog. |
| 37 | 37 | ||
| 38 | Unsupported third party contributions are provided in directory "contrib". | 38 | Unsupported third party contributions are provided in directory "contrib". |
| 39 | 39 | ||
diff --git a/amiga/Makefile.pup b/amiga/Makefile.pup index 2916391..8940c12 100644 --- a/amiga/Makefile.pup +++ b/amiga/Makefile.pup | |||
| @@ -14,7 +14,7 @@ LDFLAGS = -o | |||
| 14 | LDLIBS = LIB:scppc.a LIB:end.o | 14 | LDLIBS = LIB:scppc.a LIB:end.o |
| 15 | RM = delete quiet | 15 | RM = delete quiet |
| 16 | 16 | ||
| 17 | OBJS = adler32.o compress.o crc32.o gzclose.o gzio.o gzlib.o gzread.o gzwrite.o \ | 17 | OBJS = adler32.o compress.o crc32.o gzclose.o gzlib.o gzread.o gzwrite.o \ |
| 18 | uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o | 18 | uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o |
| 19 | 19 | ||
| 20 | TEST_OBJS = example.o minigzip.o | 20 | TEST_OBJS = example.o minigzip.o |
| @@ -56,7 +56,6 @@ crc32.o: crc32.h zlib.h zconf.h | |||
| 56 | deflate.o: deflate.h zutil.h zlib.h zconf.h | 56 | deflate.o: deflate.h zutil.h zlib.h zconf.h |
| 57 | example.o: zlib.h zconf.h | 57 | example.o: zlib.h zconf.h |
| 58 | gzclose.o: zlib.h zconf.h gzguts.h | 58 | gzclose.o: zlib.h zconf.h gzguts.h |
| 59 | gzio.o: zutil.h zlib.h zconf.h | ||
| 60 | gzlib.o: zlib.h zconf.h gzguts.h | 59 | gzlib.o: zlib.h zconf.h gzguts.h |
| 61 | gzread.o: zlib.h zconf.h gzguts.h | 60 | gzread.o: zlib.h zconf.h gzguts.h |
| 62 | gzwrite.o: zlib.h zconf.h gzguts.h | 61 | gzwrite.o: zlib.h zconf.h gzguts.h |
diff --git a/amiga/Makefile.sas b/amiga/Makefile.sas index cefe83d..749e291 100644 --- a/amiga/Makefile.sas +++ b/amiga/Makefile.sas | |||
| @@ -13,7 +13,7 @@ SCOPTIONS=OPTSCHED OPTINLINE OPTALIAS OPTTIME OPTINLOCAL STRMERGE \ | |||
| 13 | NOICONS PARMS=BOTH NOSTACKCHECK UTILLIB NOVERSION ERRORREXX \ | 13 | NOICONS PARMS=BOTH NOSTACKCHECK UTILLIB NOVERSION ERRORREXX \ |
| 14 | DEF=POSTINC | 14 | DEF=POSTINC |
| 15 | 15 | ||
| 16 | OBJS = adler32.o compress.o crc32.o gzclose.o gzio.o gzlib.o gzread.o gzwrite.o \ | 16 | OBJS = adler32.o compress.o crc32.o gzclose.o gzlib.o gzread.o gzwrite.o \ |
| 17 | uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o | 17 | uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o |
| 18 | 18 | ||
| 19 | TEST_OBJS = example.o minigzip.o | 19 | TEST_OBJS = example.o minigzip.o |
| @@ -55,7 +55,6 @@ crc32.o: crc32.h zlib.h zconf.h | |||
| 55 | deflate.o: deflate.h zutil.h zlib.h zconf.h | 55 | deflate.o: deflate.h zutil.h zlib.h zconf.h |
| 56 | example.o: zlib.h zconf.h | 56 | example.o: zlib.h zconf.h |
| 57 | gzclose.o: zlib.h zconf.h gzguts.h | 57 | gzclose.o: zlib.h zconf.h gzguts.h |
| 58 | gzio.o: zutil.h zlib.h zconf.h | ||
| 59 | gzlib.o: zlib.h zconf.h gzguts.h | 58 | gzlib.o: zlib.h zconf.h gzguts.h |
| 60 | gzread.o: zlib.h zconf.h gzguts.h | 59 | gzread.o: zlib.h zconf.h gzguts.h |
| 61 | gzwrite.o: zlib.h zconf.h gzguts.h | 60 | gzwrite.o: zlib.h zconf.h gzguts.h |
| @@ -250,14 +250,14 @@ EOF | |||
| 250 | fi | 250 | fi |
| 251 | fi | 251 | fi |
| 252 | 252 | ||
| 253 | cp -p zconf.in.h zconf.h | 253 | sed "/^#cmakedefine/D" < zconf.h.in > zconf.h |
| 254 | 254 | ||
| 255 | cat > $test.c <<EOF | 255 | cat > $test.c <<EOF |
| 256 | #include <unistd.h> | 256 | #include <unistd.h> |
| 257 | int main() { return 0; } | 257 | int main() { return 0; } |
| 258 | EOF | 258 | EOF |
| 259 | if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then | 259 | if test "`($CC -c $CFLAGS $test.c) 2>&1`" = ""; then |
| 260 | sed < zconf.h "/#ifdef HAVE_UNISTD_H/s/def HAVE_UNISTD_H/ 1/" > zconf.temp.h | 260 | sed < zconf.h "/^#ifdef HAVE_UNISTD_H.* may be/s/def HAVE_UNISTD_H\(.*\) may be/ 1\1 was/" > zconf.temp.h |
| 261 | mv zconf.temp.h zconf.h | 261 | mv zconf.temp.h zconf.h |
| 262 | echo "Checking for unistd.h... Yes." | 262 | echo "Checking for unistd.h... Yes." |
| 263 | else | 263 | else |
| @@ -265,7 +265,7 @@ else | |||
| 265 | fi | 265 | fi |
| 266 | 266 | ||
| 267 | if test $zprefix -eq 1; then | 267 | if test $zprefix -eq 1; then |
| 268 | sed < zconf.h "/#ifdef Z_PREFIX/s/def Z_PREFIX/ 1/" > zconf.temp.h | 268 | sed < zconf.h "/#ifdef Z_PREFIX.* may be/s/def Z_PREFIX\(.*\) may be/ 1\1 was/" > zconf.temp.h |
| 269 | mv zconf.temp.h zconf.h | 269 | mv zconf.temp.h zconf.h |
| 270 | echo "Using z_ prefix on all symbols." | 270 | echo "Using z_ prefix on all symbols." |
| 271 | fi | 271 | fi |
| @@ -316,7 +316,7 @@ EOF | |||
| 316 | #include <stdio.h> | 316 | #include <stdio.h> |
| 317 | #include <stdarg.h> | 317 | #include <stdarg.h> |
| 318 | 318 | ||
| 319 | int mytest(char *fmt, ...) | 319 | int mytest(const char *fmt, ...) |
| 320 | { | 320 | { |
| 321 | int n; | 321 | int n; |
| 322 | char buf[20]; | 322 | char buf[20]; |
diff --git a/contrib/contrib/minizip/ioapi.h b/contrib/contrib/minizip/ioapi.h deleted file mode 100644 index e0e78ce..0000000 --- a/contrib/contrib/minizip/ioapi.h +++ /dev/null | |||
| @@ -1,196 +0,0 @@ | |||
| 1 | /* ioapi.h -- IO base function header for compress/uncompress .zip | ||
| 2 | part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) | ||
| 3 | |||
| 4 | Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) | ||
| 5 | |||
| 6 | Modifications for Zip64 support | ||
| 7 | Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) | ||
| 8 | |||
| 9 | For more info read MiniZip_info.txt | ||
| 10 | |||
| 11 | Changes | ||
| 12 | |||
| 13 | Oct-2009 - Defined ZPOS64_T to fpos_t on windows and u_int64_t on linux. (might need to find a better why for this) | ||
| 14 | Oct-2009 - Change to fseeko64, ftello64 and fopen64 so large files would work on linux. | ||
| 15 | More if/def section may be needed to support other platforms | ||
| 16 | Oct-2009 - Defined fxxxx64 calls to normal fopen/ftell/fseek so they would compile on windows. | ||
| 17 | (but you should use iowin32.c for windows instead) | ||
| 18 | |||
| 19 | */ | ||
| 20 | |||
| 21 | #ifndef _ZLIBIOAPI64_H | ||
| 22 | #define _ZLIBIOAPI64_H | ||
| 23 | |||
| 24 | #include "zlib.h" | ||
| 25 | |||
| 26 | #ifndef _WIN32 | ||
| 27 | |||
| 28 | // Linux needs this to support file operation on files larger then 4+GB | ||
| 29 | // But might need better if/def to select just the platforms that needs them. | ||
| 30 | |||
| 31 | #ifndef __USE_FILE_OFFSET64 | ||
| 32 | #define __USE_FILE_OFFSET64 | ||
| 33 | #endif | ||
| 34 | #ifndef __USE_LARGEFILE64 | ||
| 35 | #define __USE_LARGEFILE64 | ||
| 36 | #endif | ||
| 37 | #ifndef _LARGEFILE64_SOURCE | ||
| 38 | #define _LARGEFILE64_SOURCE | ||
| 39 | #endif | ||
| 40 | #ifndef _FILE_OFFSET_BIT | ||
| 41 | #define _FILE_OFFSET_BIT 64 | ||
| 42 | #endif | ||
| 43 | #endif | ||
| 44 | |||
| 45 | #include <stdio.h> | ||
| 46 | #include <stdlib.h> | ||
| 47 | |||
| 48 | |||
| 49 | #ifdef _MSC_VER | ||
| 50 | #define fopen64 fopen | ||
| 51 | #if _MSC_VER >= 1400 | ||
| 52 | #define ftello64 _ftelli64 | ||
| 53 | #define fseeko64 _fseeki64 | ||
| 54 | #else // old MSC | ||
| 55 | #define ftello64 ftell | ||
| 56 | #define fseeko64 fseek | ||
| 57 | #endif | ||
| 58 | #endif | ||
| 59 | |||
| 60 | /* | ||
| 61 | #ifndef ZPOS64_T | ||
| 62 | #ifdef _WIN32 | ||
| 63 | #define ZPOS64_T fpos_t | ||
| 64 | #else | ||
| 65 | #include <stdint.h> | ||
| 66 | #define ZPOS64_T uint64_t | ||
| 67 | #endif | ||
| 68 | #endif | ||
| 69 | */ | ||
| 70 | |||
| 71 | #ifdef HAVE_MINIZIP64_CONF_H | ||
| 72 | #include "mz64conf.h" | ||
| 73 | #endif | ||
| 74 | |||
| 75 | /* a type choosen by DEFINE */ | ||
| 76 | #ifdef HAVE_64BIT_INT_CUSTOM | ||
| 77 | typedef 64BIT_INT_CUSTOM_TYPE ZPOS64_T; | ||
| 78 | #else | ||
| 79 | #ifdef HAS_STDINT_H | ||
| 80 | #include "stdint.h" | ||
| 81 | typedef uint64_t ZPOS64_T; | ||
| 82 | #else | ||
| 83 | |||
| 84 | |||
| 85 | #if defined(_MSC_VER) || defined(__BORLANDC__) | ||
| 86 | typedef unsigned __int64 ZPOS64_T; | ||
| 87 | #else | ||
| 88 | typedef unsigned long long int ZPOS64_T; | ||
| 89 | #endif | ||
| 90 | #endif | ||
| 91 | #endif | ||
| 92 | |||
| 93 | |||
| 94 | |||
| 95 | #ifdef __cplusplus | ||
| 96 | extern "C" { | ||
| 97 | #endif | ||
| 98 | |||
| 99 | |||
| 100 | #define ZLIB_FILEFUNC_SEEK_CUR (1) | ||
| 101 | #define ZLIB_FILEFUNC_SEEK_END (2) | ||
| 102 | #define ZLIB_FILEFUNC_SEEK_SET (0) | ||
| 103 | |||
| 104 | #define ZLIB_FILEFUNC_MODE_READ (1) | ||
| 105 | #define ZLIB_FILEFUNC_MODE_WRITE (2) | ||
| 106 | #define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3) | ||
| 107 | |||
| 108 | #define ZLIB_FILEFUNC_MODE_EXISTING (4) | ||
| 109 | #define ZLIB_FILEFUNC_MODE_CREATE (8) | ||
| 110 | |||
| 111 | |||
| 112 | #ifndef ZCALLBACK | ||
| 113 | #if (defined(WIN32) || defined(_WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK) | ||
| 114 | #define ZCALLBACK CALLBACK | ||
| 115 | #else | ||
| 116 | #define ZCALLBACK | ||
| 117 | #endif | ||
| 118 | #endif | ||
| 119 | |||
| 120 | |||
| 121 | |||
| 122 | |||
| 123 | typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode)); | ||
| 124 | typedef uLong (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size)); | ||
| 125 | typedef uLong (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size)); | ||
| 126 | typedef int (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream)); | ||
| 127 | typedef int (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream)); | ||
| 128 | |||
| 129 | typedef long (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream)); | ||
| 130 | typedef long (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin)); | ||
| 131 | |||
| 132 | |||
| 133 | /* here is the "old" 32 bits structure structure */ | ||
| 134 | typedef struct zlib_filefunc_def_s | ||
| 135 | { | ||
| 136 | open_file_func zopen_file; | ||
| 137 | read_file_func zread_file; | ||
| 138 | write_file_func zwrite_file; | ||
| 139 | tell_file_func ztell_file; | ||
| 140 | seek_file_func zseek_file; | ||
| 141 | close_file_func zclose_file; | ||
| 142 | testerror_file_func zerror_file; | ||
| 143 | voidpf opaque; | ||
| 144 | } zlib_filefunc_def; | ||
| 145 | |||
| 146 | typedef ZPOS64_T (ZCALLBACK *tell64_file_func) OF((voidpf opaque, voidpf stream)); | ||
| 147 | typedef long (ZCALLBACK *seek64_file_func) OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin)); | ||
| 148 | typedef voidpf (ZCALLBACK *open64_file_func) OF((voidpf opaque, const void* filename, int mode)); | ||
| 149 | |||
| 150 | typedef struct zlib_filefunc64_def_s | ||
| 151 | { | ||
| 152 | open64_file_func zopen64_file; | ||
| 153 | read_file_func zread_file; | ||
| 154 | write_file_func zwrite_file; | ||
| 155 | tell64_file_func ztell64_file; | ||
| 156 | seek64_file_func zseek64_file; | ||
| 157 | close_file_func zclose_file; | ||
| 158 | testerror_file_func zerror_file; | ||
| 159 | voidpf opaque; | ||
| 160 | } zlib_filefunc64_def; | ||
| 161 | |||
| 162 | void fill_fopen64_filefunc OF((zlib_filefunc64_def* pzlib_filefunc_def)); | ||
| 163 | void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def)); | ||
| 164 | |||
| 165 | /* now internal definition, only for zip.c and unzip.h */ | ||
| 166 | typedef struct zlib_filefunc64_32_def_s | ||
| 167 | { | ||
| 168 | zlib_filefunc64_def zfile_func64; | ||
| 169 | open_file_func zopen32_file; | ||
| 170 | tell_file_func ztell32_file; | ||
| 171 | seek_file_func zseek32_file; | ||
| 172 | } zlib_filefunc64_32_def; | ||
| 173 | |||
| 174 | |||
| 175 | #define ZREAD64(filefunc,filestream,buf,size) ((*((filefunc).zfile_func64.zread_file)) ((filefunc).zfile_func64.opaque,filestream,buf,size)) | ||
| 176 | #define ZWRITE64(filefunc,filestream,buf,size) ((*((filefunc).zfile_func64.zwrite_file)) ((filefunc).zfile_func64.opaque,filestream,buf,size)) | ||
| 177 | //#define ZTELL64(filefunc,filestream) ((*((filefunc).ztell64_file)) ((filefunc).opaque,filestream)) | ||
| 178 | //#define ZSEEK64(filefunc,filestream,pos,mode) ((*((filefunc).zseek64_file)) ((filefunc).opaque,filestream,pos,mode)) | ||
| 179 | #define ZCLOSE64(filefunc,filestream) ((*((filefunc).zfile_func64.zclose_file)) ((filefunc).zfile_func64.opaque,filestream)) | ||
| 180 | #define ZERROR64(filefunc,filestream) ((*((filefunc).zfile_func64.zerror_file)) ((filefunc).zfile_func64.opaque,filestream)) | ||
| 181 | |||
| 182 | voidpf call_zopen64 OF((const zlib_filefunc64_32_def* pfilefunc,const void*filename,int mode)); | ||
| 183 | long call_zseek64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream, ZPOS64_T offset, int origin)); | ||
| 184 | ZPOS64_T call_ztell64 OF((const zlib_filefunc64_32_def* pfilefunc,voidpf filestream)); | ||
| 185 | |||
| 186 | void fill_zlib_filefunc64_32_def_from_filefunc32(zlib_filefunc64_32_def* p_filefunc64_32,const zlib_filefunc_def* p_filefunc32); | ||
| 187 | |||
| 188 | #define ZOPEN64(filefunc,filename,mode) (call_zopen64((&(filefunc)),(filename),(mode))) | ||
| 189 | #define ZTELL64(filefunc,filestream) (call_ztell64((&(filefunc)),(filestream))) | ||
| 190 | #define ZSEEK64(filefunc,filestream,pos,mode) (call_zseek64((&(filefunc)),(filestream),(pos),(mode))) | ||
| 191 | |||
| 192 | #ifdef __cplusplus | ||
| 193 | } | ||
| 194 | #endif | ||
| 195 | |||
| 196 | #endif | ||
diff --git a/contrib/contrib/minizip/iowin32.c b/contrib/contrib/minizip/iowin32.c deleted file mode 100644 index 2b69466..0000000 --- a/contrib/contrib/minizip/iowin32.c +++ /dev/null | |||
| @@ -1,389 +0,0 @@ | |||
| 1 | /* iowin32.c -- IO base function header for compress/uncompress .zip | ||
| 2 | Version 1.1, January 7th, 2010 | ||
| 3 | part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) | ||
| 4 | |||
| 5 | Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) | ||
| 6 | |||
| 7 | Modifications for Zip64 support | ||
| 8 | Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) | ||
| 9 | |||
| 10 | For more info read MiniZip_info.txt | ||
| 11 | |||
| 12 | */ | ||
| 13 | |||
| 14 | #include <stdlib.h> | ||
| 15 | |||
| 16 | #include "zlib.h" | ||
| 17 | #include "ioapi.h" | ||
| 18 | #include "iowin32.h" | ||
| 19 | |||
| 20 | #ifndef INVALID_HANDLE_VALUE | ||
| 21 | #define INVALID_HANDLE_VALUE (0xFFFFFFFF) | ||
| 22 | #endif | ||
| 23 | |||
| 24 | #ifndef INVALID_SET_FILE_POINTER | ||
| 25 | #define INVALID_SET_FILE_POINTER ((DWORD)-1) | ||
| 26 | #endif | ||
| 27 | |||
| 28 | voidpf ZCALLBACK win32_open_file_func OF((voidpf opaque, const char* filename, int mode)); | ||
| 29 | uLong ZCALLBACK win32_read_file_func OF((voidpf opaque, voidpf stream, void* buf, uLong size)); | ||
| 30 | uLong ZCALLBACK win32_write_file_func OF((voidpf opaque, voidpf stream, const void* buf, uLong size)); | ||
| 31 | ZPOS64_T ZCALLBACK win32_tell64_file_func OF((voidpf opaque, voidpf stream)); | ||
| 32 | long ZCALLBACK win32_seek64_file_func OF((voidpf opaque, voidpf stream, ZPOS64_T offset, int origin)); | ||
| 33 | int ZCALLBACK win32_close_file_func OF((voidpf opaque, voidpf stream)); | ||
| 34 | int ZCALLBACK win32_error_file_func OF((voidpf opaque, voidpf stream)); | ||
| 35 | |||
| 36 | typedef struct | ||
| 37 | { | ||
| 38 | HANDLE hf; | ||
| 39 | int error; | ||
| 40 | } WIN32FILE_IOWIN; | ||
| 41 | |||
| 42 | |||
| 43 | static void win32_translate_open_mode(int mode, | ||
| 44 | DWORD* lpdwDesiredAccess, | ||
| 45 | DWORD* lpdwCreationDisposition, | ||
| 46 | DWORD* lpdwShareMode, | ||
| 47 | DWORD* lpdwFlagsAndAttributes) | ||
| 48 | { | ||
| 49 | *lpdwDesiredAccess = *lpdwShareMode = *lpdwFlagsAndAttributes = *lpdwCreationDisposition = 0; | ||
| 50 | |||
| 51 | if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ) | ||
| 52 | { | ||
| 53 | *lpdwDesiredAccess = GENERIC_READ; | ||
| 54 | *lpdwCreationDisposition = OPEN_EXISTING; | ||
| 55 | *lpdwShareMode = FILE_SHARE_READ; | ||
| 56 | } | ||
| 57 | else if (mode & ZLIB_FILEFUNC_MODE_EXISTING) | ||
| 58 | { | ||
| 59 | *lpdwDesiredAccess = GENERIC_WRITE | GENERIC_READ; | ||
| 60 | *lpdwCreationDisposition = OPEN_EXISTING; | ||
| 61 | } | ||
| 62 | else if (mode & ZLIB_FILEFUNC_MODE_CREATE) | ||
| 63 | { | ||
| 64 | *lpdwDesiredAccess = GENERIC_WRITE | GENERIC_READ; | ||
| 65 | *lpdwCreationDisposition = CREATE_ALWAYS; | ||
| 66 | } | ||
| 67 | } | ||
| 68 | |||
| 69 | static voidpf win32_build_iowin(HANDLE hFile) | ||
| 70 | { | ||
| 71 | voidpf ret=NULL; | ||
| 72 | |||
| 73 | if ((hFile != NULL) && (hFile != INVALID_HANDLE_VALUE)) | ||
| 74 | { | ||
| 75 | WIN32FILE_IOWIN w32fiow; | ||
| 76 | w32fiow.hf = hFile; | ||
| 77 | w32fiow.error = 0; | ||
| 78 | ret = malloc(sizeof(WIN32FILE_IOWIN)); | ||
| 79 | |||
| 80 | if (ret==NULL) | ||
| 81 | CloseHandle(hFile); | ||
| 82 | else | ||
| 83 | *((WIN32FILE_IOWIN*)ret) = w32fiow; | ||
| 84 | } | ||
| 85 | return ret; | ||
| 86 | } | ||
| 87 | |||
| 88 | voidpf ZCALLBACK win32_open64_file_func (voidpf opaque,const void* filename,int mode) | ||
| 89 | { | ||
| 90 | const char* mode_fopen = NULL; | ||
| 91 | DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ; | ||
| 92 | HANDLE hFile = NULL; | ||
| 93 | |||
| 94 | win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes); | ||
| 95 | |||
| 96 | if ((filename!=NULL) && (dwDesiredAccess != 0)) | ||
| 97 | hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL); | ||
| 98 | |||
| 99 | return win32_build_iowin(hFile); | ||
| 100 | } | ||
| 101 | |||
| 102 | |||
| 103 | voidpf ZCALLBACK win32_open64_file_funcA (voidpf opaque,const void* filename,int mode) | ||
| 104 | { | ||
| 105 | const char* mode_fopen = NULL; | ||
| 106 | DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ; | ||
| 107 | HANDLE hFile = NULL; | ||
| 108 | |||
| 109 | win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes); | ||
| 110 | |||
| 111 | if ((filename!=NULL) && (dwDesiredAccess != 0)) | ||
| 112 | hFile = CreateFileA((LPCSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL); | ||
| 113 | |||
| 114 | return win32_build_iowin(hFile); | ||
| 115 | } | ||
| 116 | |||
| 117 | |||
| 118 | voidpf ZCALLBACK win32_open64_file_funcW (voidpf opaque,const void* filename,int mode) | ||
| 119 | { | ||
| 120 | const char* mode_fopen = NULL; | ||
| 121 | DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ; | ||
| 122 | HANDLE hFile = NULL; | ||
| 123 | |||
| 124 | win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes); | ||
| 125 | |||
| 126 | if ((filename!=NULL) && (dwDesiredAccess != 0)) | ||
| 127 | hFile = CreateFileW((LPCWSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL); | ||
| 128 | |||
| 129 | return win32_build_iowin(hFile); | ||
| 130 | } | ||
| 131 | |||
| 132 | |||
| 133 | voidpf ZCALLBACK win32_open_file_func (voidpf opaque,const char* filename,int mode) | ||
| 134 | { | ||
| 135 | const char* mode_fopen = NULL; | ||
| 136 | DWORD dwDesiredAccess,dwCreationDisposition,dwShareMode,dwFlagsAndAttributes ; | ||
| 137 | HANDLE hFile = NULL; | ||
| 138 | |||
| 139 | win32_translate_open_mode(mode,&dwDesiredAccess,&dwCreationDisposition,&dwShareMode,&dwFlagsAndAttributes); | ||
| 140 | |||
| 141 | if ((filename!=NULL) && (dwDesiredAccess != 0)) | ||
| 142 | hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL, dwCreationDisposition, dwFlagsAndAttributes, NULL); | ||
| 143 | |||
| 144 | return win32_build_iowin(hFile); | ||
| 145 | } | ||
| 146 | |||
| 147 | |||
| 148 | uLong ZCALLBACK win32_read_file_func (voidpf opaque, voidpf stream, void* buf,uLong size) | ||
| 149 | { | ||
| 150 | uLong ret=0; | ||
| 151 | HANDLE hFile = NULL; | ||
| 152 | if (stream!=NULL) | ||
| 153 | hFile = ((WIN32FILE_IOWIN*)stream) -> hf; | ||
| 154 | |||
| 155 | if (hFile != NULL) | ||
| 156 | { | ||
| 157 | if (!ReadFile(hFile, buf, size, &ret, NULL)) | ||
| 158 | { | ||
| 159 | DWORD dwErr = GetLastError(); | ||
| 160 | if (dwErr == ERROR_HANDLE_EOF) | ||
| 161 | dwErr = 0; | ||
| 162 | ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr; | ||
| 163 | } | ||
| 164 | } | ||
| 165 | |||
| 166 | return ret; | ||
| 167 | } | ||
| 168 | |||
| 169 | |||
| 170 | uLong ZCALLBACK win32_write_file_func (voidpf opaque,voidpf stream,const void* buf,uLong size) | ||
| 171 | { | ||
| 172 | uLong ret=0; | ||
| 173 | HANDLE hFile = NULL; | ||
| 174 | if (stream!=NULL) | ||
| 175 | hFile = ((WIN32FILE_IOWIN*)stream) -> hf; | ||
| 176 | |||
| 177 | if (hFile != NULL) | ||
| 178 | { | ||
| 179 | if (!WriteFile(hFile, buf, size, &ret, NULL)) | ||
| 180 | { | ||
| 181 | DWORD dwErr = GetLastError(); | ||
| 182 | if (dwErr == ERROR_HANDLE_EOF) | ||
| 183 | dwErr = 0; | ||
| 184 | ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr; | ||
| 185 | } | ||
| 186 | } | ||
| 187 | |||
| 188 | return ret; | ||
| 189 | } | ||
| 190 | |||
| 191 | long ZCALLBACK win32_tell_file_func (voidpf opaque,voidpf stream) | ||
| 192 | { | ||
| 193 | long ret=-1; | ||
| 194 | HANDLE hFile = NULL; | ||
| 195 | if (stream!=NULL) | ||
| 196 | hFile = ((WIN32FILE_IOWIN*)stream) -> hf; | ||
| 197 | if (hFile != NULL) | ||
| 198 | { | ||
| 199 | DWORD dwSet = SetFilePointer(hFile, 0, NULL, FILE_CURRENT); | ||
| 200 | if (dwSet == INVALID_SET_FILE_POINTER) | ||
| 201 | { | ||
| 202 | DWORD dwErr = GetLastError(); | ||
| 203 | ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr; | ||
| 204 | ret = -1; | ||
| 205 | } | ||
| 206 | else | ||
| 207 | ret=(long)dwSet; | ||
| 208 | } | ||
| 209 | return ret; | ||
| 210 | } | ||
| 211 | |||
| 212 | ZPOS64_T ZCALLBACK win32_tell64_file_func (voidpf opaque, voidpf stream) | ||
| 213 | { | ||
| 214 | ZPOS64_T ret= (ZPOS64_T)-1; | ||
| 215 | HANDLE hFile = NULL; | ||
| 216 | if (stream!=NULL) | ||
| 217 | hFile = ((WIN32FILE_IOWIN*)stream)->hf; | ||
| 218 | |||
| 219 | if (hFile) | ||
| 220 | { | ||
| 221 | LARGE_INTEGER li; | ||
| 222 | li.QuadPart = 0; | ||
| 223 | li.u.LowPart = SetFilePointer(hFile, li.u.LowPart, &li.u.HighPart, FILE_CURRENT); | ||
| 224 | if ( (li.LowPart == 0xFFFFFFFF) && (GetLastError() != NO_ERROR)) | ||
| 225 | { | ||
| 226 | DWORD dwErr = GetLastError(); | ||
| 227 | ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr; | ||
| 228 | ret = (ZPOS64_T)-1; | ||
| 229 | } | ||
| 230 | else | ||
| 231 | ret=li.QuadPart; | ||
| 232 | } | ||
| 233 | return ret; | ||
| 234 | } | ||
| 235 | |||
| 236 | |||
| 237 | long ZCALLBACK win32_seek_file_func (voidpf opaque,voidpf stream,uLong offset,int origin) | ||
| 238 | { | ||
| 239 | DWORD dwMoveMethod=0xFFFFFFFF; | ||
| 240 | HANDLE hFile = NULL; | ||
| 241 | |||
| 242 | long ret=-1; | ||
| 243 | if (stream!=NULL) | ||
| 244 | hFile = ((WIN32FILE_IOWIN*)stream) -> hf; | ||
| 245 | switch (origin) | ||
| 246 | { | ||
| 247 | case ZLIB_FILEFUNC_SEEK_CUR : | ||
| 248 | dwMoveMethod = FILE_CURRENT; | ||
| 249 | break; | ||
| 250 | case ZLIB_FILEFUNC_SEEK_END : | ||
| 251 | dwMoveMethod = FILE_END; | ||
| 252 | break; | ||
| 253 | case ZLIB_FILEFUNC_SEEK_SET : | ||
| 254 | dwMoveMethod = FILE_BEGIN; | ||
| 255 | break; | ||
| 256 | default: return -1; | ||
| 257 | } | ||
| 258 | |||
| 259 | if (hFile != NULL) | ||
| 260 | { | ||
| 261 | DWORD dwSet = SetFilePointer(hFile, offset, NULL, dwMoveMethod); | ||
| 262 | if (dwSet == INVALID_SET_FILE_POINTER) | ||
| 263 | { | ||
| 264 | DWORD dwErr = GetLastError(); | ||
| 265 | ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr; | ||
| 266 | ret = -1; | ||
| 267 | } | ||
| 268 | else | ||
| 269 | ret=0; | ||
| 270 | } | ||
| 271 | return ret; | ||
| 272 | } | ||
| 273 | |||
| 274 | long ZCALLBACK win32_seek64_file_func (voidpf opaque, voidpf stream,ZPOS64_T offset,int origin) | ||
| 275 | { | ||
| 276 | DWORD dwMoveMethod=0xFFFFFFFF; | ||
| 277 | HANDLE hFile = NULL; | ||
| 278 | long ret=-1; | ||
| 279 | |||
| 280 | if (stream!=NULL) | ||
| 281 | hFile = ((WIN32FILE_IOWIN*)stream)->hf; | ||
| 282 | |||
| 283 | switch (origin) | ||
| 284 | { | ||
| 285 | case ZLIB_FILEFUNC_SEEK_CUR : | ||
| 286 | dwMoveMethod = FILE_CURRENT; | ||
| 287 | break; | ||
| 288 | case ZLIB_FILEFUNC_SEEK_END : | ||
| 289 | dwMoveMethod = FILE_END; | ||
| 290 | break; | ||
| 291 | case ZLIB_FILEFUNC_SEEK_SET : | ||
| 292 | dwMoveMethod = FILE_BEGIN; | ||
| 293 | break; | ||
| 294 | default: return -1; | ||
| 295 | } | ||
| 296 | |||
| 297 | if (hFile) | ||
| 298 | { | ||
| 299 | LARGE_INTEGER* li = (LARGE_INTEGER*)&offset; | ||
| 300 | DWORD dwSet = SetFilePointer(hFile, li->u.LowPart, &li->u.HighPart, dwMoveMethod); | ||
| 301 | if (dwSet == INVALID_SET_FILE_POINTER) | ||
| 302 | { | ||
| 303 | DWORD dwErr = GetLastError(); | ||
| 304 | ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr; | ||
| 305 | ret = -1; | ||
| 306 | } | ||
| 307 | else | ||
| 308 | ret=0; | ||
| 309 | } | ||
| 310 | return ret; | ||
| 311 | } | ||
| 312 | |||
| 313 | int ZCALLBACK win32_close_file_func (voidpf opaque, voidpf stream) | ||
| 314 | { | ||
| 315 | int ret=-1; | ||
| 316 | |||
| 317 | if (stream!=NULL) | ||
| 318 | { | ||
| 319 | HANDLE hFile; | ||
| 320 | hFile = ((WIN32FILE_IOWIN*)stream) -> hf; | ||
| 321 | if (hFile != NULL) | ||
| 322 | { | ||
| 323 | CloseHandle(hFile); | ||
| 324 | ret=0; | ||
| 325 | } | ||
| 326 | free(stream); | ||
| 327 | } | ||
| 328 | return ret; | ||
| 329 | } | ||
| 330 | |||
| 331 | int ZCALLBACK win32_error_file_func (voidpf opaque,voidpf stream) | ||
| 332 | { | ||
| 333 | int ret=-1; | ||
| 334 | if (stream!=NULL) | ||
| 335 | { | ||
| 336 | ret = ((WIN32FILE_IOWIN*)stream) -> error; | ||
| 337 | } | ||
| 338 | return ret; | ||
| 339 | } | ||
| 340 | |||
| 341 | extern void ZEXPORT fill_win32_filefunc (zlib_filefunc_def* pzlib_filefunc_def) | ||
| 342 | { | ||
| 343 | pzlib_filefunc_def->zopen_file = win32_open_file_func; | ||
| 344 | pzlib_filefunc_def->zread_file = win32_read_file_func; | ||
| 345 | pzlib_filefunc_def->zwrite_file = win32_write_file_func; | ||
| 346 | pzlib_filefunc_def->ztell_file = win32_tell_file_func; | ||
| 347 | pzlib_filefunc_def->zseek_file = win32_seek_file_func; | ||
| 348 | pzlib_filefunc_def->zclose_file = win32_close_file_func; | ||
| 349 | pzlib_filefunc_def->zerror_file = win32_error_file_func; | ||
| 350 | pzlib_filefunc_def->opaque = NULL; | ||
| 351 | } | ||
| 352 | |||
| 353 | extern void ZEXPORT fill_win32_filefunc64(zlib_filefunc64_def* pzlib_filefunc_def) | ||
| 354 | { | ||
| 355 | pzlib_filefunc_def->zopen64_file = win32_open64_file_func; | ||
| 356 | pzlib_filefunc_def->zread_file = win32_read_file_func; | ||
| 357 | pzlib_filefunc_def->zwrite_file = win32_write_file_func; | ||
| 358 | pzlib_filefunc_def->ztell64_file = win32_tell64_file_func; | ||
| 359 | pzlib_filefunc_def->zseek64_file = win32_seek64_file_func; | ||
| 360 | pzlib_filefunc_def->zclose_file = win32_close_file_func; | ||
| 361 | pzlib_filefunc_def->zerror_file = win32_error_file_func; | ||
| 362 | pzlib_filefunc_def->opaque = NULL; | ||
| 363 | } | ||
| 364 | |||
| 365 | |||
| 366 | extern void ZEXPORT fill_win32_filefunc64A(zlib_filefunc64_def* pzlib_filefunc_def) | ||
| 367 | { | ||
| 368 | pzlib_filefunc_def->zopen64_file = win32_open64_file_funcA; | ||
| 369 | pzlib_filefunc_def->zread_file = win32_read_file_func; | ||
| 370 | pzlib_filefunc_def->zwrite_file = win32_write_file_func; | ||
| 371 | pzlib_filefunc_def->ztell64_file = win32_tell64_file_func; | ||
| 372 | pzlib_filefunc_def->zseek64_file = win32_seek64_file_func; | ||
| 373 | pzlib_filefunc_def->zclose_file = win32_close_file_func; | ||
| 374 | pzlib_filefunc_def->zerror_file = win32_error_file_func; | ||
| 375 | pzlib_filefunc_def->opaque = NULL; | ||
| 376 | } | ||
| 377 | |||
| 378 | |||
| 379 | extern void ZEXPORT fill_win32_filefunc64W(zlib_filefunc64_def* pzlib_filefunc_def) | ||
| 380 | { | ||
| 381 | pzlib_filefunc_def->zopen64_file = win32_open64_file_funcW; | ||
| 382 | pzlib_filefunc_def->zread_file = win32_read_file_func; | ||
| 383 | pzlib_filefunc_def->zwrite_file = win32_write_file_func; | ||
| 384 | pzlib_filefunc_def->ztell64_file = win32_tell64_file_func; | ||
| 385 | pzlib_filefunc_def->zseek64_file = win32_seek64_file_func; | ||
| 386 | pzlib_filefunc_def->zclose_file = win32_close_file_func; | ||
| 387 | pzlib_filefunc_def->zerror_file = win32_error_file_func; | ||
| 388 | pzlib_filefunc_def->opaque = NULL; | ||
| 389 | } | ||
diff --git a/contrib/contrib/minizip/iowin32.h b/contrib/contrib/minizip/iowin32.h deleted file mode 100644 index 3d5827f..0000000 --- a/contrib/contrib/minizip/iowin32.h +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | /* iowin32.h -- IO base function header for compress/uncompress .zip | ||
| 2 | Version 1.1, January 7th, 2010 | ||
| 3 | part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) | ||
| 4 | |||
| 5 | Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) | ||
| 6 | |||
| 7 | Modifications for Zip64 support | ||
| 8 | Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) | ||
| 9 | |||
| 10 | For more info read MiniZip_info.txt | ||
| 11 | |||
| 12 | */ | ||
| 13 | |||
| 14 | #include <windows.h> | ||
| 15 | |||
| 16 | |||
| 17 | #ifdef __cplusplus | ||
| 18 | extern "C" { | ||
| 19 | #endif | ||
| 20 | |||
| 21 | extern void ZEXPORT fill_win32_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def)); | ||
| 22 | extern void ZEXPORT fill_win32_filefunc64 OF((zlib_filefunc64_def* pzlib_filefunc_def)); | ||
| 23 | extern void ZEXPORT fill_win32_filefunc64A OF((zlib_filefunc64_def* pzlib_filefunc_def)); | ||
| 24 | extern void ZEXPORT fill_win32_filefunc64W OF((zlib_filefunc64_def* pzlib_filefunc_def)); | ||
| 25 | |||
| 26 | #ifdef __cplusplus | ||
| 27 | } | ||
| 28 | #endif | ||
diff --git a/contrib/contrib/minizip/miniunz.c b/contrib/contrib/minizip/miniunz.c deleted file mode 100644 index 6b03e1f..0000000 --- a/contrib/contrib/minizip/miniunz.c +++ /dev/null | |||
| @@ -1,649 +0,0 @@ | |||
| 1 | /* | ||
| 2 | miniunz.c | ||
| 3 | Version 1.1, January 7th, 2010 | ||
| 4 | sample part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) | ||
| 5 | |||
| 6 | Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) | ||
| 7 | |||
| 8 | Modifications of Unzip for Zip64 | ||
| 9 | Copyright (C) 2007-2008 Even Rouault | ||
| 10 | |||
| 11 | Modifications for Zip64 support on both zip and unzip | ||
| 12 | Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) | ||
| 13 | */ | ||
| 14 | |||
| 15 | #include "unzip.h" | ||
| 16 | |||
| 17 | #ifndef _WIN32 | ||
| 18 | #ifndef __USE_FILE_OFFSET64 | ||
| 19 | #define __USE_FILE_OFFSET64 | ||
| 20 | #endif | ||
| 21 | #ifndef __USE_LARGEFILE64 | ||
| 22 | #define __USE_LARGEFILE64 | ||
| 23 | #endif | ||
| 24 | #ifndef _LARGEFILE64_SOURCE | ||
| 25 | #define _LARGEFILE64_SOURCE | ||
| 26 | #endif | ||
| 27 | #ifndef _FILE_OFFSET_BIT | ||
| 28 | #define _FILE_OFFSET_BIT 64 | ||
| 29 | #endif | ||
| 30 | #endif | ||
| 31 | |||
| 32 | #include <stdio.h> | ||
| 33 | #include <stdlib.h> | ||
| 34 | #include <string.h> | ||
| 35 | #include <time.h> | ||
| 36 | #include <errno.h> | ||
| 37 | #include <fcntl.h> | ||
| 38 | |||
| 39 | #ifdef unix | ||
| 40 | # include <unistd.h> | ||
| 41 | # include <utime.h> | ||
| 42 | #else | ||
| 43 | # include <direct.h> | ||
| 44 | # include <io.h> | ||
| 45 | #endif | ||
| 46 | |||
| 47 | |||
| 48 | #define CASESENSITIVITY (0) | ||
| 49 | #define WRITEBUFFERSIZE (8192) | ||
| 50 | #define MAXFILENAME (256) | ||
| 51 | |||
| 52 | #ifdef _WIN32 | ||
| 53 | #define USEWIN32IOAPI | ||
| 54 | #include "iowin32.h" | ||
| 55 | #endif | ||
| 56 | /* | ||
| 57 | mini unzip, demo of unzip package | ||
| 58 | |||
| 59 | usage : | ||
| 60 | Usage : miniunz [-exvlo] file.zip [file_to_extract] [-d extractdir] | ||
| 61 | |||
| 62 | list the file in the zipfile, and print the content of FILE_ID.ZIP or README.TXT | ||
| 63 | if it exists | ||
| 64 | */ | ||
| 65 | |||
| 66 | |||
| 67 | /* change_file_date : change the date/time of a file | ||
| 68 | filename : the filename of the file where date/time must be modified | ||
| 69 | dosdate : the new date at the MSDos format (4 bytes) | ||
| 70 | tmu_date : the SAME new date at the tm_unz format */ | ||
| 71 | void change_file_date(filename,dosdate,tmu_date) | ||
| 72 | const char *filename; | ||
| 73 | uLong dosdate; | ||
| 74 | tm_unz tmu_date; | ||
| 75 | { | ||
| 76 | #ifdef _WIN32 | ||
| 77 | HANDLE hFile; | ||
| 78 | FILETIME ftm,ftLocal,ftCreate,ftLastAcc,ftLastWrite; | ||
| 79 | |||
| 80 | hFile = CreateFileA(filename,GENERIC_READ | GENERIC_WRITE, | ||
| 81 | 0,NULL,OPEN_EXISTING,0,NULL); | ||
| 82 | GetFileTime(hFile,&ftCreate,&ftLastAcc,&ftLastWrite); | ||
| 83 | DosDateTimeToFileTime((WORD)(dosdate>>16),(WORD)dosdate,&ftLocal); | ||
| 84 | LocalFileTimeToFileTime(&ftLocal,&ftm); | ||
| 85 | SetFileTime(hFile,&ftm,&ftLastAcc,&ftm); | ||
| 86 | CloseHandle(hFile); | ||
| 87 | #else | ||
| 88 | #ifdef unix | ||
| 89 | struct utimbuf ut; | ||
| 90 | struct tm newdate; | ||
| 91 | newdate.tm_sec = tmu_date.tm_sec; | ||
| 92 | newdate.tm_min=tmu_date.tm_min; | ||
| 93 | newdate.tm_hour=tmu_date.tm_hour; | ||
| 94 | newdate.tm_mday=tmu_date.tm_mday; | ||
| 95 | newdate.tm_mon=tmu_date.tm_mon; | ||
| 96 | if (tmu_date.tm_year > 1900) | ||
| 97 | newdate.tm_year=tmu_date.tm_year - 1900; | ||
| 98 | else | ||
| 99 | newdate.tm_year=tmu_date.tm_year ; | ||
| 100 | newdate.tm_isdst=-1; | ||
| 101 | |||
| 102 | ut.actime=ut.modtime=mktime(&newdate); | ||
| 103 | utime(filename,&ut); | ||
| 104 | #endif | ||
| 105 | #endif | ||
| 106 | } | ||
| 107 | |||
| 108 | |||
| 109 | /* mymkdir and change_file_date are not 100 % portable | ||
| 110 | As I don't know well Unix, I wait feedback for the unix portion */ | ||
| 111 | |||
| 112 | int mymkdir(dirname) | ||
| 113 | const char* dirname; | ||
| 114 | { | ||
| 115 | int ret=0; | ||
| 116 | #ifdef _WIN32 | ||
| 117 | ret = _mkdir(dirname); | ||
| 118 | #else | ||
| 119 | #ifdef unix | ||
| 120 | ret = mkdir (dirname,0775); | ||
| 121 | #endif | ||
| 122 | #endif | ||
| 123 | return ret; | ||
| 124 | } | ||
| 125 | |||
| 126 | int makedir (newdir) | ||
| 127 | char *newdir; | ||
| 128 | { | ||
| 129 | char *buffer ; | ||
| 130 | char *p; | ||
| 131 | int len = (int)strlen(newdir); | ||
| 132 | |||
| 133 | if (len <= 0) | ||
| 134 | return 0; | ||
| 135 | |||
| 136 | buffer = (char*)malloc(len+1); | ||
| 137 | if (buffer==NULL) | ||
| 138 | { | ||
| 139 | printf("Error allocating memory\n"); | ||
| 140 | return UNZ_INTERNALERROR; | ||
| 141 | } | ||
| 142 | strcpy(buffer,newdir); | ||
| 143 | |||
| 144 | if (buffer[len-1] == '/') { | ||
| 145 | buffer[len-1] = '\0'; | ||
| 146 | } | ||
| 147 | if (mymkdir(buffer) == 0) | ||
| 148 | { | ||
| 149 | free(buffer); | ||
| 150 | return 1; | ||
| 151 | } | ||
| 152 | |||
| 153 | p = buffer+1; | ||
| 154 | while (1) | ||
| 155 | { | ||
| 156 | char hold; | ||
| 157 | |||
| 158 | while(*p && *p != '\\' && *p != '/') | ||
| 159 | p++; | ||
| 160 | hold = *p; | ||
| 161 | *p = 0; | ||
| 162 | if ((mymkdir(buffer) == -1) && (errno == ENOENT)) | ||
| 163 | { | ||
| 164 | printf("couldn't create directory %s\n",buffer); | ||
| 165 | free(buffer); | ||
| 166 | return 0; | ||
| 167 | } | ||
| 168 | if (hold == 0) | ||
| 169 | break; | ||
| 170 | *p++ = hold; | ||
| 171 | } | ||
| 172 | free(buffer); | ||
| 173 | return 1; | ||
| 174 | } | ||
| 175 | |||
| 176 | void do_banner() | ||
| 177 | { | ||
| 178 | printf("MiniUnz 1.01b, demo of zLib + Unz package written by Gilles Vollant\n"); | ||
| 179 | printf("more info at http://www.winimage.com/zLibDll/unzip.html\n\n"); | ||
| 180 | } | ||
| 181 | |||
| 182 | void do_help() | ||
| 183 | { | ||
| 184 | printf("Usage : miniunz [-e] [-x] [-v] [-l] [-o] [-p password] file.zip [file_to_extr.] [-d extractdir]\n\n" \ | ||
| 185 | " -e Extract without pathname (junk paths)\n" \ | ||
| 186 | " -x Extract with pathname\n" \ | ||
| 187 | " -v list files\n" \ | ||
| 188 | " -l list files\n" \ | ||
| 189 | " -d directory to extract into\n" \ | ||
| 190 | " -o overwrite files without prompting\n" \ | ||
| 191 | " -p extract crypted file using password\n\n"); | ||
| 192 | } | ||
| 193 | |||
| 194 | void Display64BitsSize(ZPOS64_T n, int size_char) | ||
| 195 | { | ||
| 196 | /* to avoid compatibility problem , we do here the conversion */ | ||
| 197 | char number[21]; | ||
| 198 | int offset=19; | ||
| 199 | int pos_string = 19; | ||
| 200 | number[20]=0; | ||
| 201 | for (;;) { | ||
| 202 | number[offset]=(char)((n%10)+'0'); | ||
| 203 | if (number[offset] != '0') | ||
| 204 | pos_string=offset; | ||
| 205 | n/=10; | ||
| 206 | if (offset==0) | ||
| 207 | break; | ||
| 208 | offset--; | ||
| 209 | } | ||
| 210 | { | ||
| 211 | int size_display_string = 19-pos_string; | ||
| 212 | while (size_char > size_display_string) | ||
| 213 | { | ||
| 214 | size_char--; | ||
| 215 | printf(" "); | ||
| 216 | } | ||
| 217 | } | ||
| 218 | |||
| 219 | printf("%s",&number[pos_string]); | ||
| 220 | } | ||
| 221 | |||
| 222 | int do_list(uf) | ||
| 223 | unzFile uf; | ||
| 224 | { | ||
| 225 | uLong i; | ||
| 226 | unz_global_info64 gi; | ||
| 227 | int err; | ||
| 228 | |||
| 229 | err = unzGetGlobalInfo64(uf,&gi); | ||
| 230 | if (err!=UNZ_OK) | ||
| 231 | printf("error %d with zipfile in unzGetGlobalInfo \n",err); | ||
| 232 | printf(" Length Method Size Ratio Date Time CRC-32 Name\n"); | ||
| 233 | printf(" ------ ------ ---- ----- ---- ---- ------ ----\n"); | ||
| 234 | for (i=0;i<gi.number_entry;i++) | ||
| 235 | { | ||
| 236 | char filename_inzip[256]; | ||
| 237 | unz_file_info64 file_info; | ||
| 238 | uLong ratio=0; | ||
| 239 | const char *string_method; | ||
| 240 | char charCrypt=' '; | ||
| 241 | err = unzGetCurrentFileInfo64(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0); | ||
| 242 | if (err!=UNZ_OK) | ||
| 243 | { | ||
| 244 | printf("error %d with zipfile in unzGetCurrentFileInfo\n",err); | ||
| 245 | break; | ||
| 246 | } | ||
| 247 | if (file_info.uncompressed_size>0) | ||
| 248 | ratio = (uLong)((file_info.compressed_size*100)/file_info.uncompressed_size); | ||
| 249 | |||
| 250 | /* display a '*' if the file is crypted */ | ||
| 251 | if ((file_info.flag & 1) != 0) | ||
| 252 | charCrypt='*'; | ||
| 253 | |||
| 254 | if (file_info.compression_method==0) | ||
| 255 | string_method="Stored"; | ||
| 256 | else | ||
| 257 | if (file_info.compression_method==Z_DEFLATED) | ||
| 258 | { | ||
| 259 | uInt iLevel=(uInt)((file_info.flag & 0x6)/2); | ||
| 260 | if (iLevel==0) | ||
| 261 | string_method="Defl:N"; | ||
| 262 | else if (iLevel==1) | ||
| 263 | string_method="Defl:X"; | ||
| 264 | else if ((iLevel==2) || (iLevel==3)) | ||
| 265 | string_method="Defl:F"; /* 2:fast , 3 : extra fast*/ | ||
| 266 | } | ||
| 267 | else | ||
| 268 | if (file_info.compression_method==Z_BZIP2ED) | ||
| 269 | { | ||
| 270 | string_method="BZip2 "; | ||
| 271 | } | ||
| 272 | else | ||
| 273 | string_method="Unkn. "; | ||
| 274 | |||
| 275 | Display64BitsSize(file_info.uncompressed_size,7); | ||
| 276 | printf(" %6s%c",string_method,charCrypt); | ||
| 277 | Display64BitsSize(file_info.compressed_size,7); | ||
| 278 | printf(" %3lu%% %2.2lu-%2.2lu-%2.2lu %2.2lu:%2.2lu %8.8lx %s\n", | ||
| 279 | ratio, | ||
| 280 | (uLong)file_info.tmu_date.tm_mon + 1, | ||
| 281 | (uLong)file_info.tmu_date.tm_mday, | ||
| 282 | (uLong)file_info.tmu_date.tm_year % 100, | ||
| 283 | (uLong)file_info.tmu_date.tm_hour,(uLong)file_info.tmu_date.tm_min, | ||
| 284 | (uLong)file_info.crc,filename_inzip); | ||
| 285 | if ((i+1)<gi.number_entry) | ||
| 286 | { | ||
| 287 | err = unzGoToNextFile(uf); | ||
| 288 | if (err!=UNZ_OK) | ||
| 289 | { | ||
| 290 | printf("error %d with zipfile in unzGoToNextFile\n",err); | ||
| 291 | break; | ||
| 292 | } | ||
| 293 | } | ||
| 294 | } | ||
| 295 | |||
| 296 | return 0; | ||
| 297 | } | ||
| 298 | |||
| 299 | |||
| 300 | int do_extract_currentfile(uf,popt_extract_without_path,popt_overwrite,password) | ||
| 301 | unzFile uf; | ||
| 302 | const int* popt_extract_without_path; | ||
| 303 | int* popt_overwrite; | ||
| 304 | const char* password; | ||
| 305 | { | ||
| 306 | char filename_inzip[256]; | ||
| 307 | char* filename_withoutpath; | ||
| 308 | char* p; | ||
| 309 | int err=UNZ_OK; | ||
| 310 | FILE *fout=NULL; | ||
| 311 | void* buf; | ||
| 312 | uInt size_buf; | ||
| 313 | |||
| 314 | unz_file_info64 file_info; | ||
| 315 | uLong ratio=0; | ||
| 316 | err = unzGetCurrentFileInfo64(uf,&file_info,filename_inzip,sizeof(filename_inzip),NULL,0,NULL,0); | ||
| 317 | |||
| 318 | if (err!=UNZ_OK) | ||
| 319 | { | ||
| 320 | printf("error %d with zipfile in unzGetCurrentFileInfo\n",err); | ||
| 321 | return err; | ||
| 322 | } | ||
| 323 | |||
| 324 | size_buf = WRITEBUFFERSIZE; | ||
| 325 | buf = (void*)malloc(size_buf); | ||
| 326 | if (buf==NULL) | ||
| 327 | { | ||
| 328 | printf("Error allocating memory\n"); | ||
| 329 | return UNZ_INTERNALERROR; | ||
| 330 | } | ||
| 331 | |||
| 332 | p = filename_withoutpath = filename_inzip; | ||
| 333 | while ((*p) != '\0') | ||
| 334 | { | ||
| 335 | if (((*p)=='/') || ((*p)=='\\')) | ||
| 336 | filename_withoutpath = p+1; | ||
| 337 | p++; | ||
| 338 | } | ||
| 339 | |||
| 340 | if ((*filename_withoutpath)=='\0') | ||
| 341 | { | ||
| 342 | if ((*popt_extract_without_path)==0) | ||
| 343 | { | ||
| 344 | printf("creating directory: %s\n",filename_inzip); | ||
| 345 | mymkdir(filename_inzip); | ||
| 346 | } | ||
| 347 | } | ||
| 348 | else | ||
| 349 | { | ||
| 350 | const char* write_filename; | ||
| 351 | int skip=0; | ||
| 352 | |||
| 353 | if ((*popt_extract_without_path)==0) | ||
| 354 | write_filename = filename_inzip; | ||
| 355 | else | ||
| 356 | write_filename = filename_withoutpath; | ||
| 357 | |||
| 358 | err = unzOpenCurrentFilePassword(uf,password); | ||
| 359 | if (err!=UNZ_OK) | ||
| 360 | { | ||
| 361 | printf("error %d with zipfile in unzOpenCurrentFilePassword\n",err); | ||
| 362 | } | ||
| 363 | |||
| 364 | if (((*popt_overwrite)==0) && (err==UNZ_OK)) | ||
| 365 | { | ||
| 366 | char rep=0; | ||
| 367 | FILE* ftestexist; | ||
| 368 | ftestexist = fopen64(write_filename,"rb"); | ||
| 369 | if (ftestexist!=NULL) | ||
| 370 | { | ||
| 371 | fclose(ftestexist); | ||
| 372 | do | ||
| 373 | { | ||
| 374 | char answer[128]; | ||
| 375 | int ret; | ||
| 376 | |||
| 377 | printf("The file %s exists. Overwrite ? [y]es, [n]o, [A]ll: ",write_filename); | ||
| 378 | ret = scanf("%1s",answer); | ||
| 379 | if (ret != 1) | ||
| 380 | { | ||
| 381 | exit(EXIT_FAILURE); | ||
| 382 | } | ||
| 383 | rep = answer[0] ; | ||
| 384 | if ((rep>='a') && (rep<='z')) | ||
| 385 | rep -= 0x20; | ||
| 386 | } | ||
| 387 | while ((rep!='Y') && (rep!='N') && (rep!='A')); | ||
| 388 | } | ||
| 389 | |||
| 390 | if (rep == 'N') | ||
| 391 | skip = 1; | ||
| 392 | |||
| 393 | if (rep == 'A') | ||
| 394 | *popt_overwrite=1; | ||
| 395 | } | ||
| 396 | |||
| 397 | if ((skip==0) && (err==UNZ_OK)) | ||
| 398 | { | ||
| 399 | fout=fopen64(write_filename,"wb"); | ||
| 400 | |||
| 401 | /* some zipfile don't contain directory alone before file */ | ||
| 402 | if ((fout==NULL) && ((*popt_extract_without_path)==0) && | ||
| 403 | (filename_withoutpath!=(char*)filename_inzip)) | ||
| 404 | { | ||
| 405 | char c=*(filename_withoutpath-1); | ||
| 406 | *(filename_withoutpath-1)='\0'; | ||
| 407 | makedir(write_filename); | ||
| 408 | *(filename_withoutpath-1)=c; | ||
| 409 | fout=fopen64(write_filename,"wb"); | ||
| 410 | } | ||
| 411 | |||
| 412 | if (fout==NULL) | ||
| 413 | { | ||
| 414 | printf("error opening %s\n",write_filename); | ||
| 415 | } | ||
| 416 | } | ||
| 417 | |||
| 418 | if (fout!=NULL) | ||
| 419 | { | ||
| 420 | printf(" extracting: %s\n",write_filename); | ||
| 421 | |||
| 422 | do | ||
| 423 | { | ||
| 424 | err = unzReadCurrentFile(uf,buf,size_buf); | ||
| 425 | if (err<0) | ||
| 426 | { | ||
| 427 | printf("error %d with zipfile in unzReadCurrentFile\n",err); | ||
| 428 | break; | ||
| 429 | } | ||
| 430 | if (err>0) | ||
| 431 | if (fwrite(buf,err,1,fout)!=1) | ||
| 432 | { | ||
| 433 | printf("error in writing extracted file\n"); | ||
| 434 | err=UNZ_ERRNO; | ||
| 435 | break; | ||
| 436 | } | ||
| 437 | } | ||
| 438 | while (err>0); | ||
| 439 | if (fout) | ||
| 440 | fclose(fout); | ||
| 441 | |||
| 442 | if (err==0) | ||
| 443 | change_file_date(write_filename,file_info.dosDate, | ||
| 444 | file_info.tmu_date); | ||
| 445 | } | ||
| 446 | |||
| 447 | if (err==UNZ_OK) | ||
| 448 | { | ||
| 449 | err = unzCloseCurrentFile (uf); | ||
| 450 | if (err!=UNZ_OK) | ||
| 451 | { | ||
| 452 | printf("error %d with zipfile in unzCloseCurrentFile\n",err); | ||
| 453 | } | ||
| 454 | } | ||
| 455 | else | ||
| 456 | unzCloseCurrentFile(uf); /* don't lose the error */ | ||
| 457 | } | ||
| 458 | |||
| 459 | free(buf); | ||
| 460 | return err; | ||
| 461 | } | ||
| 462 | |||
| 463 | |||
| 464 | int do_extract(uf,opt_extract_without_path,opt_overwrite,password) | ||
| 465 | unzFile uf; | ||
| 466 | int opt_extract_without_path; | ||
| 467 | int opt_overwrite; | ||
| 468 | const char* password; | ||
| 469 | { | ||
| 470 | uLong i; | ||
| 471 | unz_global_info64 gi; | ||
| 472 | int err; | ||
| 473 | FILE* fout=NULL; | ||
| 474 | |||
| 475 | err = unzGetGlobalInfo64(uf,&gi); | ||
| 476 | if (err!=UNZ_OK) | ||
| 477 | printf("error %d with zipfile in unzGetGlobalInfo \n",err); | ||
| 478 | |||
| 479 | for (i=0;i<gi.number_entry;i++) | ||
| 480 | { | ||
| 481 | if (do_extract_currentfile(uf,&opt_extract_without_path, | ||
| 482 | &opt_overwrite, | ||
| 483 | password) != UNZ_OK) | ||
| 484 | break; | ||
| 485 | |||
| 486 | if ((i+1)<gi.number_entry) | ||
| 487 | { | ||
| 488 | err = unzGoToNextFile(uf); | ||
| 489 | if (err!=UNZ_OK) | ||
| 490 | { | ||
| 491 | printf("error %d with zipfile in unzGoToNextFile\n",err); | ||
| 492 | break; | ||
| 493 | } | ||
| 494 | } | ||
| 495 | } | ||
| 496 | |||
| 497 | return 0; | ||
| 498 | } | ||
| 499 | |||
| 500 | int do_extract_onefile(uf,filename,opt_extract_without_path,opt_overwrite,password) | ||
| 501 | unzFile uf; | ||
| 502 | const char* filename; | ||
| 503 | int opt_extract_without_path; | ||
| 504 | int opt_overwrite; | ||
| 505 | const char* password; | ||
| 506 | { | ||
| 507 | int err = UNZ_OK; | ||
| 508 | if (unzLocateFile(uf,filename,CASESENSITIVITY)!=UNZ_OK) | ||
| 509 | { | ||
| 510 | printf("file %s not found in the zipfile\n",filename); | ||
| 511 | return 2; | ||
| 512 | } | ||
| 513 | |||
| 514 | if (do_extract_currentfile(uf,&opt_extract_without_path, | ||
| 515 | &opt_overwrite, | ||
| 516 | password) == UNZ_OK) | ||
| 517 | return 0; | ||
| 518 | else | ||
| 519 | return 1; | ||
| 520 | } | ||
| 521 | |||
| 522 | |||
| 523 | int main(argc,argv) | ||
| 524 | int argc; | ||
| 525 | char *argv[]; | ||
| 526 | { | ||
| 527 | const char *zipfilename=NULL; | ||
| 528 | const char *filename_to_extract=NULL; | ||
| 529 | const char *password=NULL; | ||
| 530 | char filename_try[MAXFILENAME+16] = ""; | ||
| 531 | int i; | ||
| 532 | int ret_value=0; | ||
| 533 | int opt_do_list=0; | ||
| 534 | int opt_do_extract=1; | ||
| 535 | int opt_do_extract_withoutpath=0; | ||
| 536 | int opt_overwrite=0; | ||
| 537 | int opt_extractdir=0; | ||
| 538 | const char *dirname=NULL; | ||
| 539 | unzFile uf=NULL; | ||
| 540 | |||
| 541 | do_banner(); | ||
| 542 | if (argc==1) | ||
| 543 | { | ||
| 544 | do_help(); | ||
| 545 | return 0; | ||
| 546 | } | ||
| 547 | else | ||
| 548 | { | ||
| 549 | for (i=1;i<argc;i++) | ||
| 550 | { | ||
| 551 | if ((*argv[i])=='-') | ||
| 552 | { | ||
| 553 | const char *p=argv[i]+1; | ||
| 554 | |||
| 555 | while ((*p)!='\0') | ||
| 556 | { | ||
| 557 | char c=*(p++);; | ||
| 558 | if ((c=='l') || (c=='L')) | ||
| 559 | opt_do_list = 1; | ||
| 560 | if ((c=='v') || (c=='V')) | ||
| 561 | opt_do_list = 1; | ||
| 562 | if ((c=='x') || (c=='X')) | ||
| 563 | opt_do_extract = 1; | ||
| 564 | if ((c=='e') || (c=='E')) | ||
| 565 | opt_do_extract = opt_do_extract_withoutpath = 1; | ||
| 566 | if ((c=='o') || (c=='O')) | ||
| 567 | opt_overwrite=1; | ||
| 568 | if ((c=='d') || (c=='D')) | ||
| 569 | { | ||
| 570 | opt_extractdir=1; | ||
| 571 | dirname=argv[i+1]; | ||
| 572 | } | ||
| 573 | |||
| 574 | if (((c=='p') || (c=='P')) && (i+1<argc)) | ||
| 575 | { | ||
| 576 | password=argv[i+1]; | ||
| 577 | i++; | ||
| 578 | } | ||
| 579 | } | ||
| 580 | } | ||
| 581 | else | ||
| 582 | { | ||
| 583 | if (zipfilename == NULL) | ||
| 584 | zipfilename = argv[i]; | ||
| 585 | else if ((filename_to_extract==NULL) && (!opt_extractdir)) | ||
| 586 | filename_to_extract = argv[i] ; | ||
| 587 | } | ||
| 588 | } | ||
| 589 | } | ||
| 590 | |||
| 591 | if (zipfilename!=NULL) | ||
| 592 | { | ||
| 593 | |||
| 594 | # ifdef USEWIN32IOAPI | ||
| 595 | zlib_filefunc64_def ffunc; | ||
| 596 | # endif | ||
| 597 | |||
| 598 | strncpy(filename_try, zipfilename,MAXFILENAME-1); | ||
| 599 | /* strncpy doesnt append the trailing NULL, of the string is too long. */ | ||
| 600 | filename_try[ MAXFILENAME ] = '\0'; | ||
| 601 | |||
| 602 | # ifdef USEWIN32IOAPI | ||
| 603 | fill_win32_filefunc64A(&ffunc); | ||
| 604 | uf = unzOpen2_64(zipfilename,&ffunc); | ||
| 605 | # else | ||
| 606 | uf = unzOpen64(zipfilename); | ||
| 607 | # endif | ||
| 608 | if (uf==NULL) | ||
| 609 | { | ||
| 610 | strcat(filename_try,".zip"); | ||
| 611 | # ifdef USEWIN32IOAPI | ||
| 612 | uf = unzOpen2_64(filename_try,&ffunc); | ||
| 613 | # else | ||
| 614 | uf = unzOpen64(filename_try); | ||
| 615 | # endif | ||
| 616 | } | ||
| 617 | } | ||
| 618 | |||
| 619 | if (uf==NULL) | ||
| 620 | { | ||
| 621 | printf("Cannot open %s or %s.zip\n",zipfilename,zipfilename); | ||
| 622 | return 1; | ||
| 623 | } | ||
| 624 | printf("%s opened\n",filename_try); | ||
| 625 | |||
| 626 | if (opt_do_list==1) | ||
| 627 | ret_value = do_list(uf); | ||
| 628 | else if (opt_do_extract==1) | ||
| 629 | { | ||
| 630 | #ifdef _WIN32 | ||
| 631 | if (opt_extractdir && _chdir(dirname)) | ||
| 632 | #else | ||
| 633 | if (opt_extractdir && chdir(dirname)) | ||
| 634 | #endif | ||
| 635 | { | ||
| 636 | printf("Error changing into %s, aborting\n", dirname); | ||
| 637 | exit(-1); | ||
| 638 | } | ||
| 639 | |||
| 640 | if (filename_to_extract == NULL) | ||
| 641 | ret_value = do_extract(uf, opt_do_extract_withoutpath, opt_overwrite, password); | ||
| 642 | else | ||
| 643 | ret_value = do_extract_onefile(uf, filename_to_extract, opt_do_extract_withoutpath, opt_overwrite, password); | ||
| 644 | } | ||
| 645 | |||
| 646 | unzClose(uf); | ||
| 647 | |||
| 648 | return ret_value; | ||
| 649 | } | ||
diff --git a/contrib/contrib/minizip/minizip.c b/contrib/contrib/minizip/minizip.c deleted file mode 100644 index 9e310e8..0000000 --- a/contrib/contrib/minizip/minizip.c +++ /dev/null | |||
| @@ -1,508 +0,0 @@ | |||
| 1 | /* | ||
| 2 | minizip.c | ||
| 3 | Version 1.1, January 7th, 2010 | ||
| 4 | sample part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) | ||
| 5 | |||
| 6 | Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) | ||
| 7 | |||
| 8 | Modifications of Unzip for Zip64 | ||
| 9 | Copyright (C) 2007-2008 Even Rouault | ||
| 10 | |||
| 11 | Modifications for Zip64 support on both zip and unzip | ||
| 12 | Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) | ||
| 13 | */ | ||
| 14 | |||
| 15 | #include "zip.h" | ||
| 16 | |||
| 17 | #ifndef _WIN32 | ||
| 18 | #ifndef __USE_FILE_OFFSET64 | ||
| 19 | #define __USE_FILE_OFFSET64 | ||
| 20 | #endif | ||
| 21 | #ifndef __USE_LARGEFILE64 | ||
| 22 | #define __USE_LARGEFILE64 | ||
| 23 | #endif | ||
| 24 | #ifndef _LARGEFILE64_SOURCE | ||
| 25 | #define _LARGEFILE64_SOURCE | ||
| 26 | #endif | ||
| 27 | #ifndef _FILE_OFFSET_BIT | ||
| 28 | #define _FILE_OFFSET_BIT 64 | ||
| 29 | #endif | ||
| 30 | #endif | ||
| 31 | |||
| 32 | #include <stdio.h> | ||
| 33 | #include <stdlib.h> | ||
| 34 | #include <string.h> | ||
| 35 | #include <time.h> | ||
| 36 | #include <errno.h> | ||
| 37 | #include <fcntl.h> | ||
| 38 | |||
| 39 | #ifdef unix | ||
| 40 | # include <unistd.h> | ||
| 41 | # include <utime.h> | ||
| 42 | # include <sys/types.h> | ||
| 43 | # include <sys/stat.h> | ||
| 44 | #else | ||
| 45 | # include <direct.h> | ||
| 46 | # include <io.h> | ||
| 47 | #endif | ||
| 48 | |||
| 49 | |||
| 50 | #ifdef _WIN32 | ||
| 51 | #define USEWIN32IOAPI | ||
| 52 | #include "iowin32.h" | ||
| 53 | #endif | ||
| 54 | |||
| 55 | |||
| 56 | |||
| 57 | #define WRITEBUFFERSIZE (16384) | ||
| 58 | #define MAXFILENAME (256) | ||
| 59 | |||
| 60 | #ifdef _WIN32 | ||
| 61 | uLong filetime(f, tmzip, dt) | ||
| 62 | char *f; /* name of file to get info on */ | ||
| 63 | tm_zip *tmzip; /* return value: access, modific. and creation times */ | ||
| 64 | uLong *dt; /* dostime */ | ||
| 65 | { | ||
| 66 | int ret = 0; | ||
| 67 | { | ||
| 68 | FILETIME ftLocal; | ||
| 69 | HANDLE hFind; | ||
| 70 | WIN32_FIND_DATAA ff32; | ||
| 71 | |||
| 72 | hFind = FindFirstFileA(f,&ff32); | ||
| 73 | if (hFind != INVALID_HANDLE_VALUE) | ||
| 74 | { | ||
| 75 | FileTimeToLocalFileTime(&(ff32.ftLastWriteTime),&ftLocal); | ||
| 76 | FileTimeToDosDateTime(&ftLocal,((LPWORD)dt)+1,((LPWORD)dt)+0); | ||
| 77 | FindClose(hFind); | ||
| 78 | ret = 1; | ||
| 79 | } | ||
| 80 | } | ||
| 81 | return ret; | ||
| 82 | } | ||
| 83 | #else | ||
| 84 | #ifdef unix | ||
| 85 | uLong filetime(f, tmzip, dt) | ||
| 86 | char *f; /* name of file to get info on */ | ||
| 87 | tm_zip *tmzip; /* return value: access, modific. and creation times */ | ||
| 88 | uLong *dt; /* dostime */ | ||
| 89 | { | ||
| 90 | int ret=0; | ||
| 91 | struct stat s; /* results of stat() */ | ||
| 92 | struct tm* filedate; | ||
| 93 | time_t tm_t=0; | ||
| 94 | |||
| 95 | if (strcmp(f,"-")!=0) | ||
| 96 | { | ||
| 97 | char name[MAXFILENAME+1]; | ||
| 98 | int len = strlen(f); | ||
| 99 | if (len > MAXFILENAME) | ||
| 100 | len = MAXFILENAME; | ||
| 101 | |||
| 102 | strncpy(name, f,MAXFILENAME-1); | ||
| 103 | /* strncpy doesnt append the trailing NULL, of the string is too long. */ | ||
| 104 | name[ MAXFILENAME ] = '\0'; | ||
| 105 | |||
| 106 | if (name[len - 1] == '/') | ||
| 107 | name[len - 1] = '\0'; | ||
| 108 | /* not all systems allow stat'ing a file with / appended */ | ||
| 109 | if (stat(name,&s)==0) | ||
| 110 | { | ||
| 111 | tm_t = s.st_mtime; | ||
| 112 | ret = 1; | ||
| 113 | } | ||
| 114 | } | ||
| 115 | filedate = localtime(&tm_t); | ||
| 116 | |||
| 117 | tmzip->tm_sec = filedate->tm_sec; | ||
| 118 | tmzip->tm_min = filedate->tm_min; | ||
| 119 | tmzip->tm_hour = filedate->tm_hour; | ||
| 120 | tmzip->tm_mday = filedate->tm_mday; | ||
| 121 | tmzip->tm_mon = filedate->tm_mon ; | ||
| 122 | tmzip->tm_year = filedate->tm_year; | ||
| 123 | |||
| 124 | return ret; | ||
| 125 | } | ||
| 126 | #else | ||
| 127 | uLong filetime(f, tmzip, dt) | ||
| 128 | char *f; /* name of file to get info on */ | ||
| 129 | tm_zip *tmzip; /* return value: access, modific. and creation times */ | ||
| 130 | uLong *dt; /* dostime */ | ||
| 131 | { | ||
| 132 | return 0; | ||
| 133 | } | ||
| 134 | #endif | ||
| 135 | #endif | ||
| 136 | |||
| 137 | |||
| 138 | |||
| 139 | |||
| 140 | int check_exist_file(filename) | ||
| 141 | const char* filename; | ||
| 142 | { | ||
| 143 | FILE* ftestexist; | ||
| 144 | int ret = 1; | ||
| 145 | ftestexist = fopen64(filename,"rb"); | ||
| 146 | if (ftestexist==NULL) | ||
| 147 | ret = 0; | ||
| 148 | else | ||
| 149 | fclose(ftestexist); | ||
| 150 | return ret; | ||
| 151 | } | ||
| 152 | |||
| 153 | void do_banner() | ||
| 154 | { | ||
| 155 | printf("MiniZip64 1.0, demo of zLib + MiniZip64 package, written by Gilles Vollant\n"); | ||
| 156 | printf("more info on MiniZip at http://www.winimage.com/zLibDll/minizip.html\n\n"); | ||
| 157 | printf("more info on MiniZip64 at http://result42.com/projects/MiniZip64\n\n"); | ||
| 158 | } | ||
| 159 | |||
| 160 | void do_help() | ||
| 161 | { | ||
| 162 | printf("Usage : minizip [-o] [-a] [-0 to -9] [-p password] [-j] file.zip [files_to_add]\n\n" \ | ||
| 163 | " -o Overwrite existing file.zip\n" \ | ||
| 164 | " -a Append to existing file.zip\n" \ | ||
| 165 | " -0 Store only\n" \ | ||
| 166 | " -1 Compress faster\n" \ | ||
| 167 | " -9 Compress better\n\n" \ | ||
| 168 | " -j exclude path. store only the file name.\n\n"); | ||
| 169 | } | ||
| 170 | |||
| 171 | /* calculate the CRC32 of a file, | ||
| 172 | because to encrypt a file, we need known the CRC32 of the file before */ | ||
| 173 | int getFileCrc(const char* filenameinzip,void*buf,unsigned long size_buf,unsigned long* result_crc) | ||
| 174 | { | ||
| 175 | unsigned long calculate_crc=0; | ||
| 176 | int err=ZIP_OK; | ||
| 177 | FILE * fin = fopen64(filenameinzip,"rb"); | ||
| 178 | unsigned long size_read = 0; | ||
| 179 | unsigned long total_read = 0; | ||
| 180 | if (fin==NULL) | ||
| 181 | { | ||
| 182 | err = ZIP_ERRNO; | ||
| 183 | } | ||
| 184 | |||
| 185 | if (err == ZIP_OK) | ||
| 186 | do | ||
| 187 | { | ||
| 188 | err = ZIP_OK; | ||
| 189 | size_read = (int)fread(buf,1,size_buf,fin); | ||
| 190 | if (size_read < size_buf) | ||
| 191 | if (feof(fin)==0) | ||
| 192 | { | ||
| 193 | printf("error in reading %s\n",filenameinzip); | ||
| 194 | err = ZIP_ERRNO; | ||
| 195 | } | ||
| 196 | |||
| 197 | if (size_read>0) | ||
| 198 | calculate_crc = crc32(calculate_crc,buf,size_read); | ||
| 199 | total_read += size_read; | ||
| 200 | |||
| 201 | } while ((err == ZIP_OK) && (size_read>0)); | ||
| 202 | |||
| 203 | if (fin) | ||
| 204 | fclose(fin); | ||
| 205 | |||
| 206 | *result_crc=calculate_crc; | ||
| 207 | printf("file %s crc %lx\n", filenameinzip, calculate_crc); | ||
| 208 | return err; | ||
| 209 | } | ||
| 210 | |||
| 211 | int isLargeFile(const char* filename) | ||
| 212 | { | ||
| 213 | int largeFile = 0; | ||
| 214 | ZPOS64_T pos = 0; | ||
| 215 | FILE* pFile = fopen64(filename, "rb"); | ||
| 216 | |||
| 217 | if(pFile != NULL) | ||
| 218 | { | ||
| 219 | int n = fseeko64(pFile, 0, SEEK_END); | ||
| 220 | |||
| 221 | pos = ftello64(pFile); | ||
| 222 | |||
| 223 | printf("File : %s is %lld bytes\n", filename, pos); | ||
| 224 | |||
| 225 | if(pos >= 0xffffffff) | ||
| 226 | largeFile = 1; | ||
| 227 | |||
| 228 | fclose(pFile); | ||
| 229 | } | ||
| 230 | |||
| 231 | return largeFile; | ||
| 232 | } | ||
| 233 | |||
| 234 | int main(argc,argv) | ||
| 235 | int argc; | ||
| 236 | char *argv[]; | ||
| 237 | { | ||
| 238 | int i; | ||
| 239 | int opt_overwrite=0; | ||
| 240 | int opt_compress_level=Z_DEFAULT_COMPRESSION; | ||
| 241 | int opt_exclude_path=0; | ||
| 242 | int zipfilenamearg = 0; | ||
| 243 | char filename_try[MAXFILENAME+16]; | ||
| 244 | int zipok; | ||
| 245 | int err=0; | ||
| 246 | int size_buf=0; | ||
| 247 | void* buf=NULL; | ||
| 248 | const char* password=NULL; | ||
| 249 | |||
| 250 | |||
| 251 | do_banner(); | ||
| 252 | if (argc==1) | ||
| 253 | { | ||
| 254 | do_help(); | ||
| 255 | return 0; | ||
| 256 | } | ||
| 257 | else | ||
| 258 | { | ||
| 259 | for (i=1;i<argc;i++) | ||
| 260 | { | ||
| 261 | if ((*argv[i])=='-') | ||
| 262 | { | ||
| 263 | const char *p=argv[i]+1; | ||
| 264 | |||
| 265 | while ((*p)!='\0') | ||
| 266 | { | ||
| 267 | char c=*(p++);; | ||
| 268 | if ((c=='o') || (c=='O')) | ||
| 269 | opt_overwrite = 1; | ||
| 270 | if ((c=='a') || (c=='A')) | ||
| 271 | opt_overwrite = 2; | ||
| 272 | if ((c>='0') && (c<='9')) | ||
| 273 | opt_compress_level = c-'0'; | ||
| 274 | if ((c=='j') || (c=='J')) | ||
| 275 | opt_exclude_path = 1; | ||
| 276 | |||
| 277 | if (((c=='p') || (c=='P')) && (i+1<argc)) | ||
| 278 | { | ||
| 279 | password=argv[i+1]; | ||
| 280 | i++; | ||
| 281 | } | ||
| 282 | } | ||
| 283 | } | ||
| 284 | else | ||
| 285 | { | ||
| 286 | if (zipfilenamearg == 0) | ||
| 287 | { | ||
| 288 | zipfilenamearg = i ; | ||
| 289 | } | ||
| 290 | } | ||
| 291 | } | ||
| 292 | } | ||
| 293 | |||
| 294 | size_buf = WRITEBUFFERSIZE; | ||
| 295 | buf = (void*)malloc(size_buf); | ||
| 296 | if (buf==NULL) | ||
| 297 | { | ||
| 298 | printf("Error allocating memory\n"); | ||
| 299 | return ZIP_INTERNALERROR; | ||
| 300 | } | ||
| 301 | |||
| 302 | if (zipfilenamearg==0) | ||
| 303 | { | ||
| 304 | zipok=0; | ||
| 305 | } | ||
| 306 | else | ||
| 307 | { | ||
| 308 | int i,len; | ||
| 309 | int dot_found=0; | ||
| 310 | |||
| 311 | zipok = 1 ; | ||
| 312 | strncpy(filename_try, argv[zipfilenamearg],MAXFILENAME-1); | ||
| 313 | /* strncpy doesnt append the trailing NULL, of the string is too long. */ | ||
| 314 | filename_try[ MAXFILENAME ] = '\0'; | ||
| 315 | |||
| 316 | len=(int)strlen(filename_try); | ||
| 317 | for (i=0;i<len;i++) | ||
| 318 | if (filename_try[i]=='.') | ||
| 319 | dot_found=1; | ||
| 320 | |||
| 321 | if (dot_found==0) | ||
| 322 | strcat(filename_try,".zip"); | ||
| 323 | |||
| 324 | if (opt_overwrite==2) | ||
| 325 | { | ||
| 326 | /* if the file don't exist, we not append file */ | ||
| 327 | if (check_exist_file(filename_try)==0) | ||
| 328 | opt_overwrite=1; | ||
| 329 | } | ||
| 330 | else | ||
| 331 | if (opt_overwrite==0) | ||
| 332 | if (check_exist_file(filename_try)!=0) | ||
| 333 | { | ||
| 334 | char rep=0; | ||
| 335 | do | ||
| 336 | { | ||
| 337 | char answer[128]; | ||
| 338 | int ret; | ||
| 339 | printf("The file %s exists. Overwrite ? [y]es, [n]o, [a]ppend : ",filename_try); | ||
| 340 | ret = scanf("%1s",answer); | ||
| 341 | if (ret != 1) | ||
| 342 | { | ||
| 343 | exit(EXIT_FAILURE); | ||
| 344 | } | ||
| 345 | rep = answer[0] ; | ||
| 346 | if ((rep>='a') && (rep<='z')) | ||
| 347 | rep -= 0x20; | ||
| 348 | } | ||
| 349 | while ((rep!='Y') && (rep!='N') && (rep!='A')); | ||
| 350 | if (rep=='N') | ||
| 351 | zipok = 0; | ||
| 352 | if (rep=='A') | ||
| 353 | opt_overwrite = 2; | ||
| 354 | } | ||
| 355 | } | ||
| 356 | |||
| 357 | if (zipok==1) | ||
| 358 | { | ||
| 359 | zipFile zf; | ||
| 360 | int errclose; | ||
| 361 | # ifdef USEWIN32IOAPI | ||
| 362 | zlib_filefunc64_def ffunc; | ||
| 363 | fill_win32_filefunc64A(&ffunc); | ||
| 364 | zf = zipOpen2_64(filename_try,(opt_overwrite==2) ? 2 : 0,NULL,&ffunc); | ||
| 365 | # else | ||
| 366 | zf = zipOpen64(filename_try,(opt_overwrite==2) ? 2 : 0); | ||
| 367 | # endif | ||
| 368 | |||
| 369 | if (zf == NULL) | ||
| 370 | { | ||
| 371 | printf("error opening %s\n",filename_try); | ||
| 372 | err= ZIP_ERRNO; | ||
| 373 | } | ||
| 374 | else | ||
| 375 | printf("creating %s\n",filename_try); | ||
| 376 | |||
| 377 | for (i=zipfilenamearg+1;(i<argc) && (err==ZIP_OK);i++) | ||
| 378 | { | ||
| 379 | if (!((((*(argv[i]))=='-') || ((*(argv[i]))=='/')) && | ||
| 380 | ((argv[i][1]=='o') || (argv[i][1]=='O') || | ||
| 381 | (argv[i][1]=='a') || (argv[i][1]=='A') || | ||
| 382 | (argv[i][1]=='p') || (argv[i][1]=='P') || | ||
| 383 | ((argv[i][1]>='0') || (argv[i][1]<='9'))) && | ||
| 384 | (strlen(argv[i]) == 2))) | ||
| 385 | { | ||
| 386 | FILE * fin; | ||
| 387 | int size_read; | ||
| 388 | const char* filenameinzip = argv[i]; | ||
| 389 | const char *savefilenameinzip; | ||
| 390 | zip_fileinfo zi; | ||
| 391 | unsigned long crcFile=0; | ||
| 392 | int zip64 = 0; | ||
| 393 | |||
| 394 | zi.tmz_date.tm_sec = zi.tmz_date.tm_min = zi.tmz_date.tm_hour = | ||
| 395 | zi.tmz_date.tm_mday = zi.tmz_date.tm_mon = zi.tmz_date.tm_year = 0; | ||
| 396 | zi.dosDate = 0; | ||
| 397 | zi.internal_fa = 0; | ||
| 398 | zi.external_fa = 0; | ||
| 399 | filetime(filenameinzip,&zi.tmz_date,&zi.dosDate); | ||
| 400 | |||
| 401 | /* | ||
| 402 | err = zipOpenNewFileInZip(zf,filenameinzip,&zi, | ||
| 403 | NULL,0,NULL,0,NULL / * comment * /, | ||
| 404 | (opt_compress_level != 0) ? Z_DEFLATED : 0, | ||
| 405 | opt_compress_level); | ||
| 406 | */ | ||
| 407 | if ((password != NULL) && (err==ZIP_OK)) | ||
| 408 | err = getFileCrc(filenameinzip,buf,size_buf,&crcFile); | ||
| 409 | |||
| 410 | zip64 = isLargeFile(filenameinzip); | ||
| 411 | |||
| 412 | /* The path name saved, should not include a leading slash. */ | ||
| 413 | /*if it did, windows/xp and dynazip couldn't read the zip file. */ | ||
| 414 | savefilenameinzip = filenameinzip; | ||
| 415 | while( savefilenameinzip[0] == '\\' || savefilenameinzip[0] == '/' ) | ||
| 416 | { | ||
| 417 | savefilenameinzip++; | ||
| 418 | } | ||
| 419 | |||
| 420 | /*should the zip file contain any path at all?*/ | ||
| 421 | if( opt_exclude_path ) | ||
| 422 | { | ||
| 423 | const char *tmpptr; | ||
| 424 | const char *lastslash = 0; | ||
| 425 | for( tmpptr = savefilenameinzip; *tmpptr; tmpptr++) | ||
| 426 | { | ||
| 427 | if( *tmpptr == '\\' || *tmpptr == '/') | ||
| 428 | { | ||
| 429 | lastslash = tmpptr; | ||
| 430 | } | ||
| 431 | } | ||
| 432 | if( lastslash != NULL ) | ||
| 433 | { | ||
| 434 | savefilenameinzip = lastslash+1; // base filename follows last slash. | ||
| 435 | } | ||
| 436 | } | ||
| 437 | |||
| 438 | /**/ | ||
| 439 | err = zipOpenNewFileInZip3_64(zf,savefilenameinzip,&zi, | ||
| 440 | NULL,0,NULL,0,NULL /* comment*/, | ||
| 441 | (opt_compress_level != 0) ? Z_DEFLATED : 0, | ||
| 442 | opt_compress_level,0, | ||
| 443 | /* -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY, */ | ||
| 444 | -MAX_WBITS, DEF_MEM_LEVEL, Z_DEFAULT_STRATEGY, | ||
| 445 | password,crcFile, zip64); | ||
| 446 | |||
| 447 | if (err != ZIP_OK) | ||
| 448 | printf("error in opening %s in zipfile\n",filenameinzip); | ||
| 449 | else | ||
| 450 | { | ||
| 451 | fin = fopen64(filenameinzip,"rb"); | ||
| 452 | if (fin==NULL) | ||
| 453 | { | ||
| 454 | err=ZIP_ERRNO; | ||
| 455 | printf("error in opening %s for reading\n",filenameinzip); | ||
| 456 | } | ||
| 457 | } | ||
| 458 | |||
| 459 | if (err == ZIP_OK) | ||
| 460 | do | ||
| 461 | { | ||
| 462 | err = ZIP_OK; | ||
| 463 | size_read = (int)fread(buf,1,size_buf,fin); | ||
| 464 | if (size_read < size_buf) | ||
| 465 | if (feof(fin)==0) | ||
| 466 | { | ||
| 467 | printf("error in reading %s\n",filenameinzip); | ||
| 468 | err = ZIP_ERRNO; | ||
| 469 | } | ||
| 470 | |||
| 471 | if (size_read>0) | ||
| 472 | { | ||
| 473 | err = zipWriteInFileInZip (zf,buf,size_read); | ||
| 474 | if (err<0) | ||
| 475 | { | ||
| 476 | printf("error in writing %s in the zipfile\n", | ||
| 477 | filenameinzip); | ||
| 478 | } | ||
| 479 | |||
| 480 | } | ||
| 481 | } while ((err == ZIP_OK) && (size_read>0)); | ||
| 482 | |||
| 483 | if (fin) | ||
| 484 | fclose(fin); | ||
| 485 | |||
| 486 | if (err<0) | ||
| 487 | err=ZIP_ERRNO; | ||
| 488 | else | ||
| 489 | { | ||
| 490 | err = zipCloseFileInZip(zf); | ||
| 491 | if (err!=ZIP_OK) | ||
| 492 | printf("error in closing %s in the zipfile\n", | ||
| 493 | filenameinzip); | ||
| 494 | } | ||
| 495 | } | ||
| 496 | } | ||
| 497 | errclose = zipClose(zf,NULL); | ||
| 498 | if (errclose != ZIP_OK) | ||
| 499 | printf("error in closing %s\n",filename_try); | ||
| 500 | } | ||
| 501 | else | ||
| 502 | { | ||
| 503 | do_help(); | ||
| 504 | } | ||
| 505 | |||
| 506 | free(buf); | ||
| 507 | return 0; | ||
| 508 | } | ||
diff --git a/contrib/contrib/vstudio/vc8/zlibstat.vcproj b/contrib/contrib/vstudio/vc8/zlibstat.vcproj deleted file mode 100644 index 2763eec..0000000 --- a/contrib/contrib/vstudio/vc8/zlibstat.vcproj +++ /dev/null | |||
| @@ -1,881 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="Windows-1252"?> | ||
| 2 | <VisualStudioProject | ||
| 3 | ProjectType="Visual C++" | ||
| 4 | Version="8,00" | ||
| 5 | Name="zlibstat" | ||
| 6 | ProjectGUID="{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}" | ||
| 7 | > | ||
| 8 | <Platforms> | ||
| 9 | <Platform | ||
| 10 | Name="Win32" | ||
| 11 | /> | ||
| 12 | <Platform | ||
| 13 | Name="x64" | ||
| 14 | /> | ||
| 15 | <Platform | ||
| 16 | Name="Itanium" | ||
| 17 | /> | ||
| 18 | </Platforms> | ||
| 19 | <ToolFiles> | ||
| 20 | </ToolFiles> | ||
| 21 | <Configurations> | ||
| 22 | <Configuration | ||
| 23 | Name="Debug|Win32" | ||
| 24 | OutputDirectory="x86\ZlibStat$(ConfigurationName)" | ||
| 25 | IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp" | ||
| 26 | ConfigurationType="4" | ||
| 27 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | ||
| 28 | UseOfMFC="0" | ||
| 29 | ATLMinimizesCRunTimeLibraryUsage="false" | ||
| 30 | > | ||
| 31 | <Tool | ||
| 32 | Name="VCPreBuildEventTool" | ||
| 33 | /> | ||
| 34 | <Tool | ||
| 35 | Name="VCCustomBuildTool" | ||
| 36 | /> | ||
| 37 | <Tool | ||
| 38 | Name="VCXMLDataGeneratorTool" | ||
| 39 | /> | ||
| 40 | <Tool | ||
| 41 | Name="VCWebServiceProxyGeneratorTool" | ||
| 42 | /> | ||
| 43 | <Tool | ||
| 44 | Name="VCMIDLTool" | ||
| 45 | /> | ||
| 46 | <Tool | ||
| 47 | Name="VCCLCompilerTool" | ||
| 48 | Optimization="0" | ||
| 49 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | ||
| 50 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NO_snprintf;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" | ||
| 51 | ExceptionHandling="0" | ||
| 52 | RuntimeLibrary="1" | ||
| 53 | BufferSecurityCheck="false" | ||
| 54 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" | ||
| 55 | AssemblerListingLocation="$(IntDir)\" | ||
| 56 | ObjectFile="$(IntDir)\" | ||
| 57 | ProgramDataBaseFileName="$(OutDir)\" | ||
| 58 | WarningLevel="3" | ||
| 59 | SuppressStartupBanner="true" | ||
| 60 | Detect64BitPortabilityProblems="true" | ||
| 61 | DebugInformationFormat="1" | ||
| 62 | /> | ||
| 63 | <Tool | ||
| 64 | Name="VCManagedResourceCompilerTool" | ||
| 65 | /> | ||
| 66 | <Tool | ||
| 67 | Name="VCResourceCompilerTool" | ||
| 68 | Culture="1036" | ||
| 69 | /> | ||
| 70 | <Tool | ||
| 71 | Name="VCPreLinkEventTool" | ||
| 72 | /> | ||
| 73 | <Tool | ||
| 74 | Name="VCLibrarianTool" | ||
| 75 | AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB" | ||
| 76 | OutputFile="$(OutDir)\zlibstat.lib" | ||
| 77 | SuppressStartupBanner="true" | ||
| 78 | /> | ||
| 79 | <Tool | ||
| 80 | Name="VCALinkTool" | ||
| 81 | /> | ||
| 82 | <Tool | ||
| 83 | Name="VCXDCMakeTool" | ||
| 84 | /> | ||
| 85 | <Tool | ||
| 86 | Name="VCBscMakeTool" | ||
| 87 | /> | ||
| 88 | <Tool | ||
| 89 | Name="VCFxCopTool" | ||
| 90 | /> | ||
| 91 | <Tool | ||
| 92 | Name="VCPostBuildEventTool" | ||
| 93 | /> | ||
| 94 | </Configuration> | ||
| 95 | <Configuration | ||
| 96 | Name="Debug|x64" | ||
| 97 | OutputDirectory="x64\ZlibStat$(ConfigurationName)" | ||
| 98 | IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp" | ||
| 99 | ConfigurationType="4" | ||
| 100 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | ||
| 101 | UseOfMFC="0" | ||
| 102 | ATLMinimizesCRunTimeLibraryUsage="false" | ||
| 103 | > | ||
| 104 | <Tool | ||
| 105 | Name="VCPreBuildEventTool" | ||
| 106 | /> | ||
| 107 | <Tool | ||
| 108 | Name="VCCustomBuildTool" | ||
| 109 | /> | ||
| 110 | <Tool | ||
| 111 | Name="VCXMLDataGeneratorTool" | ||
| 112 | /> | ||
| 113 | <Tool | ||
| 114 | Name="VCWebServiceProxyGeneratorTool" | ||
| 115 | /> | ||
| 116 | <Tool | ||
| 117 | Name="VCMIDLTool" | ||
| 118 | TargetEnvironment="3" | ||
| 119 | /> | ||
| 120 | <Tool | ||
| 121 | Name="VCCLCompilerTool" | ||
| 122 | Optimization="0" | ||
| 123 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | ||
| 124 | PreprocessorDefinitions="ZLIB_WINAPI;NO_snprintf;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" | ||
| 125 | ExceptionHandling="0" | ||
| 126 | RuntimeLibrary="3" | ||
| 127 | BufferSecurityCheck="false" | ||
| 128 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" | ||
| 129 | AssemblerListingLocation="$(IntDir)\" | ||
| 130 | ObjectFile="$(IntDir)\" | ||
| 131 | ProgramDataBaseFileName="$(OutDir)\" | ||
| 132 | WarningLevel="3" | ||
| 133 | SuppressStartupBanner="true" | ||
| 134 | Detect64BitPortabilityProblems="true" | ||
| 135 | DebugInformationFormat="1" | ||
| 136 | /> | ||
| 137 | <Tool | ||
| 138 | Name="VCManagedResourceCompilerTool" | ||
| 139 | /> | ||
| 140 | <Tool | ||
| 141 | Name="VCResourceCompilerTool" | ||
| 142 | Culture="1036" | ||
| 143 | /> | ||
| 144 | <Tool | ||
| 145 | Name="VCPreLinkEventTool" | ||
| 146 | /> | ||
| 147 | <Tool | ||
| 148 | Name="VCLibrarianTool" | ||
| 149 | AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB" | ||
| 150 | OutputFile="$(OutDir)\zlibstat.lib" | ||
| 151 | SuppressStartupBanner="true" | ||
| 152 | /> | ||
| 153 | <Tool | ||
| 154 | Name="VCALinkTool" | ||
| 155 | /> | ||
| 156 | <Tool | ||
| 157 | Name="VCXDCMakeTool" | ||
| 158 | /> | ||
| 159 | <Tool | ||
| 160 | Name="VCBscMakeTool" | ||
| 161 | /> | ||
| 162 | <Tool | ||
| 163 | Name="VCFxCopTool" | ||
| 164 | /> | ||
| 165 | <Tool | ||
| 166 | Name="VCPostBuildEventTool" | ||
| 167 | /> | ||
| 168 | </Configuration> | ||
| 169 | <Configuration | ||
| 170 | Name="Debug|Itanium" | ||
| 171 | OutputDirectory="ia64\ZlibStat$(ConfigurationName)" | ||
| 172 | IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp" | ||
| 173 | ConfigurationType="4" | ||
| 174 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | ||
| 175 | UseOfMFC="0" | ||
| 176 | ATLMinimizesCRunTimeLibraryUsage="false" | ||
| 177 | > | ||
| 178 | <Tool | ||
| 179 | Name="VCPreBuildEventTool" | ||
| 180 | /> | ||
| 181 | <Tool | ||
| 182 | Name="VCCustomBuildTool" | ||
| 183 | /> | ||
| 184 | <Tool | ||
| 185 | Name="VCXMLDataGeneratorTool" | ||
| 186 | /> | ||
| 187 | <Tool | ||
| 188 | Name="VCWebServiceProxyGeneratorTool" | ||
| 189 | /> | ||
| 190 | <Tool | ||
| 191 | Name="VCMIDLTool" | ||
| 192 | TargetEnvironment="2" | ||
| 193 | /> | ||
| 194 | <Tool | ||
| 195 | Name="VCCLCompilerTool" | ||
| 196 | Optimization="0" | ||
| 197 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | ||
| 198 | PreprocessorDefinitions="ZLIB_WINAPI;NO_snprintf;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" | ||
| 199 | ExceptionHandling="0" | ||
| 200 | RuntimeLibrary="3" | ||
| 201 | BufferSecurityCheck="false" | ||
| 202 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" | ||
| 203 | AssemblerListingLocation="$(IntDir)\" | ||
| 204 | ObjectFile="$(IntDir)\" | ||
| 205 | ProgramDataBaseFileName="$(OutDir)\" | ||
| 206 | WarningLevel="3" | ||
| 207 | SuppressStartupBanner="true" | ||
| 208 | Detect64BitPortabilityProblems="true" | ||
| 209 | DebugInformationFormat="1" | ||
| 210 | /> | ||
| 211 | <Tool | ||
| 212 | Name="VCManagedResourceCompilerTool" | ||
| 213 | /> | ||
| 214 | <Tool | ||
| 215 | Name="VCResourceCompilerTool" | ||
| 216 | Culture="1036" | ||
| 217 | /> | ||
| 218 | <Tool | ||
| 219 | Name="VCPreLinkEventTool" | ||
| 220 | /> | ||
| 221 | <Tool | ||
| 222 | Name="VCLibrarianTool" | ||
| 223 | AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB" | ||
| 224 | OutputFile="$(OutDir)\zlibstat.lib" | ||
| 225 | SuppressStartupBanner="true" | ||
| 226 | /> | ||
| 227 | <Tool | ||
| 228 | Name="VCALinkTool" | ||
| 229 | /> | ||
| 230 | <Tool | ||
| 231 | Name="VCXDCMakeTool" | ||
| 232 | /> | ||
| 233 | <Tool | ||
| 234 | Name="VCBscMakeTool" | ||
| 235 | /> | ||
| 236 | <Tool | ||
| 237 | Name="VCFxCopTool" | ||
| 238 | /> | ||
| 239 | <Tool | ||
| 240 | Name="VCPostBuildEventTool" | ||
| 241 | /> | ||
| 242 | </Configuration> | ||
| 243 | <Configuration | ||
| 244 | Name="Release|Win32" | ||
| 245 | OutputDirectory="x86\ZlibStat$(ConfigurationName)" | ||
| 246 | IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp" | ||
| 247 | ConfigurationType="4" | ||
| 248 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | ||
| 249 | UseOfMFC="0" | ||
| 250 | ATLMinimizesCRunTimeLibraryUsage="false" | ||
| 251 | > | ||
| 252 | <Tool | ||
| 253 | Name="VCPreBuildEventTool" | ||
| 254 | /> | ||
| 255 | <Tool | ||
| 256 | Name="VCCustomBuildTool" | ||
| 257 | /> | ||
| 258 | <Tool | ||
| 259 | Name="VCXMLDataGeneratorTool" | ||
| 260 | /> | ||
| 261 | <Tool | ||
| 262 | Name="VCWebServiceProxyGeneratorTool" | ||
| 263 | /> | ||
| 264 | <Tool | ||
| 265 | Name="VCMIDLTool" | ||
| 266 | /> | ||
| 267 | <Tool | ||
| 268 | Name="VCCLCompilerTool" | ||
| 269 | InlineFunctionExpansion="1" | ||
| 270 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | ||
| 271 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NO_snprintf;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ASMV;ASMINF" | ||
| 272 | StringPooling="true" | ||
| 273 | ExceptionHandling="0" | ||
| 274 | RuntimeLibrary="0" | ||
| 275 | BufferSecurityCheck="false" | ||
| 276 | EnableFunctionLevelLinking="true" | ||
| 277 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" | ||
| 278 | AssemblerListingLocation="$(IntDir)\" | ||
| 279 | ObjectFile="$(IntDir)\" | ||
| 280 | ProgramDataBaseFileName="$(OutDir)\" | ||
| 281 | WarningLevel="3" | ||
| 282 | SuppressStartupBanner="true" | ||
| 283 | /> | ||
| 284 | <Tool | ||
| 285 | Name="VCManagedResourceCompilerTool" | ||
| 286 | /> | ||
| 287 | <Tool | ||
| 288 | Name="VCResourceCompilerTool" | ||
| 289 | Culture="1036" | ||
| 290 | /> | ||
| 291 | <Tool | ||
| 292 | Name="VCPreLinkEventTool" | ||
| 293 | /> | ||
| 294 | <Tool | ||
| 295 | Name="VCLibrarianTool" | ||
| 296 | AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB" | ||
| 297 | AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj " | ||
| 298 | OutputFile="$(OutDir)\zlibstat.lib" | ||
| 299 | SuppressStartupBanner="true" | ||
| 300 | /> | ||
| 301 | <Tool | ||
| 302 | Name="VCALinkTool" | ||
| 303 | /> | ||
| 304 | <Tool | ||
| 305 | Name="VCXDCMakeTool" | ||
| 306 | /> | ||
| 307 | <Tool | ||
| 308 | Name="VCBscMakeTool" | ||
| 309 | /> | ||
| 310 | <Tool | ||
| 311 | Name="VCFxCopTool" | ||
| 312 | /> | ||
| 313 | <Tool | ||
| 314 | Name="VCPostBuildEventTool" | ||
| 315 | /> | ||
| 316 | </Configuration> | ||
| 317 | <Configuration | ||
| 318 | Name="Release|x64" | ||
| 319 | OutputDirectory="x64\ZlibStat$(ConfigurationName)" | ||
| 320 | IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp" | ||
| 321 | ConfigurationType="4" | ||
| 322 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | ||
| 323 | UseOfMFC="0" | ||
| 324 | ATLMinimizesCRunTimeLibraryUsage="false" | ||
| 325 | > | ||
| 326 | <Tool | ||
| 327 | Name="VCPreBuildEventTool" | ||
| 328 | /> | ||
| 329 | <Tool | ||
| 330 | Name="VCCustomBuildTool" | ||
| 331 | /> | ||
| 332 | <Tool | ||
| 333 | Name="VCXMLDataGeneratorTool" | ||
| 334 | /> | ||
| 335 | <Tool | ||
| 336 | Name="VCWebServiceProxyGeneratorTool" | ||
| 337 | /> | ||
| 338 | <Tool | ||
| 339 | Name="VCMIDLTool" | ||
| 340 | TargetEnvironment="3" | ||
| 341 | /> | ||
| 342 | <Tool | ||
| 343 | Name="VCCLCompilerTool" | ||
| 344 | InlineFunctionExpansion="1" | ||
| 345 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | ||
| 346 | PreprocessorDefinitions="ZLIB_WINAPI;NO_snprintf;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ASMV;ASMINF;WIN64" | ||
| 347 | StringPooling="true" | ||
| 348 | ExceptionHandling="0" | ||
| 349 | RuntimeLibrary="2" | ||
| 350 | BufferSecurityCheck="false" | ||
| 351 | EnableFunctionLevelLinking="true" | ||
| 352 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" | ||
| 353 | AssemblerListingLocation="$(IntDir)\" | ||
| 354 | ObjectFile="$(IntDir)\" | ||
| 355 | ProgramDataBaseFileName="$(OutDir)\" | ||
| 356 | WarningLevel="3" | ||
| 357 | SuppressStartupBanner="true" | ||
| 358 | /> | ||
| 359 | <Tool | ||
| 360 | Name="VCManagedResourceCompilerTool" | ||
| 361 | /> | ||
| 362 | <Tool | ||
| 363 | Name="VCResourceCompilerTool" | ||
| 364 | Culture="1036" | ||
| 365 | /> | ||
| 366 | <Tool | ||
| 367 | Name="VCPreLinkEventTool" | ||
| 368 | /> | ||
| 369 | <Tool | ||
| 370 | Name="VCLibrarianTool" | ||
| 371 | AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB" | ||
| 372 | AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj " | ||
| 373 | OutputFile="$(OutDir)\zlibstat.lib" | ||
| 374 | SuppressStartupBanner="true" | ||
| 375 | /> | ||
| 376 | <Tool | ||
| 377 | Name="VCALinkTool" | ||
| 378 | /> | ||
| 379 | <Tool | ||
| 380 | Name="VCXDCMakeTool" | ||
| 381 | /> | ||
| 382 | <Tool | ||
| 383 | Name="VCBscMakeTool" | ||
| 384 | /> | ||
| 385 | <Tool | ||
| 386 | Name="VCFxCopTool" | ||
| 387 | /> | ||
| 388 | <Tool | ||
| 389 | Name="VCPostBuildEventTool" | ||
| 390 | /> | ||
| 391 | </Configuration> | ||
| 392 | <Configuration | ||
| 393 | Name="Release|Itanium" | ||
| 394 | OutputDirectory="ia64\ZlibStat$(ConfigurationName)" | ||
| 395 | IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp" | ||
| 396 | ConfigurationType="4" | ||
| 397 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | ||
| 398 | UseOfMFC="0" | ||
| 399 | ATLMinimizesCRunTimeLibraryUsage="false" | ||
| 400 | > | ||
| 401 | <Tool | ||
| 402 | Name="VCPreBuildEventTool" | ||
| 403 | /> | ||
| 404 | <Tool | ||
| 405 | Name="VCCustomBuildTool" | ||
| 406 | /> | ||
| 407 | <Tool | ||
| 408 | Name="VCXMLDataGeneratorTool" | ||
| 409 | /> | ||
| 410 | <Tool | ||
| 411 | Name="VCWebServiceProxyGeneratorTool" | ||
| 412 | /> | ||
| 413 | <Tool | ||
| 414 | Name="VCMIDLTool" | ||
| 415 | TargetEnvironment="2" | ||
| 416 | /> | ||
| 417 | <Tool | ||
| 418 | Name="VCCLCompilerTool" | ||
| 419 | InlineFunctionExpansion="1" | ||
| 420 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | ||
| 421 | PreprocessorDefinitions="ZLIB_WINAPI;NO_snprintf;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" | ||
| 422 | StringPooling="true" | ||
| 423 | ExceptionHandling="0" | ||
| 424 | RuntimeLibrary="2" | ||
| 425 | BufferSecurityCheck="false" | ||
| 426 | EnableFunctionLevelLinking="true" | ||
| 427 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" | ||
| 428 | AssemblerListingLocation="$(IntDir)\" | ||
| 429 | ObjectFile="$(IntDir)\" | ||
| 430 | ProgramDataBaseFileName="$(OutDir)\" | ||
| 431 | WarningLevel="3" | ||
| 432 | SuppressStartupBanner="true" | ||
| 433 | /> | ||
| 434 | <Tool | ||
| 435 | Name="VCManagedResourceCompilerTool" | ||
| 436 | /> | ||
| 437 | <Tool | ||
| 438 | Name="VCResourceCompilerTool" | ||
| 439 | Culture="1036" | ||
| 440 | /> | ||
| 441 | <Tool | ||
| 442 | Name="VCPreLinkEventTool" | ||
| 443 | /> | ||
| 444 | <Tool | ||
| 445 | Name="VCLibrarianTool" | ||
| 446 | AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB" | ||
| 447 | OutputFile="$(OutDir)\zlibstat.lib" | ||
| 448 | SuppressStartupBanner="true" | ||
| 449 | /> | ||
| 450 | <Tool | ||
| 451 | Name="VCALinkTool" | ||
| 452 | /> | ||
| 453 | <Tool | ||
| 454 | Name="VCXDCMakeTool" | ||
| 455 | /> | ||
| 456 | <Tool | ||
| 457 | Name="VCBscMakeTool" | ||
| 458 | /> | ||
| 459 | <Tool | ||
| 460 | Name="VCFxCopTool" | ||
| 461 | /> | ||
| 462 | <Tool | ||
| 463 | Name="VCPostBuildEventTool" | ||
| 464 | /> | ||
| 465 | </Configuration> | ||
| 466 | <Configuration | ||
| 467 | Name="ReleaseWithoutAsm|Win32" | ||
| 468 | OutputDirectory="x86\ZlibStat$(ConfigurationName)" | ||
| 469 | IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp" | ||
| 470 | ConfigurationType="4" | ||
| 471 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | ||
| 472 | UseOfMFC="0" | ||
| 473 | ATLMinimizesCRunTimeLibraryUsage="false" | ||
| 474 | > | ||
| 475 | <Tool | ||
| 476 | Name="VCPreBuildEventTool" | ||
| 477 | /> | ||
| 478 | <Tool | ||
| 479 | Name="VCCustomBuildTool" | ||
| 480 | /> | ||
| 481 | <Tool | ||
| 482 | Name="VCXMLDataGeneratorTool" | ||
| 483 | /> | ||
| 484 | <Tool | ||
| 485 | Name="VCWebServiceProxyGeneratorTool" | ||
| 486 | /> | ||
| 487 | <Tool | ||
| 488 | Name="VCMIDLTool" | ||
| 489 | /> | ||
| 490 | <Tool | ||
| 491 | Name="VCCLCompilerTool" | ||
| 492 | InlineFunctionExpansion="1" | ||
| 493 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | ||
| 494 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NO_snprintf;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" | ||
| 495 | StringPooling="true" | ||
| 496 | ExceptionHandling="0" | ||
| 497 | RuntimeLibrary="0" | ||
| 498 | BufferSecurityCheck="false" | ||
| 499 | EnableFunctionLevelLinking="true" | ||
| 500 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" | ||
| 501 | AssemblerListingLocation="$(IntDir)\" | ||
| 502 | ObjectFile="$(IntDir)\" | ||
| 503 | ProgramDataBaseFileName="$(OutDir)\" | ||
| 504 | WarningLevel="3" | ||
| 505 | SuppressStartupBanner="true" | ||
| 506 | /> | ||
| 507 | <Tool | ||
| 508 | Name="VCManagedResourceCompilerTool" | ||
| 509 | /> | ||
| 510 | <Tool | ||
| 511 | Name="VCResourceCompilerTool" | ||
| 512 | Culture="1036" | ||
| 513 | /> | ||
| 514 | <Tool | ||
| 515 | Name="VCPreLinkEventTool" | ||
| 516 | /> | ||
| 517 | <Tool | ||
| 518 | Name="VCLibrarianTool" | ||
| 519 | AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB" | ||
| 520 | OutputFile="$(OutDir)\zlibstat.lib" | ||
| 521 | SuppressStartupBanner="true" | ||
| 522 | /> | ||
| 523 | <Tool | ||
| 524 | Name="VCALinkTool" | ||
| 525 | /> | ||
| 526 | <Tool | ||
| 527 | Name="VCXDCMakeTool" | ||
| 528 | /> | ||
| 529 | <Tool | ||
| 530 | Name="VCBscMakeTool" | ||
| 531 | /> | ||
| 532 | <Tool | ||
| 533 | Name="VCFxCopTool" | ||
| 534 | /> | ||
| 535 | <Tool | ||
| 536 | Name="VCPostBuildEventTool" | ||
| 537 | /> | ||
| 538 | </Configuration> | ||
| 539 | <Configuration | ||
| 540 | Name="ReleaseWithoutAsm|x64" | ||
| 541 | OutputDirectory="x64\ZlibStat$(ConfigurationName)" | ||
| 542 | IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp" | ||
| 543 | ConfigurationType="4" | ||
| 544 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | ||
| 545 | UseOfMFC="0" | ||
| 546 | ATLMinimizesCRunTimeLibraryUsage="false" | ||
| 547 | > | ||
| 548 | <Tool | ||
| 549 | Name="VCPreBuildEventTool" | ||
| 550 | /> | ||
| 551 | <Tool | ||
| 552 | Name="VCCustomBuildTool" | ||
| 553 | /> | ||
| 554 | <Tool | ||
| 555 | Name="VCXMLDataGeneratorTool" | ||
| 556 | /> | ||
| 557 | <Tool | ||
| 558 | Name="VCWebServiceProxyGeneratorTool" | ||
| 559 | /> | ||
| 560 | <Tool | ||
| 561 | Name="VCMIDLTool" | ||
| 562 | TargetEnvironment="3" | ||
| 563 | /> | ||
| 564 | <Tool | ||
| 565 | Name="VCCLCompilerTool" | ||
| 566 | InlineFunctionExpansion="1" | ||
| 567 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | ||
| 568 | PreprocessorDefinitions="ZLIB_WINAPI;NO_snprintf;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" | ||
| 569 | StringPooling="true" | ||
| 570 | ExceptionHandling="0" | ||
| 571 | RuntimeLibrary="2" | ||
| 572 | BufferSecurityCheck="false" | ||
| 573 | EnableFunctionLevelLinking="true" | ||
| 574 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" | ||
| 575 | AssemblerListingLocation="$(IntDir)\" | ||
| 576 | ObjectFile="$(IntDir)\" | ||
| 577 | ProgramDataBaseFileName="$(OutDir)\" | ||
| 578 | WarningLevel="3" | ||
| 579 | SuppressStartupBanner="true" | ||
| 580 | /> | ||
| 581 | <Tool | ||
| 582 | Name="VCManagedResourceCompilerTool" | ||
| 583 | /> | ||
| 584 | <Tool | ||
| 585 | Name="VCResourceCompilerTool" | ||
| 586 | Culture="1036" | ||
| 587 | /> | ||
| 588 | <Tool | ||
| 589 | Name="VCPreLinkEventTool" | ||
| 590 | /> | ||
| 591 | <Tool | ||
| 592 | Name="VCLibrarianTool" | ||
| 593 | AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB" | ||
| 594 | OutputFile="$(OutDir)\zlibstat.lib" | ||
| 595 | SuppressStartupBanner="true" | ||
| 596 | /> | ||
| 597 | <Tool | ||
| 598 | Name="VCALinkTool" | ||
| 599 | /> | ||
| 600 | <Tool | ||
| 601 | Name="VCXDCMakeTool" | ||
| 602 | /> | ||
| 603 | <Tool | ||
| 604 | Name="VCBscMakeTool" | ||
| 605 | /> | ||
| 606 | <Tool | ||
| 607 | Name="VCFxCopTool" | ||
| 608 | /> | ||
| 609 | <Tool | ||
| 610 | Name="VCPostBuildEventTool" | ||
| 611 | /> | ||
| 612 | </Configuration> | ||
| 613 | <Configuration | ||
| 614 | Name="ReleaseWithoutAsm|Itanium" | ||
| 615 | OutputDirectory="ia64\ZlibStat$(ConfigurationName)" | ||
| 616 | IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp" | ||
| 617 | ConfigurationType="4" | ||
| 618 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | ||
| 619 | UseOfMFC="0" | ||
| 620 | ATLMinimizesCRunTimeLibraryUsage="false" | ||
| 621 | > | ||
| 622 | <Tool | ||
| 623 | Name="VCPreBuildEventTool" | ||
| 624 | /> | ||
| 625 | <Tool | ||
| 626 | Name="VCCustomBuildTool" | ||
| 627 | /> | ||
| 628 | <Tool | ||
| 629 | Name="VCXMLDataGeneratorTool" | ||
| 630 | /> | ||
| 631 | <Tool | ||
| 632 | Name="VCWebServiceProxyGeneratorTool" | ||
| 633 | /> | ||
| 634 | <Tool | ||
| 635 | Name="VCMIDLTool" | ||
| 636 | TargetEnvironment="2" | ||
| 637 | /> | ||
| 638 | <Tool | ||
| 639 | Name="VCCLCompilerTool" | ||
| 640 | InlineFunctionExpansion="1" | ||
| 641 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | ||
| 642 | PreprocessorDefinitions="ZLIB_WINAPI;NO_snprintf;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" | ||
| 643 | StringPooling="true" | ||
| 644 | ExceptionHandling="0" | ||
| 645 | RuntimeLibrary="2" | ||
| 646 | BufferSecurityCheck="false" | ||
| 647 | EnableFunctionLevelLinking="true" | ||
| 648 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" | ||
| 649 | AssemblerListingLocation="$(IntDir)\" | ||
| 650 | ObjectFile="$(IntDir)\" | ||
| 651 | ProgramDataBaseFileName="$(OutDir)\" | ||
| 652 | WarningLevel="3" | ||
| 653 | SuppressStartupBanner="true" | ||
| 654 | /> | ||
| 655 | <Tool | ||
| 656 | Name="VCManagedResourceCompilerTool" | ||
| 657 | /> | ||
| 658 | <Tool | ||
| 659 | Name="VCResourceCompilerTool" | ||
| 660 | Culture="1036" | ||
| 661 | /> | ||
| 662 | <Tool | ||
| 663 | Name="VCPreLinkEventTool" | ||
| 664 | /> | ||
| 665 | <Tool | ||
| 666 | Name="VCLibrarianTool" | ||
| 667 | AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB" | ||
| 668 | OutputFile="$(OutDir)\zlibstat.lib" | ||
| 669 | SuppressStartupBanner="true" | ||
| 670 | /> | ||
| 671 | <Tool | ||
| 672 | Name="VCALinkTool" | ||
| 673 | /> | ||
| 674 | <Tool | ||
| 675 | Name="VCXDCMakeTool" | ||
| 676 | /> | ||
| 677 | <Tool | ||
| 678 | Name="VCBscMakeTool" | ||
| 679 | /> | ||
| 680 | <Tool | ||
| 681 | Name="VCFxCopTool" | ||
| 682 | /> | ||
| 683 | <Tool | ||
| 684 | Name="VCPostBuildEventTool" | ||
| 685 | /> | ||
| 686 | </Configuration> | ||
| 687 | </Configurations> | ||
| 688 | <References> | ||
| 689 | </References> | ||
| 690 | <Files> | ||
| 691 | <Filter | ||
| 692 | Name="Source Files" | ||
| 693 | > | ||
| 694 | <File | ||
| 695 | RelativePath="..\..\..\adler32.c" | ||
| 696 | > | ||
| 697 | </File> | ||
| 698 | <File | ||
| 699 | RelativePath="..\..\..\compress.c" | ||
| 700 | > | ||
| 701 | </File> | ||
| 702 | <File | ||
| 703 | RelativePath="..\..\..\crc32.c" | ||
| 704 | > | ||
| 705 | </File> | ||
| 706 | <File | ||
| 707 | RelativePath="..\..\..\deflate.c" | ||
| 708 | > | ||
| 709 | </File> | ||
| 710 | <File | ||
| 711 | RelativePath="..\..\masmx86\gvmat32c.c" | ||
| 712 | > | ||
| 713 | <FileConfiguration | ||
| 714 | Name="Debug|x64" | ||
| 715 | ExcludedFromBuild="true" | ||
| 716 | > | ||
| 717 | <Tool | ||
| 718 | Name="VCCLCompilerTool" | ||
| 719 | /> | ||
| 720 | </FileConfiguration> | ||
| 721 | <FileConfiguration | ||
| 722 | Name="Debug|Itanium" | ||
| 723 | ExcludedFromBuild="true" | ||
| 724 | > | ||
| 725 | <Tool | ||
| 726 | Name="VCCLCompilerTool" | ||
| 727 | /> | ||
| 728 | </FileConfiguration> | ||
| 729 | <FileConfiguration | ||
| 730 | Name="Release|x64" | ||
| 731 | ExcludedFromBuild="true" | ||
| 732 | > | ||
| 733 | <Tool | ||
| 734 | Name="VCCLCompilerTool" | ||
| 735 | /> | ||
| 736 | </FileConfiguration> | ||
| 737 | <FileConfiguration | ||
| 738 | Name="Release|Itanium" | ||
| 739 | ExcludedFromBuild="true" | ||
| 740 | > | ||
| 741 | <Tool | ||
| 742 | Name="VCCLCompilerTool" | ||
| 743 | /> | ||
| 744 | </FileConfiguration> | ||
| 745 | <FileConfiguration | ||
| 746 | Name="ReleaseWithoutAsm|x64" | ||
| 747 | ExcludedFromBuild="true" | ||
| 748 | > | ||
| 749 | <Tool | ||
| 750 | Name="VCCLCompilerTool" | ||
| 751 | /> | ||
| 752 | </FileConfiguration> | ||
| 753 | <FileConfiguration | ||
| 754 | Name="ReleaseWithoutAsm|Itanium" | ||
| 755 | ExcludedFromBuild="true" | ||
| 756 | > | ||
| 757 | <Tool | ||
| 758 | Name="VCCLCompilerTool" | ||
| 759 | /> | ||
| 760 | </FileConfiguration> | ||
| 761 | </File> | ||
| 762 | <File | ||
| 763 | RelativePath="..\..\..\gzclose.c"> | ||
| 764 | </File> | ||
| 765 | <File | ||
| 766 | RelativePath="..\..\..\gzio.c"> | ||
| 767 | </File> | ||
| 768 | <File | ||
| 769 | RelativePath="..\..\..\gzlib.c"> | ||
| 770 | </File> | ||
| 771 | <File | ||
| 772 | RelativePath="..\..\..\gzread.c"> | ||
| 773 | </File> | ||
| 774 | <File | ||
| 775 | RelativePath="..\..\..\gzwrite.c"> | ||
| 776 | </File> | ||
| 777 | <File | ||
| 778 | RelativePath="..\..\..\infback.c" | ||
| 779 | > | ||
| 780 | </File> | ||
| 781 | <File | ||
| 782 | RelativePath="..\..\masmx64\inffas8664.c" | ||
| 783 | > | ||
| 784 | <FileConfiguration | ||
| 785 | Name="Debug|Win32" | ||
| 786 | ExcludedFromBuild="true" | ||
| 787 | > | ||
| 788 | <Tool | ||
| 789 | Name="VCCLCompilerTool" | ||
| 790 | /> | ||
| 791 | </FileConfiguration> | ||
| 792 | <FileConfiguration | ||
| 793 | Name="Debug|Itanium" | ||
| 794 | ExcludedFromBuild="true" | ||
| 795 | > | ||
| 796 | <Tool | ||
| 797 | Name="VCCLCompilerTool" | ||
| 798 | /> | ||
| 799 | </FileConfiguration> | ||
| 800 | <FileConfiguration | ||
| 801 | Name="Release|Win32" | ||
| 802 | ExcludedFromBuild="true" | ||
| 803 | > | ||
| 804 | <Tool | ||
| 805 | Name="VCCLCompilerTool" | ||
| 806 | /> | ||
| 807 | </FileConfiguration> | ||
| 808 | <FileConfiguration | ||
| 809 | Name="Release|Itanium" | ||
| 810 | ExcludedFromBuild="true" | ||
| 811 | > | ||
| 812 | <Tool | ||
| 813 | Name="VCCLCompilerTool" | ||
| 814 | /> | ||
| 815 | </FileConfiguration> | ||
| 816 | <FileConfiguration | ||
| 817 | Name="ReleaseWithoutAsm|Win32" | ||
| 818 | ExcludedFromBuild="true" | ||
| 819 | > | ||
| 820 | <Tool | ||
| 821 | Name="VCCLCompilerTool" | ||
| 822 | /> | ||
| 823 | </FileConfiguration> | ||
| 824 | <FileConfiguration | ||
| 825 | Name="ReleaseWithoutAsm|Itanium" | ||
| 826 | ExcludedFromBuild="true" | ||
| 827 | > | ||
| 828 | <Tool | ||
| 829 | Name="VCCLCompilerTool" | ||
| 830 | /> | ||
| 831 | </FileConfiguration> | ||
| 832 | </File> | ||
| 833 | <File | ||
| 834 | RelativePath="..\..\..\inffast.c" | ||
| 835 | > | ||
| 836 | </File> | ||
| 837 | <File | ||
| 838 | RelativePath="..\..\..\inflate.c" | ||
| 839 | > | ||
| 840 | </File> | ||
| 841 | <File | ||
| 842 | RelativePath="..\..\..\inftrees.c" | ||
| 843 | > | ||
| 844 | </File> | ||
| 845 | <File | ||
| 846 | RelativePath="..\..\minizip\ioapi.c" | ||
| 847 | > | ||
| 848 | </File> | ||
| 849 | <File | ||
| 850 | RelativePath="..\..\..\trees.c" | ||
| 851 | > | ||
| 852 | </File> | ||
| 853 | <File | ||
| 854 | RelativePath="..\..\..\uncompr.c" | ||
| 855 | > | ||
| 856 | </File> | ||
| 857 | <File | ||
| 858 | RelativePath="..\..\minizip\unzip.c" | ||
| 859 | > | ||
| 860 | </File> | ||
| 861 | <File | ||
| 862 | RelativePath="..\..\minizip\zip.c" | ||
| 863 | > | ||
| 864 | </File> | ||
| 865 | <File | ||
| 866 | RelativePath=".\zlib.rc" | ||
| 867 | > | ||
| 868 | </File> | ||
| 869 | <File | ||
| 870 | RelativePath=".\zlibvc.def" | ||
| 871 | > | ||
| 872 | </File> | ||
| 873 | <File | ||
| 874 | RelativePath="..\..\..\zutil.c" | ||
| 875 | > | ||
| 876 | </File> | ||
| 877 | </Filter> | ||
| 878 | </Files> | ||
| 879 | <Globals> | ||
| 880 | </Globals> | ||
| 881 | </VisualStudioProject> | ||
diff --git a/contrib/delphi/zlibd32.mak b/contrib/delphi/zlibd32.mak index 203a4c9..0d0699a 100644 --- a/contrib/delphi/zlibd32.mak +++ b/contrib/delphi/zlibd32.mak | |||
| @@ -18,9 +18,9 @@ LDFLAGS = | |||
| 18 | # variables | 18 | # variables |
| 19 | ZLIB_LIB = zlib.lib | 19 | ZLIB_LIB = zlib.lib |
| 20 | 20 | ||
| 21 | OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzio.obj gzlib.obj gzread.obj | 21 | OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj |
| 22 | OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj | 22 | OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj |
| 23 | OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzio.obj+gzlib.obj+gzread.obj | 23 | OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj |
| 24 | OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj | 24 | OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj |
| 25 | 25 | ||
| 26 | 26 | ||
| @@ -40,8 +40,6 @@ deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h | |||
| 40 | 40 | ||
| 41 | gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h | 41 | gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h |
| 42 | 42 | ||
| 43 | gzio.obj: gzio.c zutil.h zlib.h zconf.h | ||
| 44 | |||
| 45 | gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h | 43 | gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h |
| 46 | 44 | ||
| 47 | gzread.obj: gzread.c zlib.h zconf.h gzguts.h | 45 | gzread.obj: gzread.c zlib.h zconf.h gzguts.h |
diff --git a/contrib/infback9/inftree9.c b/contrib/infback9/inftree9.c index 256c5d5..c2c8af9 100644 --- a/contrib/infback9/inftree9.c +++ b/contrib/infback9/inftree9.c | |||
| @@ -9,7 +9,7 @@ | |||
| 9 | #define MAXBITS 15 | 9 | #define MAXBITS 15 |
| 10 | 10 | ||
| 11 | const char inflate9_copyright[] = | 11 | const char inflate9_copyright[] = |
| 12 | " inflate9 1.2.3.8 Copyright 1995-2010 Mark Adler "; | 12 | " inflate9 1.2.3.9 Copyright 1995-2010 Mark Adler "; |
| 13 | /* | 13 | /* |
| 14 | If you use the zlib library in a product, an acknowledgment is welcome | 14 | If you use the zlib library in a product, an acknowledgment is welcome |
| 15 | in the documentation of your product. If for some reason you cannot | 15 | in the documentation of your product. If for some reason you cannot |
| @@ -64,7 +64,7 @@ unsigned short FAR *work; | |||
| 64 | static const unsigned short lext[31] = { /* Length codes 257..285 extra */ | 64 | static const unsigned short lext[31] = { /* Length codes 257..285 extra */ |
| 65 | 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129, | 65 | 128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129, |
| 66 | 130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132, | 66 | 130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132, |
| 67 | 133, 133, 133, 133, 144, 78, 75}; | 67 | 133, 133, 133, 133, 144, 193, 201}; |
| 68 | static const unsigned short dbase[32] = { /* Distance codes 0..31 base */ | 68 | static const unsigned short dbase[32] = { /* Distance codes 0..31 base */ |
| 69 | 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, | 69 | 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, |
| 70 | 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, | 70 | 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, |
diff --git a/contrib/minizip/MiniZip64_Changes.txt b/contrib/minizip/MiniZip64_Changes.txt index 436d8b3..13a1bd9 100644 --- a/contrib/minizip/MiniZip64_Changes.txt +++ b/contrib/minizip/MiniZip64_Changes.txt | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | 1 | ||
| 2 | MiniZip64 was derrived from MiniZip at version 1.01f | 2 | MiniZip 1.1 was derrived from MiniZip at version 1.01f |
| 3 | 3 | ||
| 4 | Change in 1.0 (Okt 2009) | 4 | Change in 1.0 (Okt 2009) |
| 5 | - **TODO - Add history** | 5 | - **TODO - Add history** |
diff --git a/contrib/minizip/MiniZip64_info.txt b/contrib/minizip/MiniZip64_info.txt index 334b0f0..57d7152 100644 --- a/contrib/minizip/MiniZip64_info.txt +++ b/contrib/minizip/MiniZip64_info.txt | |||
| @@ -1,29 +1,24 @@ | |||
| 1 | MiniZip64 - Copyright (c) 2009-2010 - Mathias Svensson - Built from MiniZip by Gilles Vollant | 1 | MiniZip - Copyright (c) 1998-2010 - by Gilles Vollant - version 1.1 64 bits from Mathias Svensson |
| 2 | 2 | ||
| 3 | Introduction | 3 | Introduction |
| 4 | --------------------- | 4 | --------------------- |
| 5 | MiniZip64 is built from MiniZip by Gilles Vollant ( http://www.winimage.com/zLibDll/minizip.html ) | 5 | MiniZip 1.1 is built from MiniZip 1.0 by Gilles Vollant ( http://www.winimage.com/zLibDll/minizip.html ) |
| 6 | 6 | ||
| 7 | When adding ZIP64 support into minizip it would result into breaking compatibility with current minizip. | 7 | When adding ZIP64 support into minizip it would result into risk of breaking compatibility with minizip 1.0. |
| 8 | And since breaking compatibility in minizip is not wanted. I decided to create a fork of minizip | 8 | All possible work was done for compatibility. |
| 9 | and create minizip64. | ||
| 10 | |||
| 11 | Even though MiniZip64 is build from MiniZip, all functions and struct's have changed name so that it | ||
| 12 | would not collide with each other. | ||
| 13 | 9 | ||
| 14 | 10 | ||
| 15 | Background | 11 | Background |
| 16 | --------------------- | 12 | --------------------- |
| 17 | When adding ZIP64 support I found that Even Rouault have added ZIP64 support for unzip.c into minizip | 13 | When adding ZIP64 support Mathias Svensson found that Even Rouault have added ZIP64 |
| 18 | for a open source project called gdal ( http://www.gdal.org/ ) | 14 | support for unzip.c into minizip for a open source project called gdal ( http://www.gdal.org/ ) |
| 19 | 15 | ||
| 20 | That was used as a starting point. And after that ZIP64 support was added to zip.c | 16 | That was used as a starting point. And after that ZIP64 support was added to zip.c |
| 21 | some refactoring and code cleanup was also done. | 17 | some refactoring and code cleanup was also done. |
| 22 | 18 | ||
| 23 | 19 | ||
| 24 | Changed from MiniZip to MiniZip64 | 20 | Changed from MiniZip 1.0 to MiniZip 1.1 |
| 25 | ------------------------------------- | 21 | --------------------------------------- |
| 26 | * Filenames has got a '64' at the end of them . eg unzip.c is now called unzip64.c | ||
| 27 | * Added ZIP64 support for unzip ( by Even Rouault ) | 22 | * Added ZIP64 support for unzip ( by Even Rouault ) |
| 28 | * Added ZIP64 support for zip ( by Mathias Svensson ) | 23 | * Added ZIP64 support for zip ( by Mathias Svensson ) |
| 29 | * Reverted some changed that Even Rouault did. | 24 | * Reverted some changed that Even Rouault did. |
diff --git a/contrib/minizip/ioapi.c b/contrib/minizip/ioapi.c index a5f1e0b..49958f6 100644 --- a/contrib/minizip/ioapi.c +++ b/contrib/minizip/ioapi.c | |||
| @@ -1,17 +1,17 @@ | |||
| 1 | /* ioapi.h -- IO base function header for compress/uncompress .zip | 1 | /* ioapi.h -- IO base function header for compress/uncompress .zip |
| 2 | part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) | 2 | part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) |
| 3 | 3 | ||
| 4 | Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) | 4 | Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) |
| 5 | 5 | ||
| 6 | Modifications for Zip64 support | 6 | Modifications for Zip64 support |
| 7 | Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) | 7 | Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) |
| 8 | 8 | ||
| 9 | For more info read MiniZip_info.txt | 9 | For more info read MiniZip_info.txt |
| 10 | 10 | ||
| 11 | */ | 11 | */ |
| 12 | 12 | ||
| 13 | #if (defined(_WIN32)) | 13 | #if (defined(_WIN32)) |
| 14 | #define _CRT_SECURE_NO_WARNINGS | 14 | #define _CRT_SECURE_NO_WARNINGS |
| 15 | #endif | 15 | #endif |
| 16 | 16 | ||
| 17 | #include "ioapi.h" | 17 | #include "ioapi.h" |
| @@ -189,7 +189,7 @@ static long ZCALLBACK fseek64_file_func (voidpf opaque, voidpf stream, ZPOS64_T | |||
| 189 | ret = 0; | 189 | ret = 0; |
| 190 | 190 | ||
| 191 | if(fseeko64((FILE *)stream, offset, fseek_origin) != 0) | 191 | if(fseeko64((FILE *)stream, offset, fseek_origin) != 0) |
| 192 | ret = -1; | 192 | ret = -1; |
| 193 | 193 | ||
| 194 | return ret; | 194 | return ret; |
| 195 | } | 195 | } |
diff --git a/contrib/minizip/ioapi.h b/contrib/minizip/ioapi.h index 1c7feb0..8309c4c 100644 --- a/contrib/minizip/ioapi.h +++ b/contrib/minizip/ioapi.h | |||
| @@ -1,52 +1,57 @@ | |||
| 1 | /* ioapi.h -- IO base function header for compress/uncompress .zip | 1 | /* ioapi.h -- IO base function header for compress/uncompress .zip |
| 2 | part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) | 2 | part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) |
| 3 | 3 | ||
| 4 | Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) | 4 | Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) |
| 5 | 5 | ||
| 6 | Modifications for Zip64 support | 6 | Modifications for Zip64 support |
| 7 | Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) | 7 | Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) |
| 8 | 8 | ||
| 9 | For more info read MiniZip_info.txt | 9 | For more info read MiniZip_info.txt |
| 10 | 10 | ||
| 11 | Changes | 11 | Changes |
| 12 | 12 | ||
| 13 | Oct-2009 - Defined ZPOS64_T to fpos_t on windows and u_int64_t on linux. (might need to find a better why for this) | 13 | Oct-2009 - Defined ZPOS64_T to fpos_t on windows and u_int64_t on linux. (might need to find a better why for this) |
| 14 | Oct-2009 - Change to fseeko64, ftello64 and fopen64 so large files would work on linux. | 14 | Oct-2009 - Change to fseeko64, ftello64 and fopen64 so large files would work on linux. |
| 15 | More if/def section may be needed to support other platforms | 15 | More if/def section may be needed to support other platforms |
| 16 | Oct-2009 - Defined fxxxx64 calls to normal fopen/ftell/fseek so they would compile on windows. | 16 | Oct-2009 - Defined fxxxx64 calls to normal fopen/ftell/fseek so they would compile on windows. |
| 17 | (but you should use iowin32.c for windows instead) | 17 | (but you should use iowin32.c for windows instead) |
| 18 | 18 | ||
| 19 | */ | 19 | */ |
| 20 | 20 | ||
| 21 | #ifndef _ZLIBIOAPI64_H | 21 | #ifndef _ZLIBIOAPI64_H |
| 22 | #define _ZLIBIOAPI64_H | 22 | #define _ZLIBIOAPI64_H |
| 23 | 23 | ||
| 24 | #ifndef _WIN32 | 24 | #if (!defined(_WIN32)) && (!defined(WIN32)) |
| 25 | 25 | ||
| 26 | // Linux needs this to support file operation on files larger then 4+GB | 26 | // Linux needs this to support file operation on files larger then 4+GB |
| 27 | // But might need better if/def to select just the platforms that needs them. | 27 | // But might need better if/def to select just the platforms that needs them. |
| 28 | 28 | ||
| 29 | #ifndef __USE_FILE_OFFSET64 | 29 | #ifndef __USE_FILE_OFFSET64 |
| 30 | #define __USE_FILE_OFFSET64 | 30 | #define __USE_FILE_OFFSET64 |
| 31 | #endif | 31 | #endif |
| 32 | #ifndef __USE_LARGEFILE64 | 32 | #ifndef __USE_LARGEFILE64 |
| 33 | #define __USE_LARGEFILE64 | 33 | #define __USE_LARGEFILE64 |
| 34 | #endif | 34 | #endif |
| 35 | #ifndef _LARGEFILE64_SOURCE | 35 | #ifndef _LARGEFILE64_SOURCE |
| 36 | #define _LARGEFILE64_SOURCE | 36 | #define _LARGEFILE64_SOURCE |
| 37 | #endif | 37 | #endif |
| 38 | #ifndef _FILE_OFFSET_BIT | 38 | #ifndef _FILE_OFFSET_BIT |
| 39 | #define _FILE_OFFSET_BIT 64 | 39 | #define _FILE_OFFSET_BIT 64 |
| 40 | #endif | 40 | #endif |
| 41 | #endif | 41 | #endif |
| 42 | 42 | ||
| 43 | #include <stdio.h> | 43 | #include <stdio.h> |
| 44 | #include <stdlib.h> | 44 | #include <stdlib.h> |
| 45 | #include "zlib.h" | 45 | #include "zlib.h" |
| 46 | 46 | ||
| 47 | #if defined(USE_FILE32API) | ||
| 48 | #define fopen64 fopen | ||
| 49 | #define ftello64 ftell | ||
| 50 | #define fseeko64 fseek | ||
| 51 | #else | ||
| 47 | #ifdef _MSC_VER | 52 | #ifdef _MSC_VER |
| 48 | #define fopen64 fopen | 53 | #define fopen64 fopen |
| 49 | #if _MSC_VER >= 1400 | 54 | #if (_MSC_VER >= 1400) && (!(defined(NO_MSCVER_FILE64_FUNC))) |
| 50 | #define ftello64 _ftelli64 | 55 | #define ftello64 _ftelli64 |
| 51 | #define fseeko64 _fseeki64 | 56 | #define fseeko64 _fseeki64 |
| 52 | #else // old MSC | 57 | #else // old MSC |
| @@ -54,11 +59,12 @@ | |||
| 54 | #define fseeko64 fseek | 59 | #define fseeko64 fseek |
| 55 | #endif | 60 | #endif |
| 56 | #endif | 61 | #endif |
| 62 | #endif | ||
| 57 | 63 | ||
| 58 | /* | 64 | /* |
| 59 | #ifndef ZPOS64_T | 65 | #ifndef ZPOS64_T |
| 60 | #ifdef _WIN32 | 66 | #ifdef _WIN32 |
| 61 | #define ZPOS64_T fpos_t | 67 | #define ZPOS64_T fpos_t |
| 62 | #else | 68 | #else |
| 63 | #include <stdint.h> | 69 | #include <stdint.h> |
| 64 | #define ZPOS64_T uint64_t | 70 | #define ZPOS64_T uint64_t |
diff --git a/contrib/minizip/iowin32.c b/contrib/minizip/iowin32.c index 43a5715..6a2a883 100644 --- a/contrib/minizip/iowin32.c +++ b/contrib/minizip/iowin32.c | |||
| @@ -1,11 +1,11 @@ | |||
| 1 | /* iowin32.c -- IO base function header for compress/uncompress .zip | 1 | /* iowin32.c -- IO base function header for compress/uncompress .zip |
| 2 | Version 1.1, January 7th, 2010 | 2 | Version 1.1, February 14h, 2010 |
| 3 | part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) | 3 | part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) |
| 4 | 4 | ||
| 5 | Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) | 5 | Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) |
| 6 | 6 | ||
| 7 | Modifications for Zip64 support | 7 | Modifications for Zip64 support |
| 8 | Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) | 8 | Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) |
| 9 | 9 | ||
| 10 | For more info read MiniZip_info.txt | 10 | For more info read MiniZip_info.txt |
| 11 | 11 | ||
diff --git a/contrib/minizip/iowin32.h b/contrib/minizip/iowin32.h index 1b6c533..0ca0969 100644 --- a/contrib/minizip/iowin32.h +++ b/contrib/minizip/iowin32.h | |||
| @@ -1,13 +1,13 @@ | |||
| 1 | /* iowin32.h -- IO base function header for compress/uncompress .zip | 1 | /* iowin32.h -- IO base function header for compress/uncompress .zip |
| 2 | Version 1.1, January 7th, 2010 | 2 | Version 1.1, February 14h, 2010 |
| 3 | part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) | 3 | part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) |
| 4 | 4 | ||
| 5 | Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) | 5 | Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) |
| 6 | 6 | ||
| 7 | Modifications for Zip64 support | 7 | Modifications for Zip64 support |
| 8 | Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) | 8 | Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) |
| 9 | 9 | ||
| 10 | For more info read MiniZip_info.txt | 10 | For more info read MiniZip_info.txt |
| 11 | 11 | ||
| 12 | */ | 12 | */ |
| 13 | 13 | ||
diff --git a/contrib/minizip/make_vms.com b/contrib/minizip/make_vms.com index 23e1a3a..9ac13a9 100644 --- a/contrib/minizip/make_vms.com +++ b/contrib/minizip/make_vms.com | |||
| @@ -17,9 +17,9 @@ $ cc/include=[--]/prefix=all minizip.c | |||
| 17 | $ cc/include=[--]/prefix=all zip.c | 17 | $ cc/include=[--]/prefix=all zip.c |
| 18 | $ link miniunz,unzip,ioapi,[--]libz.olb/lib | 18 | $ link miniunz,unzip,ioapi,[--]libz.olb/lib |
| 19 | $ link minizip,zip,ioapi,[--]libz.olb/lib | 19 | $ link minizip,zip,ioapi,[--]libz.olb/lib |
| 20 | $ mcr []minizip test minizip64_info.txt | 20 | $ mcr []minizip test minizip_info.txt |
| 21 | $ mcr []miniunz -l test.zip | 21 | $ mcr []miniunz -l test.zip |
| 22 | $ rename minizip64_info.txt; minizip64_info.txt_old | 22 | $ rename minizip_info.txt; minizip_info.txt_old |
| 23 | $ mcr []miniunz test.zip | 23 | $ mcr []miniunz test.zip |
| 24 | $ delete test.zip;* | 24 | $ delete test.zip;* |
| 25 | $exit | 25 | $exit |
diff --git a/contrib/minizip/miniunz.c b/contrib/minizip/miniunz.c index cad8ae2..9ed009f 100644 --- a/contrib/minizip/miniunz.c +++ b/contrib/minizip/miniunz.c | |||
| @@ -1,30 +1,30 @@ | |||
| 1 | /* | 1 | /* |
| 2 | miniunz.c | 2 | miniunz.c |
| 3 | Version 1.1, January 7th, 2010 | 3 | Version 1.1, February 14h, 2010 |
| 4 | sample part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) | 4 | sample part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) |
| 5 | 5 | ||
| 6 | Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) | 6 | Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) |
| 7 | 7 | ||
| 8 | Modifications of Unzip for Zip64 | 8 | Modifications of Unzip for Zip64 |
| 9 | Copyright (C) 2007-2008 Even Rouault | 9 | Copyright (C) 2007-2008 Even Rouault |
| 10 | 10 | ||
| 11 | Modifications for Zip64 support on both zip and unzip | 11 | Modifications for Zip64 support on both zip and unzip |
| 12 | Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) | 12 | Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | #ifndef _WIN32 | 15 | #ifndef _WIN32 |
| 16 | #ifndef __USE_FILE_OFFSET64 | 16 | #ifndef __USE_FILE_OFFSET64 |
| 17 | #define __USE_FILE_OFFSET64 | 17 | #define __USE_FILE_OFFSET64 |
| 18 | #endif | 18 | #endif |
| 19 | #ifndef __USE_LARGEFILE64 | 19 | #ifndef __USE_LARGEFILE64 |
| 20 | #define __USE_LARGEFILE64 | 20 | #define __USE_LARGEFILE64 |
| 21 | #endif | 21 | #endif |
| 22 | #ifndef _LARGEFILE64_SOURCE | 22 | #ifndef _LARGEFILE64_SOURCE |
| 23 | #define _LARGEFILE64_SOURCE | 23 | #define _LARGEFILE64_SOURCE |
| 24 | #endif | 24 | #endif |
| 25 | #ifndef _FILE_OFFSET_BIT | 25 | #ifndef _FILE_OFFSET_BIT |
| 26 | #define _FILE_OFFSET_BIT 64 | 26 | #define _FILE_OFFSET_BIT 64 |
| 27 | #endif | 27 | #endif |
| 28 | #endif | 28 | #endif |
| 29 | 29 | ||
| 30 | #include <stdio.h> | 30 | #include <stdio.h> |
| @@ -133,11 +133,11 @@ int makedir (newdir) | |||
| 133 | return 0; | 133 | return 0; |
| 134 | 134 | ||
| 135 | buffer = (char*)malloc(len+1); | 135 | buffer = (char*)malloc(len+1); |
| 136 | if (buffer==NULL) | 136 | if (buffer==NULL) |
| 137 | { | 137 | { |
| 138 | printf("Error allocating memory\n"); | 138 | printf("Error allocating memory\n"); |
| 139 | return UNZ_INTERNALERROR; | 139 | return UNZ_INTERNALERROR; |
| 140 | } | 140 | } |
| 141 | strcpy(buffer,newdir); | 141 | strcpy(buffer,newdir); |
| 142 | 142 | ||
| 143 | if (buffer[len-1] == '/') { | 143 | if (buffer[len-1] == '/') { |
diff --git a/contrib/minizip/minizip.c b/contrib/minizip/minizip.c index ca26091..7a4fa5a 100644 --- a/contrib/minizip/minizip.c +++ b/contrib/minizip/minizip.c | |||
| @@ -1,31 +1,31 @@ | |||
| 1 | /* | 1 | /* |
| 2 | minizip.c | 2 | minizip.c |
| 3 | Version 1.1, January 7th, 2010 | 3 | Version 1.1, February 14h, 2010 |
| 4 | sample part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) | 4 | sample part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) |
| 5 | 5 | ||
| 6 | Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) | 6 | Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) |
| 7 | 7 | ||
| 8 | Modifications of Unzip for Zip64 | 8 | Modifications of Unzip for Zip64 |
| 9 | Copyright (C) 2007-2008 Even Rouault | 9 | Copyright (C) 2007-2008 Even Rouault |
| 10 | 10 | ||
| 11 | Modifications for Zip64 support on both zip and unzip | 11 | Modifications for Zip64 support on both zip and unzip |
| 12 | Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) | 12 | Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) |
| 13 | */ | 13 | */ |
| 14 | 14 | ||
| 15 | 15 | ||
| 16 | #ifndef _WIN32 | 16 | #ifndef _WIN32 |
| 17 | #ifndef __USE_FILE_OFFSET64 | 17 | #ifndef __USE_FILE_OFFSET64 |
| 18 | #define __USE_FILE_OFFSET64 | 18 | #define __USE_FILE_OFFSET64 |
| 19 | #endif | 19 | #endif |
| 20 | #ifndef __USE_LARGEFILE64 | 20 | #ifndef __USE_LARGEFILE64 |
| 21 | #define __USE_LARGEFILE64 | 21 | #define __USE_LARGEFILE64 |
| 22 | #endif | 22 | #endif |
| 23 | #ifndef _LARGEFILE64_SOURCE | 23 | #ifndef _LARGEFILE64_SOURCE |
| 24 | #define _LARGEFILE64_SOURCE | 24 | #define _LARGEFILE64_SOURCE |
| 25 | #endif | 25 | #endif |
| 26 | #ifndef _FILE_OFFSET_BIT | 26 | #ifndef _FILE_OFFSET_BIT |
| 27 | #define _FILE_OFFSET_BIT 64 | 27 | #define _FILE_OFFSET_BIT 64 |
| 28 | #endif | 28 | #endif |
| 29 | #endif | 29 | #endif |
| 30 | 30 | ||
| 31 | #include <stdio.h> | 31 | #include <stdio.h> |
| @@ -48,8 +48,8 @@ | |||
| 48 | #include "zip.h" | 48 | #include "zip.h" |
| 49 | 49 | ||
| 50 | #ifdef _WIN32 | 50 | #ifdef _WIN32 |
| 51 | #define USEWIN32IOAPI | 51 | #define USEWIN32IOAPI |
| 52 | #include "iowin32.h" | 52 | #include "iowin32.h" |
| 53 | #endif | 53 | #endif |
| 54 | 54 | ||
| 55 | 55 | ||
| @@ -152,9 +152,8 @@ int check_exist_file(filename) | |||
| 152 | 152 | ||
| 153 | void do_banner() | 153 | void do_banner() |
| 154 | { | 154 | { |
| 155 | printf("MiniZip64 1.0, demo of zLib + MiniZip64 package, written by Gilles Vollant\n"); | 155 | printf("MiniZip 1.1, demo of zLib + MiniZip64 package, written by Gilles Vollant\n"); |
| 156 | printf("more info on MiniZip at http://www.winimage.com/zLibDll/minizip.html\n\n"); | 156 | printf("more info on MiniZip at http://www.winimage.com/zLibDll/minizip.html\n\n"); |
| 157 | printf("more info on MiniZip64 at http://result42.com/projects/MiniZip64\n\n"); | ||
| 158 | } | 157 | } |
| 159 | 158 | ||
| 160 | void do_help() | 159 | void do_help() |
| @@ -220,12 +219,12 @@ int isLargeFile(const char* filename) | |||
| 220 | 219 | ||
| 221 | pos = ftello64(pFile); | 220 | pos = ftello64(pFile); |
| 222 | 221 | ||
| 223 | printf("File : %s is %lld bytes\n", filename, pos); | 222 | printf("File : %s is %lld bytes\n", filename, pos); |
| 224 | 223 | ||
| 225 | if(pos >= 0xffffffff) | 224 | if(pos >= 0xffffffff) |
| 226 | largeFile = 1; | 225 | largeFile = 1; |
| 227 | 226 | ||
| 228 | fclose(pFile); | 227 | fclose(pFile); |
| 229 | } | 228 | } |
| 230 | 229 | ||
| 231 | return largeFile; | 230 | return largeFile; |
| @@ -409,7 +408,7 @@ int main(argc,argv) | |||
| 409 | 408 | ||
| 410 | zip64 = isLargeFile(filenameinzip); | 409 | zip64 = isLargeFile(filenameinzip); |
| 411 | 410 | ||
| 412 | /* The path name saved, should not include a leading slash. */ | 411 | /* The path name saved, should not include a leading slash. */ |
| 413 | /*if it did, windows/xp and dynazip couldn't read the zip file. */ | 412 | /*if it did, windows/xp and dynazip couldn't read the zip file. */ |
| 414 | savefilenameinzip = filenameinzip; | 413 | savefilenameinzip = filenameinzip; |
| 415 | while( savefilenameinzip[0] == '\\' || savefilenameinzip[0] == '/' ) | 414 | while( savefilenameinzip[0] == '\\' || savefilenameinzip[0] == '/' ) |
diff --git a/contrib/minizip/unzip.c b/contrib/minizip/unzip.c index 6a4d104..7617f41 100644 --- a/contrib/minizip/unzip.c +++ b/contrib/minizip/unzip.c | |||
| @@ -1,16 +1,16 @@ | |||
| 1 | /* unzip.c -- IO for uncompress .zip files using zlib | 1 | /* unzip.c -- IO for uncompress .zip files using zlib |
| 2 | Version 1.1, January 7th, 2010 | 2 | Version 1.1, February 14h, 2010 |
| 3 | part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) | 3 | part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) |
| 4 | 4 | ||
| 5 | Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) | 5 | Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) |
| 6 | 6 | ||
| 7 | Modifications of Unzip for Zip64 | 7 | Modifications of Unzip for Zip64 |
| 8 | Copyright (C) 2007-2008 Even Rouault | 8 | Copyright (C) 2007-2008 Even Rouault |
| 9 | 9 | ||
| 10 | Modifications for Zip64 support on both zip and unzip | 10 | Modifications for Zip64 support on both zip and unzip |
| 11 | Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) | 11 | Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) |
| 12 | 12 | ||
| 13 | For more info read MiniZip_info.txt | 13 | For more info read MiniZip_info.txt |
| 14 | 14 | ||
| 15 | 15 | ||
| 16 | ------------------------------------------------------------------------------------ | 16 | ------------------------------------------------------------------------------------ |
| @@ -25,39 +25,41 @@ | |||
| 25 | If, for some reason, all these files are missing, the Info-ZIP license | 25 | If, for some reason, all these files are missing, the Info-ZIP license |
| 26 | also may be found at: ftp://ftp.info-zip.org/pub/infozip/license.html | 26 | also may be found at: ftp://ftp.info-zip.org/pub/infozip/license.html |
| 27 | 27 | ||
| 28 | crypt.c (full version) by Info-ZIP. Last revised: [see crypt.h] | 28 | crypt.c (full version) by Info-ZIP. Last revised: [see crypt.h] |
| 29 | 29 | ||
| 30 | The encryption/decryption parts of this source code (as opposed to the | 30 | The encryption/decryption parts of this source code (as opposed to the |
| 31 | non-echoing password parts) were originally written in Europe. The | 31 | non-echoing password parts) were originally written in Europe. The |
| 32 | whole source package can be freely distributed, including from the USA. | 32 | whole source package can be freely distributed, including from the USA. |
| 33 | (Prior to January 2000, re-export from the US was a violation of US law.) | 33 | (Prior to January 2000, re-export from the US was a violation of US law.) |
| 34 | 34 | ||
| 35 | This encryption code is a direct transcription of the algorithm from | 35 | This encryption code is a direct transcription of the algorithm from |
| 36 | Roger Schlafly, described by Phil Katz in the file appnote.txt. This | 36 | Roger Schlafly, described by Phil Katz in the file appnote.txt. This |
| 37 | file (appnote.txt) is distributed with the PKZIP program (even in the | 37 | file (appnote.txt) is distributed with the PKZIP program (even in the |
| 38 | version without encryption capabilities). | 38 | version without encryption capabilities). |
| 39 | 39 | ||
| 40 | ------------------------------------------------------------------------------------ | 40 | ------------------------------------------------------------------------------------ |
| 41 | 41 | ||
| 42 | Changes in unzip64.c | 42 | Changes in unzip.c |
| 43 | 43 | ||
| 44 | 2007-2008 - Even Rouault - Addition of cpl_unzGetCurrentFileZStreamPos | 44 | 2007-2008 - Even Rouault - Addition of cpl_unzGetCurrentFileZStreamPos |
| 45 | 2007-2008 - Even Rouault - Decoration of symbol names unz* -> cpl_unz* | 45 | 2007-2008 - Even Rouault - Decoration of symbol names unz* -> cpl_unz* |
| 46 | 2007-2008 - Even Rouault - Remove old C style function prototypes | 46 | 2007-2008 - Even Rouault - Remove old C style function prototypes |
| 47 | 2007-2008 - Even Rouault - Add unzip support for ZIP64 | 47 | 2007-2008 - Even Rouault - Add unzip support for ZIP64 |
| 48 | 48 | ||
| 49 | Copyright (C) 2007-2008 Even Rouault | 49 | Copyright (C) 2007-2008 Even Rouault |
| 50 | 50 | ||
| 51 | 51 | ||
| 52 | Okt-2009 - Mathias Svensson - Removed cpl_* from symbol names (Even Rouault added them but since this is now moved to a new project (minizip64) I renamed them again). | 52 | Oct-2009 - Mathias Svensson - Removed cpl_* from symbol names (Even Rouault added them but since this is now moved to a new project (minizip64) I renamed them again). |
| 53 | Okt-2009 - Mathias Svensson - Fixed problem if uncompressed size was > 4G and compressed size was <4G | 53 | Oct-2009 - Mathias Svensson - Fixed problem if uncompressed size was > 4G and compressed size was <4G |
| 54 | should only read the compressed/uncompressed size from the Zip64 format if | 54 | should only read the compressed/uncompressed size from the Zip64 format if |
| 55 | the size from normal header was 0xFFFFFFFF | 55 | the size from normal header was 0xFFFFFFFF |
| 56 | Okt-2009 - Mathias Svensson - Applied some bug fixes from paches recived from Gilles Vollant | 56 | Oct-2009 - Mathias Svensson - Applied some bug fixes from paches recived from Gilles Vollant |
| 57 | Okt-2009 - Mathias Svensson - Applied support to unzip files with compression mathod BZIP2 (bzip2 lib is required) | 57 | Oct-2009 - Mathias Svensson - Applied support to unzip files with compression mathod BZIP2 (bzip2 lib is required) |
| 58 | Patch created by Daniel Borca | 58 | Patch created by Daniel Borca |
| 59 | 59 | ||
| 60 | Copyright (C) 2009 Mathias Svensson | 60 | Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer |
| 61 | |||
| 62 | Copyright (C) 1998 - 2010 Gilles Vollant, Even Rouault, Mathias Svensson | ||
| 61 | 63 | ||
| 62 | */ | 64 | */ |
| 63 | 65 | ||
| @@ -67,7 +69,7 @@ | |||
| 67 | #include <string.h> | 69 | #include <string.h> |
| 68 | 70 | ||
| 69 | #ifndef NOUNCRYPT | 71 | #ifndef NOUNCRYPT |
| 70 | #define NOUNCRYPT | 72 | #define NOUNCRYPT |
| 71 | #endif | 73 | #endif |
| 72 | 74 | ||
| 73 | #include "zlib.h" | 75 | #include "zlib.h" |
| @@ -482,7 +484,7 @@ local ZPOS64_T unz64local_SearchCentralDir64(const zlib_filefunc64_32_def* pzlib | |||
| 482 | ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */ | 484 | ZPOS64_T uMaxBack=0xffff; /* maximum size of global comment */ |
| 483 | ZPOS64_T uPosFound=0; | 485 | ZPOS64_T uPosFound=0; |
| 484 | uLong uL; | 486 | uLong uL; |
| 485 | ZPOS64_T relativeOffset; | 487 | ZPOS64_T relativeOffset; |
| 486 | 488 | ||
| 487 | if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0) | 489 | if (ZSEEK64(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0) |
| 488 | return 0; | 490 | return 0; |
| @@ -957,7 +959,7 @@ local int unz64local_GetCurrentFileInfoInternal (unzFile file, | |||
| 957 | if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK) | 959 | if (unz64local_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK) |
| 958 | err=UNZ_ERRNO; | 960 | err=UNZ_ERRNO; |
| 959 | 961 | ||
| 960 | // relative offset of local header | 962 | // relative offset of local header |
| 961 | if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK) | 963 | if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK) |
| 962 | err=UNZ_ERRNO; | 964 | err=UNZ_ERRNO; |
| 963 | file_info_internal.offset_curfile = uL; | 965 | file_info_internal.offset_curfile = uL; |
| @@ -1009,7 +1011,7 @@ local int unz64local_GetCurrentFileInfoInternal (unzFile file, | |||
| 1009 | 1011 | ||
| 1010 | if ((err==UNZ_OK) && (file_info.size_file_extra != 0)) | 1012 | if ((err==UNZ_OK) && (file_info.size_file_extra != 0)) |
| 1011 | { | 1013 | { |
| 1012 | uLong acc = 0; | 1014 | uLong acc = 0; |
| 1013 | 1015 | ||
| 1014 | // since lSeek now points to after the extra field we need to move back | 1016 | // since lSeek now points to after the extra field we need to move back |
| 1015 | lSeek -= file_info.size_file_extra; | 1017 | lSeek -= file_info.size_file_extra; |
| @@ -1025,7 +1027,7 @@ local int unz64local_GetCurrentFileInfoInternal (unzFile file, | |||
| 1025 | while(acc < file_info.size_file_extra) | 1027 | while(acc < file_info.size_file_extra) |
| 1026 | { | 1028 | { |
| 1027 | uLong headerId; | 1029 | uLong headerId; |
| 1028 | uLong dataSize; | 1030 | uLong dataSize; |
| 1029 | 1031 | ||
| 1030 | if (unz64local_getShort(&s->z_filefunc, s->filestream,&headerId) != UNZ_OK) | 1032 | if (unz64local_getShort(&s->z_filefunc, s->filestream,&headerId) != UNZ_OK) |
| 1031 | err=UNZ_ERRNO; | 1033 | err=UNZ_ERRNO; |
| @@ -1036,33 +1038,33 @@ local int unz64local_GetCurrentFileInfoInternal (unzFile file, | |||
| 1036 | /* ZIP64 extra fields */ | 1038 | /* ZIP64 extra fields */ |
| 1037 | if (headerId == 0x0001) | 1039 | if (headerId == 0x0001) |
| 1038 | { | 1040 | { |
| 1039 | uLong uL; | 1041 | uLong uL; |
| 1040 | 1042 | ||
| 1041 | if(file_info.uncompressed_size == (ZPOS64_T)(unsigned long)-1) | 1043 | if(file_info.uncompressed_size == (ZPOS64_T)(unsigned long)-1) |
| 1042 | { | 1044 | { |
| 1043 | if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK) | 1045 | if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK) |
| 1044 | err=UNZ_ERRNO; | 1046 | err=UNZ_ERRNO; |
| 1045 | } | 1047 | } |
| 1046 | 1048 | ||
| 1047 | if(file_info.compressed_size == (ZPOS64_T)(unsigned long)-1) | 1049 | if(file_info.compressed_size == (ZPOS64_T)(unsigned long)-1) |
| 1048 | { | 1050 | { |
| 1049 | if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK) | 1051 | if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK) |
| 1050 | err=UNZ_ERRNO; | 1052 | err=UNZ_ERRNO; |
| 1051 | } | 1053 | } |
| 1052 | 1054 | ||
| 1053 | if(file_info_internal.offset_curfile == (ZPOS64_T)(unsigned long)-1) | 1055 | if(file_info_internal.offset_curfile == (ZPOS64_T)(unsigned long)-1) |
| 1054 | { | 1056 | { |
| 1055 | /* Relative Header offset */ | 1057 | /* Relative Header offset */ |
| 1056 | if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK) | 1058 | if (unz64local_getLong64(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK) |
| 1057 | err=UNZ_ERRNO; | 1059 | err=UNZ_ERRNO; |
| 1058 | } | 1060 | } |
| 1059 | 1061 | ||
| 1060 | if(file_info.disk_num_start == (unsigned long)-1) | 1062 | if(file_info.disk_num_start == (unsigned long)-1) |
| 1061 | { | 1063 | { |
| 1062 | /* Disk Start Number */ | 1064 | /* Disk Start Number */ |
| 1063 | if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK) | 1065 | if (unz64local_getLong(&s->z_filefunc, s->filestream,&uL) != UNZ_OK) |
| 1064 | err=UNZ_ERRNO; | 1066 | err=UNZ_ERRNO; |
| 1065 | } | 1067 | } |
| 1066 | 1068 | ||
| 1067 | } | 1069 | } |
| 1068 | else | 1070 | else |
| @@ -1608,7 +1610,7 @@ extern int ZEXPORT unzOpenCurrentFile3 (unzFile file, int* method, | |||
| 1608 | pfile_in_zip_read_info->stream.avail_in = (uInt)0; | 1610 | pfile_in_zip_read_info->stream.avail_in = (uInt)0; |
| 1609 | 1611 | ||
| 1610 | s->pfile_in_zip_read = pfile_in_zip_read_info; | 1612 | s->pfile_in_zip_read = pfile_in_zip_read_info; |
| 1611 | s->encrypted = 0; | 1613 | s->encrypted = 0; |
| 1612 | 1614 | ||
| 1613 | # ifndef NOUNCRYPT | 1615 | # ifndef NOUNCRYPT |
| 1614 | if (password != NULL) | 1616 | if (password != NULL) |
| @@ -2051,7 +2053,7 @@ extern int ZEXPORT unzGetGlobalComment (unzFile file, char * szComment, uLong uS | |||
| 2051 | unz64_s* s; | 2053 | unz64_s* s; |
| 2052 | uLong uReadThis ; | 2054 | uLong uReadThis ; |
| 2053 | if (file==NULL) | 2055 | if (file==NULL) |
| 2054 | return (uLong)UNZ_PARAMERROR; | 2056 | return (int)UNZ_PARAMERROR; |
| 2055 | s=(unz64_s*)file; | 2057 | s=(unz64_s*)file; |
| 2056 | 2058 | ||
| 2057 | uReadThis = uSizeBuf; | 2059 | uReadThis = uSizeBuf; |
diff --git a/contrib/minizip/unzip.h b/contrib/minizip/unzip.h index da7fb61..3183968 100644 --- a/contrib/minizip/unzip.h +++ b/contrib/minizip/unzip.h | |||
| @@ -1,20 +1,20 @@ | |||
| 1 | /* unzip.h -- IO for uncompress .zip files using zlib | 1 | /* unzip.h -- IO for uncompress .zip files using zlib |
| 2 | Version 1.1, January 7th, 2010 | 2 | Version 1.1, February 14h, 2010 |
| 3 | part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) | 3 | part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) |
| 4 | 4 | ||
| 5 | Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) | 5 | Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) |
| 6 | 6 | ||
| 7 | Modifications of Unzip for Zip64 | 7 | Modifications of Unzip for Zip64 |
| 8 | Copyright (C) 2007-2008 Even Rouault | 8 | Copyright (C) 2007-2008 Even Rouault |
| 9 | 9 | ||
| 10 | Modifications for Zip64 support on both zip and unzip | 10 | Modifications for Zip64 support on both zip and unzip |
| 11 | Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) | 11 | Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) |
| 12 | 12 | ||
| 13 | For more info read MiniZip_info.txt | 13 | For more info read MiniZip_info.txt |
| 14 | 14 | ||
| 15 | --------------------------------------------------------------------------------- | 15 | --------------------------------------------------------------------------------- |
| 16 | 16 | ||
| 17 | Condition of use and distribution are the same than zlib : | 17 | Condition of use and distribution are the same than zlib : |
| 18 | 18 | ||
| 19 | This software is provided 'as-is', without any express or implied | 19 | This software is provided 'as-is', without any express or implied |
| 20 | warranty. In no event will the authors be held liable for any damages | 20 | warranty. In no event will the authors be held liable for any damages |
| @@ -34,9 +34,9 @@ | |||
| 34 | 34 | ||
| 35 | --------------------------------------------------------------------------------- | 35 | --------------------------------------------------------------------------------- |
| 36 | 36 | ||
| 37 | Changes | 37 | Changes |
| 38 | 38 | ||
| 39 | See header of unzip64.c | 39 | See header of unzip64.c |
| 40 | 40 | ||
| 41 | */ | 41 | */ |
| 42 | 42 | ||
diff --git a/contrib/minizip/zip.c b/contrib/minizip/zip.c index 698dcec..3c34fc8 100644 --- a/contrib/minizip/zip.c +++ b/contrib/minizip/zip.c | |||
| @@ -1,22 +1,23 @@ | |||
| 1 | /* zip.c -- IO on .zip files using zlib | 1 | /* zip.c -- IO on .zip files using zlib |
| 2 | Version 1.1, January 7th, 2010 | 2 | Version 1.1, February 14h, 2010 |
| 3 | part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) | 3 | part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) |
| 4 | 4 | ||
| 5 | Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) | 5 | Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) |
| 6 | 6 | ||
| 7 | Modifications for Zip64 support | 7 | Modifications for Zip64 support |
| 8 | Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) | 8 | Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) |
| 9 | 9 | ||
| 10 | For more info read MiniZip_info.txt | 10 | For more info read MiniZip_info.txt |
| 11 | 11 | ||
| 12 | Changes | 12 | Changes |
| 13 | Okt-2009 - Mathias Svensson - Remove old C style function prototypes | 13 | Oct-2009 - Mathias Svensson - Remove old C style function prototypes |
| 14 | Okt-2009 - Mathias Svensson - Added Zip64 Support when creating new file archives | 14 | Oct-2009 - Mathias Svensson - Added Zip64 Support when creating new file archives |
| 15 | Okt-2009 - Mathias Svensson - Did some code cleanup and refactoring to get better overview of some functions. | 15 | Oct-2009 - Mathias Svensson - Did some code cleanup and refactoring to get better overview of some functions. |
| 16 | Okt-2009 - Mathias Svensson - Added zipRemoveExtraInfoBlock to strip extra field data from its ZIP64 data | 16 | Oct-2009 - Mathias Svensson - Added zipRemoveExtraInfoBlock to strip extra field data from its ZIP64 data |
| 17 | It is used when recreting zip archive with RAW when deleting items from a zip. | 17 | It is used when recreting zip archive with RAW when deleting items from a zip. |
| 18 | ZIP64 data is automaticly added to items that needs it, and existing ZIP64 data need to be removed. | 18 | ZIP64 data is automaticly added to items that needs it, and existing ZIP64 data need to be removed. |
| 19 | Okt-2009 - Mathias Svensson - Added support for BZIP2 as compression mode (bzip2 lib is required) | 19 | Oct-2009 - Mathias Svensson - Added support for BZIP2 as compression mode (bzip2 lib is required) |
| 20 | Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer | ||
| 20 | 21 | ||
| 21 | */ | 22 | */ |
| 22 | 23 | ||
| @@ -1526,22 +1527,22 @@ extern int ZEXPORT zipCloseFileInZipRaw64 (zipFile file, ZPOS64_T uncompressed_s | |||
| 1526 | zi->ci.stream.avail_in = 0; | 1527 | zi->ci.stream.avail_in = 0; |
| 1527 | 1528 | ||
| 1528 | if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw)) | 1529 | if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw)) |
| 1529 | { | 1530 | { |
| 1530 | while (err==ZIP_OK) | 1531 | while (err==ZIP_OK) |
| 1531 | { | 1532 | { |
| 1532 | uLong uTotalOutBefore; | 1533 | uLong uTotalOutBefore; |
| 1533 | if (zi->ci.stream.avail_out == 0) | 1534 | if (zi->ci.stream.avail_out == 0) |
| 1534 | { | 1535 | { |
| 1535 | if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO) | 1536 | if (zip64FlushWriteBuffer(zi) == ZIP_ERRNO) |
| 1536 | err = ZIP_ERRNO; | 1537 | err = ZIP_ERRNO; |
| 1537 | zi->ci.stream.avail_out = (uInt)Z_BUFSIZE; | 1538 | zi->ci.stream.avail_out = (uInt)Z_BUFSIZE; |
| 1538 | zi->ci.stream.next_out = zi->ci.buffered_data; | 1539 | zi->ci.stream.next_out = zi->ci.buffered_data; |
| 1539 | } | 1540 | } |
| 1540 | uTotalOutBefore = zi->ci.stream.total_out; | 1541 | uTotalOutBefore = zi->ci.stream.total_out; |
| 1541 | err=deflate(&zi->ci.stream, Z_FINISH); | 1542 | err=deflate(&zi->ci.stream, Z_FINISH); |
| 1542 | zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ; | 1543 | zi->ci.pos_in_buffered_data += (uInt)(zi->ci.stream.total_out - uTotalOutBefore) ; |
| 1543 | } | 1544 | } |
| 1544 | } | 1545 | } |
| 1545 | else if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw)) | 1546 | else if ((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw)) |
| 1546 | { | 1547 | { |
| 1547 | #ifdef HAVE_BZIP2 | 1548 | #ifdef HAVE_BZIP2 |
| @@ -1573,10 +1574,10 @@ extern int ZEXPORT zipCloseFileInZipRaw64 (zipFile file, ZPOS64_T uncompressed_s | |||
| 1573 | err=ZIP_OK; /* this is normal */ | 1574 | err=ZIP_OK; /* this is normal */ |
| 1574 | 1575 | ||
| 1575 | if ((zi->ci.pos_in_buffered_data>0) && (err==ZIP_OK)) | 1576 | if ((zi->ci.pos_in_buffered_data>0) && (err==ZIP_OK)) |
| 1576 | { | 1577 | { |
| 1577 | if (zip64FlushWriteBuffer(zi)==ZIP_ERRNO) | 1578 | if (zip64FlushWriteBuffer(zi)==ZIP_ERRNO) |
| 1578 | err = ZIP_ERRNO; | 1579 | err = ZIP_ERRNO; |
| 1579 | } | 1580 | } |
| 1580 | 1581 | ||
| 1581 | if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw)) | 1582 | if ((zi->ci.method == Z_DEFLATED) && (!zi->ci.raw)) |
| 1582 | { | 1583 | { |
| @@ -1589,9 +1590,9 @@ extern int ZEXPORT zipCloseFileInZipRaw64 (zipFile file, ZPOS64_T uncompressed_s | |||
| 1589 | else if((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw)) | 1590 | else if((zi->ci.method == Z_BZIP2ED) && (!zi->ci.raw)) |
| 1590 | { | 1591 | { |
| 1591 | int tmperr = BZ2_bzCompressEnd(&zi->ci.bstream); | 1592 | int tmperr = BZ2_bzCompressEnd(&zi->ci.bstream); |
| 1592 | if (err==ZIP_OK) | 1593 | if (err==ZIP_OK) |
| 1593 | err = tmperr; | 1594 | err = tmperr; |
| 1594 | zi->ci.stream_initialised = 0; | 1595 | zi->ci.stream_initialised = 0; |
| 1595 | } | 1596 | } |
| 1596 | #endif | 1597 | #endif |
| 1597 | 1598 | ||
| @@ -1851,7 +1852,7 @@ int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, | |||
| 1851 | err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)0xffffffff,4); | 1852 | err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)0xffffffff,4); |
| 1852 | } | 1853 | } |
| 1853 | else | 1854 | else |
| 1854 | err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)(centraldir_pos_inzip - zi->add_position_when_writting_offset),4); | 1855 | err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)(centraldir_pos_inzip - zi->add_position_when_writting_offset),4); |
| 1855 | } | 1856 | } |
| 1856 | 1857 | ||
| 1857 | return err; | 1858 | return err; |
diff --git a/contrib/minizip/zip.h b/contrib/minizip/zip.h index 5e3a46c..8aaebb6 100644 --- a/contrib/minizip/zip.h +++ b/contrib/minizip/zip.h | |||
| @@ -1,15 +1,15 @@ | |||
| 1 | /* zip.h -- IO on .zip files using zlib | 1 | /* zip.h -- IO on .zip files using zlib |
| 2 | Version 1.1, January 7th, 2010 | 2 | Version 1.1, February 14h, 2010 |
| 3 | part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) | 3 | part of the MiniZip project - ( http://www.winimage.com/zLibDll/minizip.html ) |
| 4 | 4 | ||
| 5 | Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) | 5 | Copyright (C) 1998-2010 Gilles Vollant (minizip) ( http://www.winimage.com/zLibDll/minizip.html ) |
| 6 | 6 | ||
| 7 | Modifications for Zip64 support | 7 | Modifications for Zip64 support |
| 8 | Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) | 8 | Copyright (C) 2009-2010 Mathias Svensson ( http://result42.com ) |
| 9 | 9 | ||
| 10 | For more info read MiniZip_info.txt | 10 | For more info read MiniZip_info.txt |
| 11 | 11 | ||
| 12 | --------------------------------------------------------------------------- | 12 | --------------------------------------------------------------------------- |
| 13 | 13 | ||
| 14 | Condition of use and distribution are the same than zlib : | 14 | Condition of use and distribution are the same than zlib : |
| 15 | 15 | ||
| @@ -29,11 +29,11 @@ | |||
| 29 | misrepresented as being the original software. | 29 | misrepresented as being the original software. |
| 30 | 3. This notice may not be removed or altered from any source distribution. | 30 | 3. This notice may not be removed or altered from any source distribution. |
| 31 | 31 | ||
| 32 | --------------------------------------------------------------------------- | 32 | --------------------------------------------------------------------------- |
| 33 | 33 | ||
| 34 | Changes | 34 | Changes |
| 35 | 35 | ||
| 36 | See header of zip.h | 36 | See header of zip.h |
| 37 | 37 | ||
| 38 | */ | 38 | */ |
| 39 | 39 | ||
| @@ -348,10 +348,10 @@ extern int ZEXPORT zipRemoveExtraInfoBlock OF((char* pData, int* dataLen, short | |||
| 348 | 0x0001 is the signature header for the ZIP64 extra information blocks | 348 | 0x0001 is the signature header for the ZIP64 extra information blocks |
| 349 | 349 | ||
| 350 | usage. | 350 | usage. |
| 351 | Remove ZIP64 Extra information from a central director extra field data | 351 | Remove ZIP64 Extra information from a central director extra field data |
| 352 | zipRemoveExtraInfoBlock(pCenDirExtraFieldData, &nCenDirExtraFieldDataLen, 0x0001); | 352 | zipRemoveExtraInfoBlock(pCenDirExtraFieldData, &nCenDirExtraFieldDataLen, 0x0001); |
| 353 | 353 | ||
| 354 | Remove ZIP64 Extra information from a Local File Header extra field data | 354 | Remove ZIP64 Extra information from a Local File Header extra field data |
| 355 | zipRemoveExtraInfoBlock(pLocalHeaderExtraFieldData, &nLocalHeaderExtraFieldDataLen, 0x0001); | 355 | zipRemoveExtraInfoBlock(pLocalHeaderExtraFieldData, &nLocalHeaderExtraFieldDataLen, 0x0001); |
| 356 | */ | 356 | */ |
| 357 | 357 | ||
diff --git a/contrib/pascal/zlibd32.mak b/contrib/pascal/zlibd32.mak index 203a4c9..0d0699a 100644 --- a/contrib/pascal/zlibd32.mak +++ b/contrib/pascal/zlibd32.mak | |||
| @@ -18,9 +18,9 @@ LDFLAGS = | |||
| 18 | # variables | 18 | # variables |
| 19 | ZLIB_LIB = zlib.lib | 19 | ZLIB_LIB = zlib.lib |
| 20 | 20 | ||
| 21 | OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzio.obj gzlib.obj gzread.obj | 21 | OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj |
| 22 | OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj | 22 | OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj |
| 23 | OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzio.obj+gzlib.obj+gzread.obj | 23 | OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj |
| 24 | OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj | 24 | OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj |
| 25 | 25 | ||
| 26 | 26 | ||
| @@ -40,8 +40,6 @@ deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h | |||
| 40 | 40 | ||
| 41 | gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h | 41 | gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h |
| 42 | 42 | ||
| 43 | gzio.obj: gzio.c zutil.h zlib.h zconf.h | ||
| 44 | |||
| 45 | gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h | 43 | gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h |
| 46 | 44 | ||
| 47 | gzread.obj: gzread.c zlib.h zconf.h gzguts.h | 45 | gzread.obj: gzread.c zlib.h zconf.h gzguts.h |
diff --git a/contrib/vstudio/readme.txt b/contrib/vstudio/readme.txt index 416fc49..a7b7247 100644 --- a/contrib/vstudio/readme.txt +++ b/contrib/vstudio/readme.txt | |||
| @@ -2,7 +2,7 @@ Building instructions for the DLL versions of Zlib 1.2.3 | |||
| 2 | ======================================================== | 2 | ======================================================== |
| 3 | 3 | ||
| 4 | This directory contains projects that build zlib and minizip using | 4 | This directory contains projects that build zlib and minizip using |
| 5 | Microsoft Visual C++ 7.0/7.1, and Visual C++ . | 5 | Microsoft Visual C++ 7.0/7.1/8.0/9.0/10.0, and Visual C++ . |
| 6 | 6 | ||
| 7 | You don't need to build these projects yourself. You can download the | 7 | You don't need to build these projects yourself. You can download the |
| 8 | binaries from: | 8 | binaries from: |
| @@ -10,6 +10,10 @@ binaries from: | |||
| 10 | 10 | ||
| 11 | More information can be found at this site. | 11 | More information can be found at this site. |
| 12 | 12 | ||
| 13 | first compile assembly code by running | ||
| 14 | bld_ml64.bat in contrib\masmx64 | ||
| 15 | bld_ml32.bat in contrib\masmx86 | ||
| 16 | |||
| 13 | 17 | ||
| 14 | Build instructions for Visual Studio 7.x (32 bits) | 18 | Build instructions for Visual Studio 7.x (32 bits) |
| 15 | -------------------------------------------------- | 19 | -------------------------------------------------- |
| @@ -26,7 +30,7 @@ Build instructions for Visual Studio 2005 (32 bits or 64 bits) | |||
| 26 | - For 32 bits only: download the crtdll library from | 30 | - For 32 bits only: download the crtdll library from |
| 27 | http://www.winimage.com/zLibDll/crtdll.zip | 31 | http://www.winimage.com/zLibDll/crtdll.zip |
| 28 | Unzip crtdll.zip to extract crtdll.lib on contrib\vstudio\vc8. | 32 | Unzip crtdll.zip to extract crtdll.lib on contrib\vstudio\vc8. |
| 29 | - Open contrib\vstudio\vc8\zlibvc.sln with Microsoft Visual C++ 8.0 | 33 | - Open contrib\vstudio\vc8\zlibvc.sln with Microsoft Visual C++ 2005 |
| 30 | 34 | ||
| 31 | Build instructions for Visual Studio 2005 64 bits, PSDK compiler | 35 | Build instructions for Visual Studio 2005 64 bits, PSDK compiler |
| 32 | ---------------------------------------------------------------- | 36 | ---------------------------------------------------------------- |
| @@ -39,7 +43,24 @@ see http://www.winimage.com/misc/sdk64onvs2005/ for instruction | |||
| 39 | - Uncompress current zlib, including all contrib/* files | 43 | - Uncompress current zlib, including all contrib/* files |
| 40 | - start Visual Studio 2005 from a platform SDK command prompt, using | 44 | - start Visual Studio 2005 from a platform SDK command prompt, using |
| 41 | the /useenv switch | 45 | the /useenv switch |
| 42 | - Open contrib\vstudio\vc8\zlibvc.sln with Microsoft Visual C++ 8.0 | 46 | - Open contrib\vstudio\vc8\zlibvc.sln with Microsoft Visual C++ 2005 |
| 47 | |||
| 48 | |||
| 49 | Build instructions for Visual Studio 2008 (32 bits or 64 bits) | ||
| 50 | -------------------------------------------------------------- | ||
| 51 | - Uncompress current zlib, including all contrib/* files | ||
| 52 | - For 32 bits only: download the crtdll library from | ||
| 53 | http://www.winimage.com/zLibDll/crtdll.zip | ||
| 54 | Unzip crtdll.zip to extract crtdll.lib on contrib\vstudio\vc9. | ||
| 55 | - Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008.0 | ||
| 56 | |||
| 57 | Build instructions for Visual Studio 2010 (32 bits or 64 bits) | ||
| 58 | -------------------------------------------------------------- | ||
| 59 | - Uncompress current zlib, including all contrib/* files | ||
| 60 | - For 32 bits only: download the crtdll library from | ||
| 61 | http://www.winimage.com/zLibDll/crtdll.zip | ||
| 62 | Unzip crtdll.zip to extract crtdll.lib on contrib\vstudio\vc10. | ||
| 63 | - Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010.0 | ||
| 43 | 64 | ||
| 44 | 65 | ||
| 45 | Important | 66 | Important |
diff --git a/contrib/vstudio/vc10/miniunz.vcxproj b/contrib/vstudio/vc10/miniunz.vcxproj new file mode 100644 index 0000000..74e15c9 --- /dev/null +++ b/contrib/vstudio/vc10/miniunz.vcxproj | |||
| @@ -0,0 +1,310 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | <ItemGroup Label="ProjectConfigurations"> | ||
| 4 | <ProjectConfiguration Include="Debug|Itanium"> | ||
| 5 | <Configuration>Debug</Configuration> | ||
| 6 | <Platform>Itanium</Platform> | ||
| 7 | </ProjectConfiguration> | ||
| 8 | <ProjectConfiguration Include="Debug|Win32"> | ||
| 9 | <Configuration>Debug</Configuration> | ||
| 10 | <Platform>Win32</Platform> | ||
| 11 | </ProjectConfiguration> | ||
| 12 | <ProjectConfiguration Include="Debug|x64"> | ||
| 13 | <Configuration>Debug</Configuration> | ||
| 14 | <Platform>x64</Platform> | ||
| 15 | </ProjectConfiguration> | ||
| 16 | <ProjectConfiguration Include="Release|Itanium"> | ||
| 17 | <Configuration>Release</Configuration> | ||
| 18 | <Platform>Itanium</Platform> | ||
| 19 | </ProjectConfiguration> | ||
| 20 | <ProjectConfiguration Include="Release|Win32"> | ||
| 21 | <Configuration>Release</Configuration> | ||
| 22 | <Platform>Win32</Platform> | ||
| 23 | </ProjectConfiguration> | ||
| 24 | <ProjectConfiguration Include="Release|x64"> | ||
| 25 | <Configuration>Release</Configuration> | ||
| 26 | <Platform>x64</Platform> | ||
| 27 | </ProjectConfiguration> | ||
| 28 | </ItemGroup> | ||
| 29 | <PropertyGroup Label="Globals"> | ||
| 30 | <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694382A}</ProjectGuid> | ||
| 31 | <Keyword>Win32Proj</Keyword> | ||
| 32 | </PropertyGroup> | ||
| 33 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||
| 34 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | ||
| 35 | <ConfigurationType>Application</ConfigurationType> | ||
| 36 | <CharacterSet>MultiByte</CharacterSet> | ||
| 37 | </PropertyGroup> | ||
| 38 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||
| 39 | <ConfigurationType>Application</ConfigurationType> | ||
| 40 | <CharacterSet>MultiByte</CharacterSet> | ||
| 41 | </PropertyGroup> | ||
| 42 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration"> | ||
| 43 | <ConfigurationType>Application</ConfigurationType> | ||
| 44 | <CharacterSet>MultiByte</CharacterSet> | ||
| 45 | </PropertyGroup> | ||
| 46 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration"> | ||
| 47 | <ConfigurationType>Application</ConfigurationType> | ||
| 48 | <CharacterSet>MultiByte</CharacterSet> | ||
| 49 | </PropertyGroup> | ||
| 50 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | ||
| 51 | <ConfigurationType>Application</ConfigurationType> | ||
| 52 | <CharacterSet>MultiByte</CharacterSet> | ||
| 53 | </PropertyGroup> | ||
| 54 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | ||
| 55 | <ConfigurationType>Application</ConfigurationType> | ||
| 56 | <CharacterSet>MultiByte</CharacterSet> | ||
| 57 | </PropertyGroup> | ||
| 58 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||
| 59 | <ImportGroup Label="ExtensionSettings"> | ||
| 60 | </ImportGroup> | ||
| 61 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> | ||
| 62 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 63 | </ImportGroup> | ||
| 64 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> | ||
| 65 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 66 | </ImportGroup> | ||
| 67 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets"> | ||
| 68 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 69 | </ImportGroup> | ||
| 70 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets"> | ||
| 71 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 72 | </ImportGroup> | ||
| 73 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> | ||
| 74 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 75 | </ImportGroup> | ||
| 76 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> | ||
| 77 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 78 | </ImportGroup> | ||
| 79 | <PropertyGroup Label="UserMacros" /> | ||
| 80 | <PropertyGroup> | ||
| 81 | <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion> | ||
| 82 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\</OutDir> | ||
| 83 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir> | ||
| 84 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> | ||
| 85 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest> | ||
| 86 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\</OutDir> | ||
| 87 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir> | ||
| 88 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> | ||
| 89 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest> | ||
| 90 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\</OutDir> | ||
| 91 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir> | ||
| 92 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental> | ||
| 93 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest> | ||
| 94 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir> | ||
| 95 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir> | ||
| 96 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental> | ||
| 97 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest> | ||
| 98 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\</OutDir> | ||
| 99 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir> | ||
| 100 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental> | ||
| 101 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest> | ||
| 102 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir> | ||
| 103 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir> | ||
| 104 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental> | ||
| 105 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest> | ||
| 106 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 107 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" /> | ||
| 108 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" /> | ||
| 109 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 110 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> | ||
| 111 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> | ||
| 112 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 113 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> | ||
| 114 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> | ||
| 115 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 116 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" /> | ||
| 117 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" /> | ||
| 118 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 119 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> | ||
| 120 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> | ||
| 121 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 122 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> | ||
| 123 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> | ||
| 124 | </PropertyGroup> | ||
| 125 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
| 126 | <ClCompile> | ||
| 127 | <Optimization>Disabled</Optimization> | ||
| 128 | <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 129 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 130 | <MinimalRebuild>true</MinimalRebuild> | ||
| 131 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | ||
| 132 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
| 133 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 134 | <PrecompiledHeader> | ||
| 135 | </PrecompiledHeader> | ||
| 136 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 137 | <WarningLevel>Level3</WarningLevel> | ||
| 138 | <DebugInformationFormat>EditAndContinue</DebugInformationFormat> | ||
| 139 | </ClCompile> | ||
| 140 | <Link> | ||
| 141 | <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 142 | <OutputFile>$(OutDir)miniunz.exe</OutputFile> | ||
| 143 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 144 | <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile> | ||
| 145 | <SubSystem>Console</SubSystem> | ||
| 146 | <RandomizedBaseAddress>false</RandomizedBaseAddress> | ||
| 147 | <DataExecutionPrevention> | ||
| 148 | </DataExecutionPrevention> | ||
| 149 | <TargetMachine>MachineX86</TargetMachine> | ||
| 150 | </Link> | ||
| 151 | </ItemDefinitionGroup> | ||
| 152 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
| 153 | <ClCompile> | ||
| 154 | <Optimization>MaxSpeed</Optimization> | ||
| 155 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | ||
| 156 | <OmitFramePointers>true</OmitFramePointers> | ||
| 157 | <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 158 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 159 | <StringPooling>true</StringPooling> | ||
| 160 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | ||
| 161 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| 162 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 163 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 164 | <PrecompiledHeader> | ||
| 165 | </PrecompiledHeader> | ||
| 166 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 167 | <WarningLevel>Level3</WarningLevel> | ||
| 168 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | ||
| 169 | </ClCompile> | ||
| 170 | <Link> | ||
| 171 | <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 172 | <OutputFile>$(OutDir)miniunz.exe</OutputFile> | ||
| 173 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 174 | <SubSystem>Console</SubSystem> | ||
| 175 | <OptimizeReferences>true</OptimizeReferences> | ||
| 176 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 177 | <RandomizedBaseAddress>false</RandomizedBaseAddress> | ||
| 178 | <DataExecutionPrevention> | ||
| 179 | </DataExecutionPrevention> | ||
| 180 | <TargetMachine>MachineX86</TargetMachine> | ||
| 181 | </Link> | ||
| 182 | </ItemDefinitionGroup> | ||
| 183 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | ||
| 184 | <Midl> | ||
| 185 | <TargetEnvironment>X64</TargetEnvironment> | ||
| 186 | </Midl> | ||
| 187 | <ClCompile> | ||
| 188 | <Optimization>Disabled</Optimization> | ||
| 189 | <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 190 | <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 191 | <MinimalRebuild>true</MinimalRebuild> | ||
| 192 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | ||
| 193 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
| 194 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 195 | <PrecompiledHeader> | ||
| 196 | </PrecompiledHeader> | ||
| 197 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 198 | <WarningLevel>Level3</WarningLevel> | ||
| 199 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | ||
| 200 | </ClCompile> | ||
| 201 | <Link> | ||
| 202 | <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 203 | <OutputFile>$(OutDir)miniunz.exe</OutputFile> | ||
| 204 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 205 | <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile> | ||
| 206 | <SubSystem>Console</SubSystem> | ||
| 207 | <TargetMachine>MachineX64</TargetMachine> | ||
| 208 | </Link> | ||
| 209 | </ItemDefinitionGroup> | ||
| 210 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> | ||
| 211 | <Midl> | ||
| 212 | <TargetEnvironment>Itanium</TargetEnvironment> | ||
| 213 | </Midl> | ||
| 214 | <ClCompile> | ||
| 215 | <Optimization>Disabled</Optimization> | ||
| 216 | <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 217 | <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 218 | <MinimalRebuild>true</MinimalRebuild> | ||
| 219 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | ||
| 220 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
| 221 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 222 | <PrecompiledHeader> | ||
| 223 | </PrecompiledHeader> | ||
| 224 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 225 | <WarningLevel>Level3</WarningLevel> | ||
| 226 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | ||
| 227 | </ClCompile> | ||
| 228 | <Link> | ||
| 229 | <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 230 | <OutputFile>$(OutDir)miniunz.exe</OutputFile> | ||
| 231 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 232 | <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile> | ||
| 233 | <SubSystem>Console</SubSystem> | ||
| 234 | <TargetMachine>MachineIA64</TargetMachine> | ||
| 235 | </Link> | ||
| 236 | </ItemDefinitionGroup> | ||
| 237 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | ||
| 238 | <Midl> | ||
| 239 | <TargetEnvironment>X64</TargetEnvironment> | ||
| 240 | </Midl> | ||
| 241 | <ClCompile> | ||
| 242 | <Optimization>MaxSpeed</Optimization> | ||
| 243 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | ||
| 244 | <OmitFramePointers>true</OmitFramePointers> | ||
| 245 | <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 246 | <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 247 | <StringPooling>true</StringPooling> | ||
| 248 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | ||
| 249 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | ||
| 250 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 251 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 252 | <PrecompiledHeader> | ||
| 253 | </PrecompiledHeader> | ||
| 254 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 255 | <WarningLevel>Level3</WarningLevel> | ||
| 256 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | ||
| 257 | </ClCompile> | ||
| 258 | <Link> | ||
| 259 | <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 260 | <OutputFile>$(OutDir)miniunz.exe</OutputFile> | ||
| 261 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 262 | <SubSystem>Console</SubSystem> | ||
| 263 | <OptimizeReferences>true</OptimizeReferences> | ||
| 264 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 265 | <TargetMachine>MachineX64</TargetMachine> | ||
| 266 | </Link> | ||
| 267 | </ItemDefinitionGroup> | ||
| 268 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> | ||
| 269 | <Midl> | ||
| 270 | <TargetEnvironment>Itanium</TargetEnvironment> | ||
| 271 | </Midl> | ||
| 272 | <ClCompile> | ||
| 273 | <Optimization>MaxSpeed</Optimization> | ||
| 274 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | ||
| 275 | <OmitFramePointers>true</OmitFramePointers> | ||
| 276 | <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 277 | <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 278 | <StringPooling>true</StringPooling> | ||
| 279 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | ||
| 280 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | ||
| 281 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 282 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 283 | <PrecompiledHeader> | ||
| 284 | </PrecompiledHeader> | ||
| 285 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 286 | <WarningLevel>Level3</WarningLevel> | ||
| 287 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | ||
| 288 | </ClCompile> | ||
| 289 | <Link> | ||
| 290 | <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 291 | <OutputFile>$(OutDir)miniunz.exe</OutputFile> | ||
| 292 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 293 | <SubSystem>Console</SubSystem> | ||
| 294 | <OptimizeReferences>true</OptimizeReferences> | ||
| 295 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 296 | <TargetMachine>MachineIA64</TargetMachine> | ||
| 297 | </Link> | ||
| 298 | </ItemDefinitionGroup> | ||
| 299 | <ItemGroup> | ||
| 300 | <ClCompile Include="..\..\minizip\miniunz.c" /> | ||
| 301 | </ItemGroup> | ||
| 302 | <ItemGroup> | ||
| 303 | <ProjectReference Include="zlibvc.vcxproj"> | ||
| 304 | <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project> | ||
| 305 | </ProjectReference> | ||
| 306 | </ItemGroup> | ||
| 307 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||
| 308 | <ImportGroup Label="ExtensionTargets"> | ||
| 309 | </ImportGroup> | ||
| 310 | </Project> \ No newline at end of file | ||
diff --git a/contrib/vstudio/vc10/miniunz.vcxproj.filters b/contrib/vstudio/vc10/miniunz.vcxproj.filters new file mode 100644 index 0000000..0b2a3de --- /dev/null +++ b/contrib/vstudio/vc10/miniunz.vcxproj.filters | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | <ItemGroup> | ||
| 4 | <Filter Include="Source Files"> | ||
| 5 | <UniqueIdentifier>{048af943-022b-4db6-beeb-a54c34774ee2}</UniqueIdentifier> | ||
| 6 | <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions> | ||
| 7 | </Filter> | ||
| 8 | <Filter Include="Header Files"> | ||
| 9 | <UniqueIdentifier>{c1d600d2-888f-4aea-b73e-8b0dd9befa0c}</UniqueIdentifier> | ||
| 10 | <Extensions>h;hpp;hxx;hm;inl;inc</Extensions> | ||
| 11 | </Filter> | ||
| 12 | <Filter Include="Resource Files"> | ||
| 13 | <UniqueIdentifier>{0844199a-966b-4f19-81db-1e0125e141b9}</UniqueIdentifier> | ||
| 14 | <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions> | ||
| 15 | </Filter> | ||
| 16 | </ItemGroup> | ||
| 17 | <ItemGroup> | ||
| 18 | <ClCompile Include="..\..\minizip\miniunz.c"> | ||
| 19 | <Filter>Source Files</Filter> | ||
| 20 | </ClCompile> | ||
| 21 | </ItemGroup> | ||
| 22 | </Project> \ No newline at end of file | ||
diff --git a/contrib/vstudio/vc10/miniunz.vcxproj.user b/contrib/vstudio/vc10/miniunz.vcxproj.user new file mode 100644 index 0000000..695b5c7 --- /dev/null +++ b/contrib/vstudio/vc10/miniunz.vcxproj.user | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | </Project> \ No newline at end of file | ||
diff --git a/contrib/vstudio/vc10/minizip.vcxproj b/contrib/vstudio/vc10/minizip.vcxproj new file mode 100644 index 0000000..917e156 --- /dev/null +++ b/contrib/vstudio/vc10/minizip.vcxproj | |||
| @@ -0,0 +1,307 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | <ItemGroup Label="ProjectConfigurations"> | ||
| 4 | <ProjectConfiguration Include="Debug|Itanium"> | ||
| 5 | <Configuration>Debug</Configuration> | ||
| 6 | <Platform>Itanium</Platform> | ||
| 7 | </ProjectConfiguration> | ||
| 8 | <ProjectConfiguration Include="Debug|Win32"> | ||
| 9 | <Configuration>Debug</Configuration> | ||
| 10 | <Platform>Win32</Platform> | ||
| 11 | </ProjectConfiguration> | ||
| 12 | <ProjectConfiguration Include="Debug|x64"> | ||
| 13 | <Configuration>Debug</Configuration> | ||
| 14 | <Platform>x64</Platform> | ||
| 15 | </ProjectConfiguration> | ||
| 16 | <ProjectConfiguration Include="Release|Itanium"> | ||
| 17 | <Configuration>Release</Configuration> | ||
| 18 | <Platform>Itanium</Platform> | ||
| 19 | </ProjectConfiguration> | ||
| 20 | <ProjectConfiguration Include="Release|Win32"> | ||
| 21 | <Configuration>Release</Configuration> | ||
| 22 | <Platform>Win32</Platform> | ||
| 23 | </ProjectConfiguration> | ||
| 24 | <ProjectConfiguration Include="Release|x64"> | ||
| 25 | <Configuration>Release</Configuration> | ||
| 26 | <Platform>x64</Platform> | ||
| 27 | </ProjectConfiguration> | ||
| 28 | </ItemGroup> | ||
| 29 | <PropertyGroup Label="Globals"> | ||
| 30 | <ProjectGuid>{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid> | ||
| 31 | <Keyword>Win32Proj</Keyword> | ||
| 32 | </PropertyGroup> | ||
| 33 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||
| 34 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | ||
| 35 | <ConfigurationType>Application</ConfigurationType> | ||
| 36 | <CharacterSet>MultiByte</CharacterSet> | ||
| 37 | </PropertyGroup> | ||
| 38 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||
| 39 | <ConfigurationType>Application</ConfigurationType> | ||
| 40 | <CharacterSet>MultiByte</CharacterSet> | ||
| 41 | </PropertyGroup> | ||
| 42 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration"> | ||
| 43 | <ConfigurationType>Application</ConfigurationType> | ||
| 44 | <CharacterSet>MultiByte</CharacterSet> | ||
| 45 | </PropertyGroup> | ||
| 46 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration"> | ||
| 47 | <ConfigurationType>Application</ConfigurationType> | ||
| 48 | <CharacterSet>MultiByte</CharacterSet> | ||
| 49 | </PropertyGroup> | ||
| 50 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | ||
| 51 | <ConfigurationType>Application</ConfigurationType> | ||
| 52 | <CharacterSet>MultiByte</CharacterSet> | ||
| 53 | </PropertyGroup> | ||
| 54 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | ||
| 55 | <ConfigurationType>Application</ConfigurationType> | ||
| 56 | <CharacterSet>MultiByte</CharacterSet> | ||
| 57 | </PropertyGroup> | ||
| 58 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||
| 59 | <ImportGroup Label="ExtensionSettings"> | ||
| 60 | </ImportGroup> | ||
| 61 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> | ||
| 62 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 63 | </ImportGroup> | ||
| 64 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> | ||
| 65 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 66 | </ImportGroup> | ||
| 67 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets"> | ||
| 68 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 69 | </ImportGroup> | ||
| 70 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets"> | ||
| 71 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 72 | </ImportGroup> | ||
| 73 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> | ||
| 74 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 75 | </ImportGroup> | ||
| 76 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> | ||
| 77 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 78 | </ImportGroup> | ||
| 79 | <PropertyGroup Label="UserMacros" /> | ||
| 80 | <PropertyGroup> | ||
| 81 | <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion> | ||
| 82 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\</OutDir> | ||
| 83 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir> | ||
| 84 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> | ||
| 85 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest> | ||
| 86 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\</OutDir> | ||
| 87 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir> | ||
| 88 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> | ||
| 89 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</OutDir> | ||
| 90 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</IntDir> | ||
| 91 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental> | ||
| 92 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest> | ||
| 93 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</OutDir> | ||
| 94 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</IntDir> | ||
| 95 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental> | ||
| 96 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest> | ||
| 97 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</OutDir> | ||
| 98 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</IntDir> | ||
| 99 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental> | ||
| 100 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</OutDir> | ||
| 101 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</IntDir> | ||
| 102 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental> | ||
| 103 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 104 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" /> | ||
| 105 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" /> | ||
| 106 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 107 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> | ||
| 108 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> | ||
| 109 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 110 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> | ||
| 111 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> | ||
| 112 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 113 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" /> | ||
| 114 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" /> | ||
| 115 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 116 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> | ||
| 117 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> | ||
| 118 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 119 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> | ||
| 120 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> | ||
| 121 | </PropertyGroup> | ||
| 122 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
| 123 | <ClCompile> | ||
| 124 | <Optimization>Disabled</Optimization> | ||
| 125 | <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 126 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 127 | <MinimalRebuild>true</MinimalRebuild> | ||
| 128 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | ||
| 129 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
| 130 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 131 | <PrecompiledHeader> | ||
| 132 | </PrecompiledHeader> | ||
| 133 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 134 | <WarningLevel>Level3</WarningLevel> | ||
| 135 | <DebugInformationFormat>EditAndContinue</DebugInformationFormat> | ||
| 136 | </ClCompile> | ||
| 137 | <Link> | ||
| 138 | <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 139 | <OutputFile>$(OutDir)minizip.exe</OutputFile> | ||
| 140 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 141 | <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile> | ||
| 142 | <SubSystem>Console</SubSystem> | ||
| 143 | <RandomizedBaseAddress>false</RandomizedBaseAddress> | ||
| 144 | <DataExecutionPrevention> | ||
| 145 | </DataExecutionPrevention> | ||
| 146 | <TargetMachine>MachineX86</TargetMachine> | ||
| 147 | </Link> | ||
| 148 | </ItemDefinitionGroup> | ||
| 149 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
| 150 | <ClCompile> | ||
| 151 | <Optimization>MaxSpeed</Optimization> | ||
| 152 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | ||
| 153 | <OmitFramePointers>true</OmitFramePointers> | ||
| 154 | <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 155 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 156 | <StringPooling>true</StringPooling> | ||
| 157 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | ||
| 158 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| 159 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 160 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 161 | <PrecompiledHeader> | ||
| 162 | </PrecompiledHeader> | ||
| 163 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 164 | <WarningLevel>Level3</WarningLevel> | ||
| 165 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | ||
| 166 | </ClCompile> | ||
| 167 | <Link> | ||
| 168 | <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 169 | <OutputFile>$(OutDir)minizip.exe</OutputFile> | ||
| 170 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 171 | <SubSystem>Console</SubSystem> | ||
| 172 | <OptimizeReferences>true</OptimizeReferences> | ||
| 173 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 174 | <RandomizedBaseAddress>false</RandomizedBaseAddress> | ||
| 175 | <DataExecutionPrevention> | ||
| 176 | </DataExecutionPrevention> | ||
| 177 | <TargetMachine>MachineX86</TargetMachine> | ||
| 178 | </Link> | ||
| 179 | </ItemDefinitionGroup> | ||
| 180 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | ||
| 181 | <Midl> | ||
| 182 | <TargetEnvironment>X64</TargetEnvironment> | ||
| 183 | </Midl> | ||
| 184 | <ClCompile> | ||
| 185 | <Optimization>Disabled</Optimization> | ||
| 186 | <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 187 | <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 188 | <MinimalRebuild>true</MinimalRebuild> | ||
| 189 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | ||
| 190 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
| 191 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 192 | <PrecompiledHeader> | ||
| 193 | </PrecompiledHeader> | ||
| 194 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 195 | <WarningLevel>Level3</WarningLevel> | ||
| 196 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | ||
| 197 | </ClCompile> | ||
| 198 | <Link> | ||
| 199 | <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 200 | <OutputFile>$(OutDir)minizip.exe</OutputFile> | ||
| 201 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 202 | <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile> | ||
| 203 | <SubSystem>Console</SubSystem> | ||
| 204 | <TargetMachine>MachineX64</TargetMachine> | ||
| 205 | </Link> | ||
| 206 | </ItemDefinitionGroup> | ||
| 207 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> | ||
| 208 | <Midl> | ||
| 209 | <TargetEnvironment>Itanium</TargetEnvironment> | ||
| 210 | </Midl> | ||
| 211 | <ClCompile> | ||
| 212 | <Optimization>Disabled</Optimization> | ||
| 213 | <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 214 | <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 215 | <MinimalRebuild>true</MinimalRebuild> | ||
| 216 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | ||
| 217 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
| 218 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 219 | <PrecompiledHeader> | ||
| 220 | </PrecompiledHeader> | ||
| 221 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 222 | <WarningLevel>Level3</WarningLevel> | ||
| 223 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | ||
| 224 | </ClCompile> | ||
| 225 | <Link> | ||
| 226 | <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 227 | <OutputFile>$(OutDir)minizip.exe</OutputFile> | ||
| 228 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 229 | <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile> | ||
| 230 | <SubSystem>Console</SubSystem> | ||
| 231 | <TargetMachine>MachineIA64</TargetMachine> | ||
| 232 | </Link> | ||
| 233 | </ItemDefinitionGroup> | ||
| 234 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | ||
| 235 | <Midl> | ||
| 236 | <TargetEnvironment>X64</TargetEnvironment> | ||
| 237 | </Midl> | ||
| 238 | <ClCompile> | ||
| 239 | <Optimization>MaxSpeed</Optimization> | ||
| 240 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | ||
| 241 | <OmitFramePointers>true</OmitFramePointers> | ||
| 242 | <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 243 | <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 244 | <StringPooling>true</StringPooling> | ||
| 245 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | ||
| 246 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | ||
| 247 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 248 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 249 | <PrecompiledHeader> | ||
| 250 | </PrecompiledHeader> | ||
| 251 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 252 | <WarningLevel>Level3</WarningLevel> | ||
| 253 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | ||
| 254 | </ClCompile> | ||
| 255 | <Link> | ||
| 256 | <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 257 | <OutputFile>$(OutDir)minizip.exe</OutputFile> | ||
| 258 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 259 | <SubSystem>Console</SubSystem> | ||
| 260 | <OptimizeReferences>true</OptimizeReferences> | ||
| 261 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 262 | <TargetMachine>MachineX64</TargetMachine> | ||
| 263 | </Link> | ||
| 264 | </ItemDefinitionGroup> | ||
| 265 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> | ||
| 266 | <Midl> | ||
| 267 | <TargetEnvironment>Itanium</TargetEnvironment> | ||
| 268 | </Midl> | ||
| 269 | <ClCompile> | ||
| 270 | <Optimization>MaxSpeed</Optimization> | ||
| 271 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | ||
| 272 | <OmitFramePointers>true</OmitFramePointers> | ||
| 273 | <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 274 | <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 275 | <StringPooling>true</StringPooling> | ||
| 276 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | ||
| 277 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | ||
| 278 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 279 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 280 | <PrecompiledHeader> | ||
| 281 | </PrecompiledHeader> | ||
| 282 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 283 | <WarningLevel>Level3</WarningLevel> | ||
| 284 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | ||
| 285 | </ClCompile> | ||
| 286 | <Link> | ||
| 287 | <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 288 | <OutputFile>$(OutDir)minizip.exe</OutputFile> | ||
| 289 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 290 | <SubSystem>Console</SubSystem> | ||
| 291 | <OptimizeReferences>true</OptimizeReferences> | ||
| 292 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 293 | <TargetMachine>MachineIA64</TargetMachine> | ||
| 294 | </Link> | ||
| 295 | </ItemDefinitionGroup> | ||
| 296 | <ItemGroup> | ||
| 297 | <ClCompile Include="..\..\minizip\minizip.c" /> | ||
| 298 | </ItemGroup> | ||
| 299 | <ItemGroup> | ||
| 300 | <ProjectReference Include="zlibvc.vcxproj"> | ||
| 301 | <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project> | ||
| 302 | </ProjectReference> | ||
| 303 | </ItemGroup> | ||
| 304 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||
| 305 | <ImportGroup Label="ExtensionTargets"> | ||
| 306 | </ImportGroup> | ||
| 307 | </Project> \ No newline at end of file | ||
diff --git a/contrib/vstudio/vc10/minizip.vcxproj.filters b/contrib/vstudio/vc10/minizip.vcxproj.filters new file mode 100644 index 0000000..dd73cd3 --- /dev/null +++ b/contrib/vstudio/vc10/minizip.vcxproj.filters | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | <ItemGroup> | ||
| 4 | <Filter Include="Source Files"> | ||
| 5 | <UniqueIdentifier>{c0419b40-bf50-40da-b153-ff74215b79de}</UniqueIdentifier> | ||
| 6 | <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions> | ||
| 7 | </Filter> | ||
| 8 | <Filter Include="Header Files"> | ||
| 9 | <UniqueIdentifier>{bb87b070-735b-478e-92ce-7383abb2f36c}</UniqueIdentifier> | ||
| 10 | <Extensions>h;hpp;hxx;hm;inl;inc</Extensions> | ||
| 11 | </Filter> | ||
| 12 | <Filter Include="Resource Files"> | ||
| 13 | <UniqueIdentifier>{f46ab6a6-548f-43cb-ae96-681abb5bd5db}</UniqueIdentifier> | ||
| 14 | <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions> | ||
| 15 | </Filter> | ||
| 16 | </ItemGroup> | ||
| 17 | <ItemGroup> | ||
| 18 | <ClCompile Include="..\..\minizip\minizip.c"> | ||
| 19 | <Filter>Source Files</Filter> | ||
| 20 | </ClCompile> | ||
| 21 | </ItemGroup> | ||
| 22 | </Project> \ No newline at end of file | ||
diff --git a/contrib/vstudio/vc10/minizip.vcxproj.user b/contrib/vstudio/vc10/minizip.vcxproj.user new file mode 100644 index 0000000..695b5c7 --- /dev/null +++ b/contrib/vstudio/vc10/minizip.vcxproj.user | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | </Project> \ No newline at end of file | ||
diff --git a/contrib/vstudio/vc10/testzlib.vcxproj b/contrib/vstudio/vc10/testzlib.vcxproj new file mode 100644 index 0000000..9810412 --- /dev/null +++ b/contrib/vstudio/vc10/testzlib.vcxproj | |||
| @@ -0,0 +1,428 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | <ItemGroup Label="ProjectConfigurations"> | ||
| 4 | <ProjectConfiguration Include="Debug|Itanium"> | ||
| 5 | <Configuration>Debug</Configuration> | ||
| 6 | <Platform>Itanium</Platform> | ||
| 7 | </ProjectConfiguration> | ||
| 8 | <ProjectConfiguration Include="Debug|Win32"> | ||
| 9 | <Configuration>Debug</Configuration> | ||
| 10 | <Platform>Win32</Platform> | ||
| 11 | </ProjectConfiguration> | ||
| 12 | <ProjectConfiguration Include="Debug|x64"> | ||
| 13 | <Configuration>Debug</Configuration> | ||
| 14 | <Platform>x64</Platform> | ||
| 15 | </ProjectConfiguration> | ||
| 16 | <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium"> | ||
| 17 | <Configuration>ReleaseWithoutAsm</Configuration> | ||
| 18 | <Platform>Itanium</Platform> | ||
| 19 | </ProjectConfiguration> | ||
| 20 | <ProjectConfiguration Include="ReleaseWithoutAsm|Win32"> | ||
| 21 | <Configuration>ReleaseWithoutAsm</Configuration> | ||
| 22 | <Platform>Win32</Platform> | ||
| 23 | </ProjectConfiguration> | ||
| 24 | <ProjectConfiguration Include="ReleaseWithoutAsm|x64"> | ||
| 25 | <Configuration>ReleaseWithoutAsm</Configuration> | ||
| 26 | <Platform>x64</Platform> | ||
| 27 | </ProjectConfiguration> | ||
| 28 | <ProjectConfiguration Include="Release|Itanium"> | ||
| 29 | <Configuration>Release</Configuration> | ||
| 30 | <Platform>Itanium</Platform> | ||
| 31 | </ProjectConfiguration> | ||
| 32 | <ProjectConfiguration Include="Release|Win32"> | ||
| 33 | <Configuration>Release</Configuration> | ||
| 34 | <Platform>Win32</Platform> | ||
| 35 | </ProjectConfiguration> | ||
| 36 | <ProjectConfiguration Include="Release|x64"> | ||
| 37 | <Configuration>Release</Configuration> | ||
| 38 | <Platform>x64</Platform> | ||
| 39 | </ProjectConfiguration> | ||
| 40 | </ItemGroup> | ||
| 41 | <PropertyGroup Label="Globals"> | ||
| 42 | <ProjectGuid>{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}</ProjectGuid> | ||
| 43 | <RootNamespace>testzlib</RootNamespace> | ||
| 44 | <Keyword>Win32Proj</Keyword> | ||
| 45 | </PropertyGroup> | ||
| 46 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||
| 47 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | ||
| 48 | <ConfigurationType>Application</ConfigurationType> | ||
| 49 | <CharacterSet>MultiByte</CharacterSet> | ||
| 50 | <WholeProgramOptimization>true</WholeProgramOptimization> | ||
| 51 | </PropertyGroup> | ||
| 52 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration"> | ||
| 53 | <ConfigurationType>Application</ConfigurationType> | ||
| 54 | <CharacterSet>MultiByte</CharacterSet> | ||
| 55 | <WholeProgramOptimization>true</WholeProgramOptimization> | ||
| 56 | </PropertyGroup> | ||
| 57 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||
| 58 | <ConfigurationType>Application</ConfigurationType> | ||
| 59 | <CharacterSet>MultiByte</CharacterSet> | ||
| 60 | </PropertyGroup> | ||
| 61 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration"> | ||
| 62 | <ConfigurationType>Application</ConfigurationType> | ||
| 63 | <CharacterSet>MultiByte</CharacterSet> | ||
| 64 | <WholeProgramOptimization>true</WholeProgramOptimization> | ||
| 65 | </PropertyGroup> | ||
| 66 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration"> | ||
| 67 | <ConfigurationType>Application</ConfigurationType> | ||
| 68 | <CharacterSet>MultiByte</CharacterSet> | ||
| 69 | <WholeProgramOptimization>true</WholeProgramOptimization> | ||
| 70 | </PropertyGroup> | ||
| 71 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration"> | ||
| 72 | <ConfigurationType>Application</ConfigurationType> | ||
| 73 | <CharacterSet>MultiByte</CharacterSet> | ||
| 74 | </PropertyGroup> | ||
| 75 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | ||
| 76 | <ConfigurationType>Application</ConfigurationType> | ||
| 77 | <WholeProgramOptimization>true</WholeProgramOptimization> | ||
| 78 | </PropertyGroup> | ||
| 79 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration"> | ||
| 80 | <ConfigurationType>Application</ConfigurationType> | ||
| 81 | <WholeProgramOptimization>true</WholeProgramOptimization> | ||
| 82 | </PropertyGroup> | ||
| 83 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | ||
| 84 | <ConfigurationType>Application</ConfigurationType> | ||
| 85 | </PropertyGroup> | ||
| 86 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||
| 87 | <ImportGroup Label="ExtensionSettings"> | ||
| 88 | </ImportGroup> | ||
| 89 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> | ||
| 90 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 91 | </ImportGroup> | ||
| 92 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets"> | ||
| 93 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 94 | </ImportGroup> | ||
| 95 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> | ||
| 96 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 97 | </ImportGroup> | ||
| 98 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets"> | ||
| 99 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 100 | </ImportGroup> | ||
| 101 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets"> | ||
| 102 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 103 | </ImportGroup> | ||
| 104 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets"> | ||
| 105 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 106 | </ImportGroup> | ||
| 107 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> | ||
| 108 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 109 | </ImportGroup> | ||
| 110 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets"> | ||
| 111 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 112 | </ImportGroup> | ||
| 113 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> | ||
| 114 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 115 | </ImportGroup> | ||
| 116 | <PropertyGroup Label="UserMacros" /> | ||
| 117 | <PropertyGroup> | ||
| 118 | <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion> | ||
| 119 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\</OutDir> | ||
| 120 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir> | ||
| 121 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> | ||
| 122 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest> | ||
| 123 | <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\</OutDir> | ||
| 124 | <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir> | ||
| 125 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental> | ||
| 126 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest> | ||
| 127 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\</OutDir> | ||
| 128 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir> | ||
| 129 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> | ||
| 130 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest> | ||
| 131 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\</OutDir> | ||
| 132 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir> | ||
| 133 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest> | ||
| 134 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\</OutDir> | ||
| 135 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir> | ||
| 136 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental> | ||
| 137 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest> | ||
| 138 | <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\</OutDir> | ||
| 139 | <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir> | ||
| 140 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest> | ||
| 141 | <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\</OutDir> | ||
| 142 | <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir> | ||
| 143 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental> | ||
| 144 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest> | ||
| 145 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\</OutDir> | ||
| 146 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir> | ||
| 147 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest> | ||
| 148 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\</OutDir> | ||
| 149 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir> | ||
| 150 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental> | ||
| 151 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest> | ||
| 152 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 153 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" /> | ||
| 154 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" /> | ||
| 155 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 156 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> | ||
| 157 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> | ||
| 158 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 159 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> | ||
| 160 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> | ||
| 161 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 162 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" /> | ||
| 163 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" /> | ||
| 164 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 165 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" /> | ||
| 166 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" /> | ||
| 167 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 168 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" /> | ||
| 169 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" /> | ||
| 170 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 171 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" /> | ||
| 172 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" /> | ||
| 173 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 174 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> | ||
| 175 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> | ||
| 176 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 177 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> | ||
| 178 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> | ||
| 179 | </PropertyGroup> | ||
| 180 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
| 181 | <ClCompile> | ||
| 182 | <Optimization>Disabled</Optimization> | ||
| 183 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 184 | <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 185 | <MinimalRebuild>true</MinimalRebuild> | ||
| 186 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | ||
| 187 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
| 188 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 189 | <PrecompiledHeader> | ||
| 190 | </PrecompiledHeader> | ||
| 191 | <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput> | ||
| 192 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 193 | <WarningLevel>Level3</WarningLevel> | ||
| 194 | <DebugInformationFormat>EditAndContinue</DebugInformationFormat> | ||
| 195 | </ClCompile> | ||
| 196 | <Link> | ||
| 197 | <AdditionalDependencies>..\..\masmx86\gvmat32.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 198 | <OutputFile>$(OutDir)testzlib.exe</OutputFile> | ||
| 199 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 200 | <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile> | ||
| 201 | <SubSystem>Console</SubSystem> | ||
| 202 | <RandomizedBaseAddress>false</RandomizedBaseAddress> | ||
| 203 | <DataExecutionPrevention> | ||
| 204 | </DataExecutionPrevention> | ||
| 205 | <TargetMachine>MachineX86</TargetMachine> | ||
| 206 | </Link> | ||
| 207 | </ItemDefinitionGroup> | ||
| 208 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"> | ||
| 209 | <ClCompile> | ||
| 210 | <Optimization>MaxSpeed</Optimization> | ||
| 211 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | ||
| 212 | <OmitFramePointers>true</OmitFramePointers> | ||
| 213 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 214 | <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 215 | <StringPooling>true</StringPooling> | ||
| 216 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | ||
| 217 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| 218 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 219 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 220 | <PrecompiledHeader> | ||
| 221 | </PrecompiledHeader> | ||
| 222 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 223 | <WarningLevel>Level3</WarningLevel> | ||
| 224 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | ||
| 225 | </ClCompile> | ||
| 226 | <Link> | ||
| 227 | <OutputFile>$(OutDir)testzlib.exe</OutputFile> | ||
| 228 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 229 | <SubSystem>Console</SubSystem> | ||
| 230 | <OptimizeReferences>true</OptimizeReferences> | ||
| 231 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 232 | <RandomizedBaseAddress>false</RandomizedBaseAddress> | ||
| 233 | <DataExecutionPrevention> | ||
| 234 | </DataExecutionPrevention> | ||
| 235 | <TargetMachine>MachineX86</TargetMachine> | ||
| 236 | </Link> | ||
| 237 | </ItemDefinitionGroup> | ||
| 238 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
| 239 | <ClCompile> | ||
| 240 | <Optimization>MaxSpeed</Optimization> | ||
| 241 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | ||
| 242 | <OmitFramePointers>true</OmitFramePointers> | ||
| 243 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 244 | <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 245 | <StringPooling>true</StringPooling> | ||
| 246 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | ||
| 247 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| 248 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 249 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 250 | <PrecompiledHeader> | ||
| 251 | </PrecompiledHeader> | ||
| 252 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 253 | <WarningLevel>Level3</WarningLevel> | ||
| 254 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | ||
| 255 | </ClCompile> | ||
| 256 | <Link> | ||
| 257 | <AdditionalDependencies>..\..\masmx86\gvmat32.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 258 | <OutputFile>$(OutDir)testzlib.exe</OutputFile> | ||
| 259 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 260 | <SubSystem>Console</SubSystem> | ||
| 261 | <OptimizeReferences>true</OptimizeReferences> | ||
| 262 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 263 | <RandomizedBaseAddress>false</RandomizedBaseAddress> | ||
| 264 | <DataExecutionPrevention> | ||
| 265 | </DataExecutionPrevention> | ||
| 266 | <TargetMachine>MachineX86</TargetMachine> | ||
| 267 | </Link> | ||
| 268 | </ItemDefinitionGroup> | ||
| 269 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | ||
| 270 | <ClCompile> | ||
| 271 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 272 | <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 273 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | ||
| 274 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
| 275 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 276 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 277 | </ClCompile> | ||
| 278 | <Link> | ||
| 279 | <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 280 | </Link> | ||
| 281 | </ItemDefinitionGroup> | ||
| 282 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> | ||
| 283 | <Midl> | ||
| 284 | <TargetEnvironment>Itanium</TargetEnvironment> | ||
| 285 | </Midl> | ||
| 286 | <ClCompile> | ||
| 287 | <Optimization>Disabled</Optimization> | ||
| 288 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 289 | <PreprocessorDefinitions>ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 290 | <MinimalRebuild>true</MinimalRebuild> | ||
| 291 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | ||
| 292 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
| 293 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 294 | <PrecompiledHeader> | ||
| 295 | </PrecompiledHeader> | ||
| 296 | <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput> | ||
| 297 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 298 | <WarningLevel>Level3</WarningLevel> | ||
| 299 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | ||
| 300 | </ClCompile> | ||
| 301 | <Link> | ||
| 302 | <OutputFile>$(OutDir)testzlib.exe</OutputFile> | ||
| 303 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 304 | <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile> | ||
| 305 | <SubSystem>Console</SubSystem> | ||
| 306 | <TargetMachine>MachineIA64</TargetMachine> | ||
| 307 | </Link> | ||
| 308 | </ItemDefinitionGroup> | ||
| 309 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'"> | ||
| 310 | <ClCompile> | ||
| 311 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 312 | <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 313 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | ||
| 314 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | ||
| 315 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 316 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 317 | </ClCompile> | ||
| 318 | <Link> | ||
| 319 | <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies> | ||
| 320 | </Link> | ||
| 321 | </ItemDefinitionGroup> | ||
| 322 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'"> | ||
| 323 | <Midl> | ||
| 324 | <TargetEnvironment>Itanium</TargetEnvironment> | ||
| 325 | </Midl> | ||
| 326 | <ClCompile> | ||
| 327 | <Optimization>MaxSpeed</Optimization> | ||
| 328 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | ||
| 329 | <OmitFramePointers>true</OmitFramePointers> | ||
| 330 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 331 | <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 332 | <StringPooling>true</StringPooling> | ||
| 333 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | ||
| 334 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | ||
| 335 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 336 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 337 | <PrecompiledHeader> | ||
| 338 | </PrecompiledHeader> | ||
| 339 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 340 | <WarningLevel>Level3</WarningLevel> | ||
| 341 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | ||
| 342 | </ClCompile> | ||
| 343 | <Link> | ||
| 344 | <OutputFile>$(OutDir)testzlib.exe</OutputFile> | ||
| 345 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 346 | <SubSystem>Console</SubSystem> | ||
| 347 | <OptimizeReferences>true</OptimizeReferences> | ||
| 348 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 349 | <TargetMachine>MachineIA64</TargetMachine> | ||
| 350 | </Link> | ||
| 351 | </ItemDefinitionGroup> | ||
| 352 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | ||
| 353 | <ClCompile> | ||
| 354 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 355 | <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 356 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | ||
| 357 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | ||
| 358 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 359 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 360 | </ClCompile> | ||
| 361 | <Link> | ||
| 362 | <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 363 | </Link> | ||
| 364 | </ItemDefinitionGroup> | ||
| 365 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> | ||
| 366 | <Midl> | ||
| 367 | <TargetEnvironment>Itanium</TargetEnvironment> | ||
| 368 | </Midl> | ||
| 369 | <ClCompile> | ||
| 370 | <Optimization>MaxSpeed</Optimization> | ||
| 371 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | ||
| 372 | <OmitFramePointers>true</OmitFramePointers> | ||
| 373 | <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 374 | <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 375 | <StringPooling>true</StringPooling> | ||
| 376 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | ||
| 377 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | ||
| 378 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 379 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 380 | <PrecompiledHeader> | ||
| 381 | </PrecompiledHeader> | ||
| 382 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 383 | <WarningLevel>Level3</WarningLevel> | ||
| 384 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | ||
| 385 | </ClCompile> | ||
| 386 | <Link> | ||
| 387 | <OutputFile>$(OutDir)testzlib.exe</OutputFile> | ||
| 388 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 389 | <SubSystem>Console</SubSystem> | ||
| 390 | <OptimizeReferences>true</OptimizeReferences> | ||
| 391 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 392 | <TargetMachine>MachineIA64</TargetMachine> | ||
| 393 | </Link> | ||
| 394 | </ItemDefinitionGroup> | ||
| 395 | <ItemGroup> | ||
| 396 | <ClCompile Include="..\..\..\adler32.c" /> | ||
| 397 | <ClCompile Include="..\..\..\compress.c" /> | ||
| 398 | <ClCompile Include="..\..\..\crc32.c" /> | ||
| 399 | <ClCompile Include="..\..\..\deflate.c" /> | ||
| 400 | <ClCompile Include="..\..\masmx86\gvmat32c.c"> | ||
| 401 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild> | ||
| 402 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> | ||
| 403 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild> | ||
| 404 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">true</ExcludedFromBuild> | ||
| 405 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild> | ||
| 406 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> | ||
| 407 | </ClCompile> | ||
| 408 | <ClCompile Include="..\..\..\infback.c" /> | ||
| 409 | <ClCompile Include="..\..\masmx64\inffas8664.c"> | ||
| 410 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild> | ||
| 411 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> | ||
| 412 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild> | ||
| 413 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild> | ||
| 414 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild> | ||
| 415 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> | ||
| 416 | </ClCompile> | ||
| 417 | <ClCompile Include="..\..\..\inffast.c" /> | ||
| 418 | <ClCompile Include="..\..\..\inflate.c" /> | ||
| 419 | <ClCompile Include="..\..\..\inftrees.c" /> | ||
| 420 | <ClCompile Include="..\..\testzlib\testzlib.c" /> | ||
| 421 | <ClCompile Include="..\..\..\trees.c" /> | ||
| 422 | <ClCompile Include="..\..\..\uncompr.c" /> | ||
| 423 | <ClCompile Include="..\..\..\zutil.c" /> | ||
| 424 | </ItemGroup> | ||
| 425 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||
| 426 | <ImportGroup Label="ExtensionTargets"> | ||
| 427 | </ImportGroup> | ||
| 428 | </Project> \ No newline at end of file | ||
diff --git a/contrib/vstudio/vc10/testzlib.vcxproj.filters b/contrib/vstudio/vc10/testzlib.vcxproj.filters new file mode 100644 index 0000000..a0d9b23 --- /dev/null +++ b/contrib/vstudio/vc10/testzlib.vcxproj.filters | |||
| @@ -0,0 +1,61 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | <ItemGroup> | ||
| 4 | <Filter Include="Source Files"> | ||
| 5 | <UniqueIdentifier>{c1f6a2e3-5da5-4955-8653-310d3efe05a9}</UniqueIdentifier> | ||
| 6 | <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions> | ||
| 7 | </Filter> | ||
| 8 | <Filter Include="Header Files"> | ||
| 9 | <UniqueIdentifier>{c2aaffdc-2c95-4d6f-8466-4bec5890af2c}</UniqueIdentifier> | ||
| 10 | <Extensions>h;hpp;hxx;hm;inl;inc</Extensions> | ||
| 11 | </Filter> | ||
| 12 | <Filter Include="Resource Files"> | ||
| 13 | <UniqueIdentifier>{c274fe07-05f2-461c-964b-f6341e4e7eb5}</UniqueIdentifier> | ||
| 14 | <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions> | ||
| 15 | </Filter> | ||
| 16 | </ItemGroup> | ||
| 17 | <ItemGroup> | ||
| 18 | <ClCompile Include="..\..\..\adler32.c"> | ||
| 19 | <Filter>Source Files</Filter> | ||
| 20 | </ClCompile> | ||
| 21 | <ClCompile Include="..\..\..\compress.c"> | ||
| 22 | <Filter>Source Files</Filter> | ||
| 23 | </ClCompile> | ||
| 24 | <ClCompile Include="..\..\..\crc32.c"> | ||
| 25 | <Filter>Source Files</Filter> | ||
| 26 | </ClCompile> | ||
| 27 | <ClCompile Include="..\..\..\deflate.c"> | ||
| 28 | <Filter>Source Files</Filter> | ||
| 29 | </ClCompile> | ||
| 30 | <ClCompile Include="..\..\masmx86\gvmat32c.c"> | ||
| 31 | <Filter>Source Files</Filter> | ||
| 32 | </ClCompile> | ||
| 33 | <ClCompile Include="..\..\..\infback.c"> | ||
| 34 | <Filter>Source Files</Filter> | ||
| 35 | </ClCompile> | ||
| 36 | <ClCompile Include="..\..\masmx64\inffas8664.c"> | ||
| 37 | <Filter>Source Files</Filter> | ||
| 38 | </ClCompile> | ||
| 39 | <ClCompile Include="..\..\..\inffast.c"> | ||
| 40 | <Filter>Source Files</Filter> | ||
| 41 | </ClCompile> | ||
| 42 | <ClCompile Include="..\..\..\inflate.c"> | ||
| 43 | <Filter>Source Files</Filter> | ||
| 44 | </ClCompile> | ||
| 45 | <ClCompile Include="..\..\..\inftrees.c"> | ||
| 46 | <Filter>Source Files</Filter> | ||
| 47 | </ClCompile> | ||
| 48 | <ClCompile Include="..\..\testzlib\testzlib.c"> | ||
| 49 | <Filter>Source Files</Filter> | ||
| 50 | </ClCompile> | ||
| 51 | <ClCompile Include="..\..\..\trees.c"> | ||
| 52 | <Filter>Source Files</Filter> | ||
| 53 | </ClCompile> | ||
| 54 | <ClCompile Include="..\..\..\uncompr.c"> | ||
| 55 | <Filter>Source Files</Filter> | ||
| 56 | </ClCompile> | ||
| 57 | <ClCompile Include="..\..\..\zutil.c"> | ||
| 58 | <Filter>Source Files</Filter> | ||
| 59 | </ClCompile> | ||
| 60 | </ItemGroup> | ||
| 61 | </Project> \ No newline at end of file | ||
diff --git a/contrib/vstudio/vc10/testzlib.vcxproj.user b/contrib/vstudio/vc10/testzlib.vcxproj.user new file mode 100644 index 0000000..695b5c7 --- /dev/null +++ b/contrib/vstudio/vc10/testzlib.vcxproj.user | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | </Project> \ No newline at end of file | ||
diff --git a/contrib/vstudio/vc10/testzlibdll.vcxproj b/contrib/vstudio/vc10/testzlibdll.vcxproj new file mode 100644 index 0000000..2d62815 --- /dev/null +++ b/contrib/vstudio/vc10/testzlibdll.vcxproj | |||
| @@ -0,0 +1,310 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | <ItemGroup Label="ProjectConfigurations"> | ||
| 4 | <ProjectConfiguration Include="Debug|Itanium"> | ||
| 5 | <Configuration>Debug</Configuration> | ||
| 6 | <Platform>Itanium</Platform> | ||
| 7 | </ProjectConfiguration> | ||
| 8 | <ProjectConfiguration Include="Debug|Win32"> | ||
| 9 | <Configuration>Debug</Configuration> | ||
| 10 | <Platform>Win32</Platform> | ||
| 11 | </ProjectConfiguration> | ||
| 12 | <ProjectConfiguration Include="Debug|x64"> | ||
| 13 | <Configuration>Debug</Configuration> | ||
| 14 | <Platform>x64</Platform> | ||
| 15 | </ProjectConfiguration> | ||
| 16 | <ProjectConfiguration Include="Release|Itanium"> | ||
| 17 | <Configuration>Release</Configuration> | ||
| 18 | <Platform>Itanium</Platform> | ||
| 19 | </ProjectConfiguration> | ||
| 20 | <ProjectConfiguration Include="Release|Win32"> | ||
| 21 | <Configuration>Release</Configuration> | ||
| 22 | <Platform>Win32</Platform> | ||
| 23 | </ProjectConfiguration> | ||
| 24 | <ProjectConfiguration Include="Release|x64"> | ||
| 25 | <Configuration>Release</Configuration> | ||
| 26 | <Platform>x64</Platform> | ||
| 27 | </ProjectConfiguration> | ||
| 28 | </ItemGroup> | ||
| 29 | <PropertyGroup Label="Globals"> | ||
| 30 | <ProjectGuid>{C52F9E7B-498A-42BE-8DB4-85A15694366A}</ProjectGuid> | ||
| 31 | <Keyword>Win32Proj</Keyword> | ||
| 32 | </PropertyGroup> | ||
| 33 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||
| 34 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | ||
| 35 | <ConfigurationType>Application</ConfigurationType> | ||
| 36 | <CharacterSet>MultiByte</CharacterSet> | ||
| 37 | </PropertyGroup> | ||
| 38 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||
| 39 | <ConfigurationType>Application</ConfigurationType> | ||
| 40 | <CharacterSet>MultiByte</CharacterSet> | ||
| 41 | </PropertyGroup> | ||
| 42 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration"> | ||
| 43 | <ConfigurationType>Application</ConfigurationType> | ||
| 44 | <CharacterSet>MultiByte</CharacterSet> | ||
| 45 | </PropertyGroup> | ||
| 46 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration"> | ||
| 47 | <ConfigurationType>Application</ConfigurationType> | ||
| 48 | <CharacterSet>MultiByte</CharacterSet> | ||
| 49 | </PropertyGroup> | ||
| 50 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | ||
| 51 | <ConfigurationType>Application</ConfigurationType> | ||
| 52 | <CharacterSet>MultiByte</CharacterSet> | ||
| 53 | </PropertyGroup> | ||
| 54 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | ||
| 55 | <ConfigurationType>Application</ConfigurationType> | ||
| 56 | <CharacterSet>MultiByte</CharacterSet> | ||
| 57 | </PropertyGroup> | ||
| 58 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||
| 59 | <ImportGroup Label="ExtensionSettings"> | ||
| 60 | </ImportGroup> | ||
| 61 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> | ||
| 62 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 63 | </ImportGroup> | ||
| 64 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> | ||
| 65 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 66 | </ImportGroup> | ||
| 67 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets"> | ||
| 68 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 69 | </ImportGroup> | ||
| 70 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets"> | ||
| 71 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 72 | </ImportGroup> | ||
| 73 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> | ||
| 74 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 75 | </ImportGroup> | ||
| 76 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> | ||
| 77 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 78 | </ImportGroup> | ||
| 79 | <PropertyGroup Label="UserMacros" /> | ||
| 80 | <PropertyGroup> | ||
| 81 | <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion> | ||
| 82 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\</OutDir> | ||
| 83 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir> | ||
| 84 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> | ||
| 85 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest> | ||
| 86 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\</OutDir> | ||
| 87 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir> | ||
| 88 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> | ||
| 89 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest> | ||
| 90 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\</OutDir> | ||
| 91 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir> | ||
| 92 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental> | ||
| 93 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest> | ||
| 94 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir> | ||
| 95 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir> | ||
| 96 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental> | ||
| 97 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest> | ||
| 98 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\</OutDir> | ||
| 99 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir> | ||
| 100 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental> | ||
| 101 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest> | ||
| 102 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir> | ||
| 103 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir> | ||
| 104 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental> | ||
| 105 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest> | ||
| 106 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 107 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" /> | ||
| 108 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" /> | ||
| 109 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 110 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> | ||
| 111 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> | ||
| 112 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 113 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> | ||
| 114 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> | ||
| 115 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 116 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" /> | ||
| 117 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" /> | ||
| 118 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 119 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> | ||
| 120 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> | ||
| 121 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 122 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> | ||
| 123 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> | ||
| 124 | </PropertyGroup> | ||
| 125 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
| 126 | <ClCompile> | ||
| 127 | <Optimization>Disabled</Optimization> | ||
| 128 | <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 129 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 130 | <MinimalRebuild>true</MinimalRebuild> | ||
| 131 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | ||
| 132 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
| 133 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 134 | <PrecompiledHeader> | ||
| 135 | </PrecompiledHeader> | ||
| 136 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 137 | <WarningLevel>Level3</WarningLevel> | ||
| 138 | <DebugInformationFormat>EditAndContinue</DebugInformationFormat> | ||
| 139 | </ClCompile> | ||
| 140 | <Link> | ||
| 141 | <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 142 | <OutputFile>$(OutDir)testzlib.exe</OutputFile> | ||
| 143 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 144 | <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile> | ||
| 145 | <SubSystem>Console</SubSystem> | ||
| 146 | <RandomizedBaseAddress>false</RandomizedBaseAddress> | ||
| 147 | <DataExecutionPrevention> | ||
| 148 | </DataExecutionPrevention> | ||
| 149 | <TargetMachine>MachineX86</TargetMachine> | ||
| 150 | </Link> | ||
| 151 | </ItemDefinitionGroup> | ||
| 152 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
| 153 | <ClCompile> | ||
| 154 | <Optimization>MaxSpeed</Optimization> | ||
| 155 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | ||
| 156 | <OmitFramePointers>true</OmitFramePointers> | ||
| 157 | <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 158 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 159 | <StringPooling>true</StringPooling> | ||
| 160 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | ||
| 161 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| 162 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 163 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 164 | <PrecompiledHeader> | ||
| 165 | </PrecompiledHeader> | ||
| 166 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 167 | <WarningLevel>Level3</WarningLevel> | ||
| 168 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | ||
| 169 | </ClCompile> | ||
| 170 | <Link> | ||
| 171 | <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 172 | <OutputFile>$(OutDir)testzlib.exe</OutputFile> | ||
| 173 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 174 | <SubSystem>Console</SubSystem> | ||
| 175 | <OptimizeReferences>true</OptimizeReferences> | ||
| 176 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 177 | <RandomizedBaseAddress>false</RandomizedBaseAddress> | ||
| 178 | <DataExecutionPrevention> | ||
| 179 | </DataExecutionPrevention> | ||
| 180 | <TargetMachine>MachineX86</TargetMachine> | ||
| 181 | </Link> | ||
| 182 | </ItemDefinitionGroup> | ||
| 183 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | ||
| 184 | <Midl> | ||
| 185 | <TargetEnvironment>X64</TargetEnvironment> | ||
| 186 | </Midl> | ||
| 187 | <ClCompile> | ||
| 188 | <Optimization>Disabled</Optimization> | ||
| 189 | <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 190 | <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 191 | <MinimalRebuild>true</MinimalRebuild> | ||
| 192 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | ||
| 193 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
| 194 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 195 | <PrecompiledHeader> | ||
| 196 | </PrecompiledHeader> | ||
| 197 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 198 | <WarningLevel>Level3</WarningLevel> | ||
| 199 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | ||
| 200 | </ClCompile> | ||
| 201 | <Link> | ||
| 202 | <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 203 | <OutputFile>$(OutDir)testzlib.exe</OutputFile> | ||
| 204 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 205 | <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile> | ||
| 206 | <SubSystem>Console</SubSystem> | ||
| 207 | <TargetMachine>MachineX64</TargetMachine> | ||
| 208 | </Link> | ||
| 209 | </ItemDefinitionGroup> | ||
| 210 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> | ||
| 211 | <Midl> | ||
| 212 | <TargetEnvironment>Itanium</TargetEnvironment> | ||
| 213 | </Midl> | ||
| 214 | <ClCompile> | ||
| 215 | <Optimization>Disabled</Optimization> | ||
| 216 | <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 217 | <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 218 | <MinimalRebuild>true</MinimalRebuild> | ||
| 219 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | ||
| 220 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
| 221 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 222 | <PrecompiledHeader> | ||
| 223 | </PrecompiledHeader> | ||
| 224 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 225 | <WarningLevel>Level3</WarningLevel> | ||
| 226 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | ||
| 227 | </ClCompile> | ||
| 228 | <Link> | ||
| 229 | <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 230 | <OutputFile>$(OutDir)testzlib.exe</OutputFile> | ||
| 231 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 232 | <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile> | ||
| 233 | <SubSystem>Console</SubSystem> | ||
| 234 | <TargetMachine>MachineIA64</TargetMachine> | ||
| 235 | </Link> | ||
| 236 | </ItemDefinitionGroup> | ||
| 237 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | ||
| 238 | <Midl> | ||
| 239 | <TargetEnvironment>X64</TargetEnvironment> | ||
| 240 | </Midl> | ||
| 241 | <ClCompile> | ||
| 242 | <Optimization>MaxSpeed</Optimization> | ||
| 243 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | ||
| 244 | <OmitFramePointers>true</OmitFramePointers> | ||
| 245 | <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 246 | <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 247 | <StringPooling>true</StringPooling> | ||
| 248 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | ||
| 249 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | ||
| 250 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 251 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 252 | <PrecompiledHeader> | ||
| 253 | </PrecompiledHeader> | ||
| 254 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 255 | <WarningLevel>Level3</WarningLevel> | ||
| 256 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | ||
| 257 | </ClCompile> | ||
| 258 | <Link> | ||
| 259 | <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 260 | <OutputFile>$(OutDir)testzlib.exe</OutputFile> | ||
| 261 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 262 | <SubSystem>Console</SubSystem> | ||
| 263 | <OptimizeReferences>true</OptimizeReferences> | ||
| 264 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 265 | <TargetMachine>MachineX64</TargetMachine> | ||
| 266 | </Link> | ||
| 267 | </ItemDefinitionGroup> | ||
| 268 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> | ||
| 269 | <Midl> | ||
| 270 | <TargetEnvironment>Itanium</TargetEnvironment> | ||
| 271 | </Midl> | ||
| 272 | <ClCompile> | ||
| 273 | <Optimization>MaxSpeed</Optimization> | ||
| 274 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | ||
| 275 | <OmitFramePointers>true</OmitFramePointers> | ||
| 276 | <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 277 | <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 278 | <StringPooling>true</StringPooling> | ||
| 279 | <BasicRuntimeChecks>Default</BasicRuntimeChecks> | ||
| 280 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | ||
| 281 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 282 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 283 | <PrecompiledHeader> | ||
| 284 | </PrecompiledHeader> | ||
| 285 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 286 | <WarningLevel>Level3</WarningLevel> | ||
| 287 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | ||
| 288 | </ClCompile> | ||
| 289 | <Link> | ||
| 290 | <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 291 | <OutputFile>$(OutDir)testzlib.exe</OutputFile> | ||
| 292 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 293 | <SubSystem>Console</SubSystem> | ||
| 294 | <OptimizeReferences>true</OptimizeReferences> | ||
| 295 | <EnableCOMDATFolding>true</EnableCOMDATFolding> | ||
| 296 | <TargetMachine>MachineIA64</TargetMachine> | ||
| 297 | </Link> | ||
| 298 | </ItemDefinitionGroup> | ||
| 299 | <ItemGroup> | ||
| 300 | <ClCompile Include="..\..\testzlib\testzlib.c" /> | ||
| 301 | </ItemGroup> | ||
| 302 | <ItemGroup> | ||
| 303 | <ProjectReference Include="zlibvc.vcxproj"> | ||
| 304 | <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project> | ||
| 305 | </ProjectReference> | ||
| 306 | </ItemGroup> | ||
| 307 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||
| 308 | <ImportGroup Label="ExtensionTargets"> | ||
| 309 | </ImportGroup> | ||
| 310 | </Project> \ No newline at end of file | ||
diff --git a/contrib/vstudio/vc10/testzlibdll.vcxproj.filters b/contrib/vstudio/vc10/testzlibdll.vcxproj.filters new file mode 100644 index 0000000..53a8693 --- /dev/null +++ b/contrib/vstudio/vc10/testzlibdll.vcxproj.filters | |||
| @@ -0,0 +1,22 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | <ItemGroup> | ||
| 4 | <Filter Include="Source Files"> | ||
| 5 | <UniqueIdentifier>{fa61a89f-93fc-4c89-b29e-36224b7592f4}</UniqueIdentifier> | ||
| 6 | <Extensions>cpp;c;cxx;def;odl;idl;hpj;bat;asm</Extensions> | ||
| 7 | </Filter> | ||
| 8 | <Filter Include="Header Files"> | ||
| 9 | <UniqueIdentifier>{d4b85da0-2ba2-4934-b57f-e2584e3848ee}</UniqueIdentifier> | ||
| 10 | <Extensions>h;hpp;hxx;hm;inl;inc</Extensions> | ||
| 11 | </Filter> | ||
| 12 | <Filter Include="Resource Files"> | ||
| 13 | <UniqueIdentifier>{e573e075-00bd-4a7d-bd67-a8cc9bfc5aca}</UniqueIdentifier> | ||
| 14 | <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe</Extensions> | ||
| 15 | </Filter> | ||
| 16 | </ItemGroup> | ||
| 17 | <ItemGroup> | ||
| 18 | <ClCompile Include="..\..\testzlib\testzlib.c"> | ||
| 19 | <Filter>Source Files</Filter> | ||
| 20 | </ClCompile> | ||
| 21 | </ItemGroup> | ||
| 22 | </Project> \ No newline at end of file | ||
diff --git a/contrib/vstudio/vc10/testzlibdll.vcxproj.user b/contrib/vstudio/vc10/testzlibdll.vcxproj.user new file mode 100644 index 0000000..695b5c7 --- /dev/null +++ b/contrib/vstudio/vc10/testzlibdll.vcxproj.user | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | </Project> \ No newline at end of file | ||
diff --git a/contrib/vstudio/vc8/zlib.rc b/contrib/vstudio/vc10/zlib.rc index 72cb8b4..72cb8b4 100644 --- a/contrib/vstudio/vc8/zlib.rc +++ b/contrib/vstudio/vc10/zlib.rc | |||
diff --git a/contrib/vstudio/vc10/zlibstat.vcxproj b/contrib/vstudio/vc10/zlibstat.vcxproj new file mode 100644 index 0000000..fbf6c1b --- /dev/null +++ b/contrib/vstudio/vc10/zlibstat.vcxproj | |||
| @@ -0,0 +1,466 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | <ItemGroup Label="ProjectConfigurations"> | ||
| 4 | <ProjectConfiguration Include="Debug|Itanium"> | ||
| 5 | <Configuration>Debug</Configuration> | ||
| 6 | <Platform>Itanium</Platform> | ||
| 7 | </ProjectConfiguration> | ||
| 8 | <ProjectConfiguration Include="Debug|Win32"> | ||
| 9 | <Configuration>Debug</Configuration> | ||
| 10 | <Platform>Win32</Platform> | ||
| 11 | </ProjectConfiguration> | ||
| 12 | <ProjectConfiguration Include="Debug|x64"> | ||
| 13 | <Configuration>Debug</Configuration> | ||
| 14 | <Platform>x64</Platform> | ||
| 15 | </ProjectConfiguration> | ||
| 16 | <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium"> | ||
| 17 | <Configuration>ReleaseWithoutAsm</Configuration> | ||
| 18 | <Platform>Itanium</Platform> | ||
| 19 | </ProjectConfiguration> | ||
| 20 | <ProjectConfiguration Include="ReleaseWithoutAsm|Win32"> | ||
| 21 | <Configuration>ReleaseWithoutAsm</Configuration> | ||
| 22 | <Platform>Win32</Platform> | ||
| 23 | </ProjectConfiguration> | ||
| 24 | <ProjectConfiguration Include="ReleaseWithoutAsm|x64"> | ||
| 25 | <Configuration>ReleaseWithoutAsm</Configuration> | ||
| 26 | <Platform>x64</Platform> | ||
| 27 | </ProjectConfiguration> | ||
| 28 | <ProjectConfiguration Include="Release|Itanium"> | ||
| 29 | <Configuration>Release</Configuration> | ||
| 30 | <Platform>Itanium</Platform> | ||
| 31 | </ProjectConfiguration> | ||
| 32 | <ProjectConfiguration Include="Release|Win32"> | ||
| 33 | <Configuration>Release</Configuration> | ||
| 34 | <Platform>Win32</Platform> | ||
| 35 | </ProjectConfiguration> | ||
| 36 | <ProjectConfiguration Include="Release|x64"> | ||
| 37 | <Configuration>Release</Configuration> | ||
| 38 | <Platform>x64</Platform> | ||
| 39 | </ProjectConfiguration> | ||
| 40 | </ItemGroup> | ||
| 41 | <PropertyGroup Label="Globals"> | ||
| 42 | <ProjectGuid>{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}</ProjectGuid> | ||
| 43 | </PropertyGroup> | ||
| 44 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||
| 45 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration"> | ||
| 46 | <ConfigurationType>StaticLibrary</ConfigurationType> | ||
| 47 | <UseOfMfc>false</UseOfMfc> | ||
| 48 | </PropertyGroup> | ||
| 49 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | ||
| 50 | <ConfigurationType>StaticLibrary</ConfigurationType> | ||
| 51 | <UseOfMfc>false</UseOfMfc> | ||
| 52 | </PropertyGroup> | ||
| 53 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||
| 54 | <ConfigurationType>StaticLibrary</ConfigurationType> | ||
| 55 | <UseOfMfc>false</UseOfMfc> | ||
| 56 | </PropertyGroup> | ||
| 57 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration"> | ||
| 58 | <ConfigurationType>StaticLibrary</ConfigurationType> | ||
| 59 | <UseOfMfc>false</UseOfMfc> | ||
| 60 | </PropertyGroup> | ||
| 61 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration"> | ||
| 62 | <ConfigurationType>StaticLibrary</ConfigurationType> | ||
| 63 | <UseOfMfc>false</UseOfMfc> | ||
| 64 | </PropertyGroup> | ||
| 65 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration"> | ||
| 66 | <ConfigurationType>StaticLibrary</ConfigurationType> | ||
| 67 | <UseOfMfc>false</UseOfMfc> | ||
| 68 | </PropertyGroup> | ||
| 69 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration"> | ||
| 70 | <ConfigurationType>StaticLibrary</ConfigurationType> | ||
| 71 | <UseOfMfc>false</UseOfMfc> | ||
| 72 | </PropertyGroup> | ||
| 73 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | ||
| 74 | <ConfigurationType>StaticLibrary</ConfigurationType> | ||
| 75 | <UseOfMfc>false</UseOfMfc> | ||
| 76 | </PropertyGroup> | ||
| 77 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | ||
| 78 | <ConfigurationType>StaticLibrary</ConfigurationType> | ||
| 79 | <UseOfMfc>false</UseOfMfc> | ||
| 80 | </PropertyGroup> | ||
| 81 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||
| 82 | <ImportGroup Label="ExtensionSettings"> | ||
| 83 | </ImportGroup> | ||
| 84 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets"> | ||
| 85 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 86 | </ImportGroup> | ||
| 87 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> | ||
| 88 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 89 | </ImportGroup> | ||
| 90 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> | ||
| 91 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 92 | </ImportGroup> | ||
| 93 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets"> | ||
| 94 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 95 | </ImportGroup> | ||
| 96 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets"> | ||
| 97 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 98 | </ImportGroup> | ||
| 99 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets"> | ||
| 100 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 101 | </ImportGroup> | ||
| 102 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets"> | ||
| 103 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 104 | </ImportGroup> | ||
| 105 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> | ||
| 106 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 107 | </ImportGroup> | ||
| 108 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> | ||
| 109 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 110 | </ImportGroup> | ||
| 111 | <PropertyGroup Label="UserMacros" /> | ||
| 112 | <PropertyGroup> | ||
| 113 | <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion> | ||
| 114 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\</OutDir> | ||
| 115 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir> | ||
| 116 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\</OutDir> | ||
| 117 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir> | ||
| 118 | <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\</OutDir> | ||
| 119 | <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir> | ||
| 120 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\</OutDir> | ||
| 121 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir> | ||
| 122 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir> | ||
| 123 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir> | ||
| 124 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\</OutDir> | ||
| 125 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir> | ||
| 126 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir> | ||
| 127 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir> | ||
| 128 | <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\</OutDir> | ||
| 129 | <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir> | ||
| 130 | <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir> | ||
| 131 | <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir> | ||
| 132 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 133 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" /> | ||
| 134 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" /> | ||
| 135 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 136 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> | ||
| 137 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> | ||
| 138 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 139 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> | ||
| 140 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> | ||
| 141 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 142 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" /> | ||
| 143 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" /> | ||
| 144 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 145 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" /> | ||
| 146 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" /> | ||
| 147 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 148 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" /> | ||
| 149 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" /> | ||
| 150 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 151 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" /> | ||
| 152 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" /> | ||
| 153 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 154 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> | ||
| 155 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> | ||
| 156 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 157 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> | ||
| 158 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> | ||
| 159 | </PropertyGroup> | ||
| 160 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
| 161 | <ClCompile> | ||
| 162 | <Optimization>Disabled</Optimization> | ||
| 163 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 164 | <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 165 | <ExceptionHandling> | ||
| 166 | </ExceptionHandling> | ||
| 167 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
| 168 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 169 | <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile> | ||
| 170 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 171 | <ObjectFileName>$(IntDir)</ObjectFileName> | ||
| 172 | <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName> | ||
| 173 | <WarningLevel>Level3</WarningLevel> | ||
| 174 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 175 | <DebugInformationFormat>OldStyle</DebugInformationFormat> | ||
| 176 | </ClCompile> | ||
| 177 | <ResourceCompile> | ||
| 178 | <Culture>0x040c</Culture> | ||
| 179 | </ResourceCompile> | ||
| 180 | <Lib> | ||
| 181 | <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> | ||
| 182 | <OutputFile>$(OutDir)zlibstat.lib</OutputFile> | ||
| 183 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 184 | </Lib> | ||
| 185 | </ItemDefinitionGroup> | ||
| 186 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
| 187 | <ClCompile> | ||
| 188 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | ||
| 189 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 190 | <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 191 | <StringPooling>true</StringPooling> | ||
| 192 | <ExceptionHandling> | ||
| 193 | </ExceptionHandling> | ||
| 194 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| 195 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 196 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 197 | <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile> | ||
| 198 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 199 | <ObjectFileName>$(IntDir)</ObjectFileName> | ||
| 200 | <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName> | ||
| 201 | <WarningLevel>Level3</WarningLevel> | ||
| 202 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 203 | </ClCompile> | ||
| 204 | <ResourceCompile> | ||
| 205 | <Culture>0x040c</Culture> | ||
| 206 | </ResourceCompile> | ||
| 207 | <Lib> | ||
| 208 | <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> | ||
| 209 | <AdditionalDependencies>..\..\masmx86\gvmat32.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 210 | <OutputFile>$(OutDir)zlibstat.lib</OutputFile> | ||
| 211 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 212 | </Lib> | ||
| 213 | </ItemDefinitionGroup> | ||
| 214 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"> | ||
| 215 | <ClCompile> | ||
| 216 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | ||
| 217 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 218 | <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 219 | <StringPooling>true</StringPooling> | ||
| 220 | <ExceptionHandling> | ||
| 221 | </ExceptionHandling> | ||
| 222 | <RuntimeLibrary>MultiThreaded</RuntimeLibrary> | ||
| 223 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 224 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 225 | <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile> | ||
| 226 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 227 | <ObjectFileName>$(IntDir)</ObjectFileName> | ||
| 228 | <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName> | ||
| 229 | <WarningLevel>Level3</WarningLevel> | ||
| 230 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 231 | </ClCompile> | ||
| 232 | <ResourceCompile> | ||
| 233 | <Culture>0x040c</Culture> | ||
| 234 | </ResourceCompile> | ||
| 235 | <Lib> | ||
| 236 | <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> | ||
| 237 | <OutputFile>$(OutDir)zlibstat.lib</OutputFile> | ||
| 238 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 239 | </Lib> | ||
| 240 | </ItemDefinitionGroup> | ||
| 241 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | ||
| 242 | <Midl> | ||
| 243 | <TargetEnvironment>X64</TargetEnvironment> | ||
| 244 | </Midl> | ||
| 245 | <ClCompile> | ||
| 246 | <Optimization>Disabled</Optimization> | ||
| 247 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 248 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 249 | <ExceptionHandling> | ||
| 250 | </ExceptionHandling> | ||
| 251 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
| 252 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 253 | <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile> | ||
| 254 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 255 | <ObjectFileName>$(IntDir)</ObjectFileName> | ||
| 256 | <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName> | ||
| 257 | <WarningLevel>Level3</WarningLevel> | ||
| 258 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 259 | <DebugInformationFormat>OldStyle</DebugInformationFormat> | ||
| 260 | </ClCompile> | ||
| 261 | <ResourceCompile> | ||
| 262 | <Culture>0x040c</Culture> | ||
| 263 | </ResourceCompile> | ||
| 264 | <Lib> | ||
| 265 | <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> | ||
| 266 | <OutputFile>$(OutDir)zlibstat.lib</OutputFile> | ||
| 267 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 268 | </Lib> | ||
| 269 | </ItemDefinitionGroup> | ||
| 270 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> | ||
| 271 | <Midl> | ||
| 272 | <TargetEnvironment>Itanium</TargetEnvironment> | ||
| 273 | </Midl> | ||
| 274 | <ClCompile> | ||
| 275 | <Optimization>Disabled</Optimization> | ||
| 276 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 277 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 278 | <ExceptionHandling> | ||
| 279 | </ExceptionHandling> | ||
| 280 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
| 281 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 282 | <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile> | ||
| 283 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 284 | <ObjectFileName>$(IntDir)</ObjectFileName> | ||
| 285 | <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName> | ||
| 286 | <WarningLevel>Level3</WarningLevel> | ||
| 287 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 288 | <DebugInformationFormat>OldStyle</DebugInformationFormat> | ||
| 289 | </ClCompile> | ||
| 290 | <ResourceCompile> | ||
| 291 | <Culture>0x040c</Culture> | ||
| 292 | </ResourceCompile> | ||
| 293 | <Lib> | ||
| 294 | <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> | ||
| 295 | <OutputFile>$(OutDir)zlibstat.lib</OutputFile> | ||
| 296 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 297 | </Lib> | ||
| 298 | </ItemDefinitionGroup> | ||
| 299 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | ||
| 300 | <Midl> | ||
| 301 | <TargetEnvironment>X64</TargetEnvironment> | ||
| 302 | </Midl> | ||
| 303 | <ClCompile> | ||
| 304 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | ||
| 305 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 306 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 307 | <StringPooling>true</StringPooling> | ||
| 308 | <ExceptionHandling> | ||
| 309 | </ExceptionHandling> | ||
| 310 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | ||
| 311 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 312 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 313 | <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile> | ||
| 314 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 315 | <ObjectFileName>$(IntDir)</ObjectFileName> | ||
| 316 | <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName> | ||
| 317 | <WarningLevel>Level3</WarningLevel> | ||
| 318 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 319 | </ClCompile> | ||
| 320 | <ResourceCompile> | ||
| 321 | <Culture>0x040c</Culture> | ||
| 322 | </ResourceCompile> | ||
| 323 | <Lib> | ||
| 324 | <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> | ||
| 325 | <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 326 | <OutputFile>$(OutDir)zlibstat.lib</OutputFile> | ||
| 327 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 328 | </Lib> | ||
| 329 | </ItemDefinitionGroup> | ||
| 330 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> | ||
| 331 | <Midl> | ||
| 332 | <TargetEnvironment>Itanium</TargetEnvironment> | ||
| 333 | </Midl> | ||
| 334 | <ClCompile> | ||
| 335 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | ||
| 336 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 337 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 338 | <StringPooling>true</StringPooling> | ||
| 339 | <ExceptionHandling> | ||
| 340 | </ExceptionHandling> | ||
| 341 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | ||
| 342 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 343 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 344 | <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile> | ||
| 345 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 346 | <ObjectFileName>$(IntDir)</ObjectFileName> | ||
| 347 | <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName> | ||
| 348 | <WarningLevel>Level3</WarningLevel> | ||
| 349 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 350 | </ClCompile> | ||
| 351 | <ResourceCompile> | ||
| 352 | <Culture>0x040c</Culture> | ||
| 353 | </ResourceCompile> | ||
| 354 | <Lib> | ||
| 355 | <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> | ||
| 356 | <OutputFile>$(OutDir)zlibstat.lib</OutputFile> | ||
| 357 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 358 | </Lib> | ||
| 359 | </ItemDefinitionGroup> | ||
| 360 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'"> | ||
| 361 | <Midl> | ||
| 362 | <TargetEnvironment>X64</TargetEnvironment> | ||
| 363 | </Midl> | ||
| 364 | <ClCompile> | ||
| 365 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | ||
| 366 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 367 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 368 | <StringPooling>true</StringPooling> | ||
| 369 | <ExceptionHandling> | ||
| 370 | </ExceptionHandling> | ||
| 371 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | ||
| 372 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 373 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 374 | <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile> | ||
| 375 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 376 | <ObjectFileName>$(IntDir)</ObjectFileName> | ||
| 377 | <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName> | ||
| 378 | <WarningLevel>Level3</WarningLevel> | ||
| 379 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 380 | </ClCompile> | ||
| 381 | <ResourceCompile> | ||
| 382 | <Culture>0x040c</Culture> | ||
| 383 | </ResourceCompile> | ||
| 384 | <Lib> | ||
| 385 | <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> | ||
| 386 | <OutputFile>$(OutDir)zlibstat.lib</OutputFile> | ||
| 387 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 388 | </Lib> | ||
| 389 | </ItemDefinitionGroup> | ||
| 390 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'"> | ||
| 391 | <Midl> | ||
| 392 | <TargetEnvironment>Itanium</TargetEnvironment> | ||
| 393 | </Midl> | ||
| 394 | <ClCompile> | ||
| 395 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | ||
| 396 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 397 | <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 398 | <StringPooling>true</StringPooling> | ||
| 399 | <ExceptionHandling> | ||
| 400 | </ExceptionHandling> | ||
| 401 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | ||
| 402 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 403 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 404 | <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile> | ||
| 405 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 406 | <ObjectFileName>$(IntDir)</ObjectFileName> | ||
| 407 | <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName> | ||
| 408 | <WarningLevel>Level3</WarningLevel> | ||
| 409 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 410 | </ClCompile> | ||
| 411 | <ResourceCompile> | ||
| 412 | <Culture>0x040c</Culture> | ||
| 413 | </ResourceCompile> | ||
| 414 | <Lib> | ||
| 415 | <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions> | ||
| 416 | <OutputFile>$(OutDir)zlibstat.lib</OutputFile> | ||
| 417 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 418 | </Lib> | ||
| 419 | </ItemDefinitionGroup> | ||
| 420 | <ItemGroup> | ||
| 421 | <ClCompile Include="..\..\..\adler32.c" /> | ||
| 422 | <ClCompile Include="..\..\..\compress.c" /> | ||
| 423 | <ClCompile Include="..\..\..\crc32.c" /> | ||
| 424 | <ClCompile Include="..\..\..\deflate.c" /> | ||
| 425 | <ClCompile Include="..\..\masmx86\gvmat32c.c"> | ||
| 426 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild> | ||
| 427 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> | ||
| 428 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild> | ||
| 429 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">true</ExcludedFromBuild> | ||
| 430 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild> | ||
| 431 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> | ||
| 432 | </ClCompile> | ||
| 433 | <ClCompile Include="..\..\..\gzclose.c" /> | ||
| 434 | <ClCompile Include="..\..\..\gzio.c" /> | ||
| 435 | <ClCompile Include="..\..\..\gzlib.c" /> | ||
| 436 | <ClCompile Include="..\..\..\gzread.c" /> | ||
| 437 | <ClCompile Include="..\..\..\gzwrite.c" /> | ||
| 438 | <ClCompile Include="..\..\..\infback.c" /> | ||
| 439 | <ClCompile Include="..\..\masmx64\inffas8664.c"> | ||
| 440 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild> | ||
| 441 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> | ||
| 442 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild> | ||
| 443 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild> | ||
| 444 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild> | ||
| 445 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> | ||
| 446 | </ClCompile> | ||
| 447 | <ClCompile Include="..\..\..\inffast.c" /> | ||
| 448 | <ClCompile Include="..\..\..\inflate.c" /> | ||
| 449 | <ClCompile Include="..\..\..\inftrees.c" /> | ||
| 450 | <ClCompile Include="..\..\minizip\ioapi.c" /> | ||
| 451 | <ClCompile Include="..\..\..\trees.c" /> | ||
| 452 | <ClCompile Include="..\..\..\uncompr.c" /> | ||
| 453 | <ClCompile Include="..\..\minizip\unzip.c" /> | ||
| 454 | <ClCompile Include="..\..\minizip\zip.c" /> | ||
| 455 | <ClCompile Include="..\..\..\zutil.c" /> | ||
| 456 | </ItemGroup> | ||
| 457 | <ItemGroup> | ||
| 458 | <ResourceCompile Include="zlib.rc" /> | ||
| 459 | </ItemGroup> | ||
| 460 | <ItemGroup> | ||
| 461 | <None Include="zlibvc.def" /> | ||
| 462 | </ItemGroup> | ||
| 463 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||
| 464 | <ImportGroup Label="ExtensionTargets"> | ||
| 465 | </ImportGroup> | ||
| 466 | </Project> \ No newline at end of file | ||
diff --git a/contrib/vstudio/vc10/zlibstat.vcxproj.filters b/contrib/vstudio/vc10/zlibstat.vcxproj.filters new file mode 100644 index 0000000..f676c2d --- /dev/null +++ b/contrib/vstudio/vc10/zlibstat.vcxproj.filters | |||
| @@ -0,0 +1,83 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | <ItemGroup> | ||
| 4 | <Filter Include="Source Files"> | ||
| 5 | <UniqueIdentifier>{174213f6-7f66-4ae8-a3a8-a1e0a1e6ffdd}</UniqueIdentifier> | ||
| 6 | </Filter> | ||
| 7 | </ItemGroup> | ||
| 8 | <ItemGroup> | ||
| 9 | <ClCompile Include="..\..\..\adler32.c"> | ||
| 10 | <Filter>Source Files</Filter> | ||
| 11 | </ClCompile> | ||
| 12 | <ClCompile Include="..\..\..\compress.c"> | ||
| 13 | <Filter>Source Files</Filter> | ||
| 14 | </ClCompile> | ||
| 15 | <ClCompile Include="..\..\..\crc32.c"> | ||
| 16 | <Filter>Source Files</Filter> | ||
| 17 | </ClCompile> | ||
| 18 | <ClCompile Include="..\..\..\deflate.c"> | ||
| 19 | <Filter>Source Files</Filter> | ||
| 20 | </ClCompile> | ||
| 21 | <ClCompile Include="..\..\masmx86\gvmat32c.c"> | ||
| 22 | <Filter>Source Files</Filter> | ||
| 23 | </ClCompile> | ||
| 24 | <ClCompile Include="..\..\..\gzclose.c"> | ||
| 25 | <Filter>Source Files</Filter> | ||
| 26 | </ClCompile> | ||
| 27 | <ClCompile Include="..\..\..\gzio.c"> | ||
| 28 | <Filter>Source Files</Filter> | ||
| 29 | </ClCompile> | ||
| 30 | <ClCompile Include="..\..\..\gzlib.c"> | ||
| 31 | <Filter>Source Files</Filter> | ||
| 32 | </ClCompile> | ||
| 33 | <ClCompile Include="..\..\..\gzread.c"> | ||
| 34 | <Filter>Source Files</Filter> | ||
| 35 | </ClCompile> | ||
| 36 | <ClCompile Include="..\..\..\gzwrite.c"> | ||
| 37 | <Filter>Source Files</Filter> | ||
| 38 | </ClCompile> | ||
| 39 | <ClCompile Include="..\..\..\infback.c"> | ||
| 40 | <Filter>Source Files</Filter> | ||
| 41 | </ClCompile> | ||
| 42 | <ClCompile Include="..\..\masmx64\inffas8664.c"> | ||
| 43 | <Filter>Source Files</Filter> | ||
| 44 | </ClCompile> | ||
| 45 | <ClCompile Include="..\..\..\inffast.c"> | ||
| 46 | <Filter>Source Files</Filter> | ||
| 47 | </ClCompile> | ||
| 48 | <ClCompile Include="..\..\..\inflate.c"> | ||
| 49 | <Filter>Source Files</Filter> | ||
| 50 | </ClCompile> | ||
| 51 | <ClCompile Include="..\..\..\inftrees.c"> | ||
| 52 | <Filter>Source Files</Filter> | ||
| 53 | </ClCompile> | ||
| 54 | <ClCompile Include="..\..\minizip\ioapi.c"> | ||
| 55 | <Filter>Source Files</Filter> | ||
| 56 | </ClCompile> | ||
| 57 | <ClCompile Include="..\..\..\trees.c"> | ||
| 58 | <Filter>Source Files</Filter> | ||
| 59 | </ClCompile> | ||
| 60 | <ClCompile Include="..\..\..\uncompr.c"> | ||
| 61 | <Filter>Source Files</Filter> | ||
| 62 | </ClCompile> | ||
| 63 | <ClCompile Include="..\..\minizip\unzip.c"> | ||
| 64 | <Filter>Source Files</Filter> | ||
| 65 | </ClCompile> | ||
| 66 | <ClCompile Include="..\..\minizip\zip.c"> | ||
| 67 | <Filter>Source Files</Filter> | ||
| 68 | </ClCompile> | ||
| 69 | <ClCompile Include="..\..\..\zutil.c"> | ||
| 70 | <Filter>Source Files</Filter> | ||
| 71 | </ClCompile> | ||
| 72 | </ItemGroup> | ||
| 73 | <ItemGroup> | ||
| 74 | <ResourceCompile Include="zlib.rc"> | ||
| 75 | <Filter>Source Files</Filter> | ||
| 76 | </ResourceCompile> | ||
| 77 | </ItemGroup> | ||
| 78 | <ItemGroup> | ||
| 79 | <None Include="zlibvc.def"> | ||
| 80 | <Filter>Source Files</Filter> | ||
| 81 | </None> | ||
| 82 | </ItemGroup> | ||
| 83 | </Project> \ No newline at end of file | ||
diff --git a/contrib/vstudio/vc10/zlibstat.vcxproj.user b/contrib/vstudio/vc10/zlibstat.vcxproj.user new file mode 100644 index 0000000..695b5c7 --- /dev/null +++ b/contrib/vstudio/vc10/zlibstat.vcxproj.user | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | </Project> \ No newline at end of file | ||
diff --git a/contrib/contrib/vstudio/vc7/zlibvc.def b/contrib/vstudio/vc10/zlibvc.def index de70122..0b6a9e9 100644 --- a/contrib/contrib/vstudio/vc7/zlibvc.def +++ b/contrib/vstudio/vc10/zlibvc.def | |||
| @@ -93,3 +93,22 @@ EXPORTS | |||
| 93 | fill_win32_filefunc64 @111 | 93 | fill_win32_filefunc64 @111 |
| 94 | fill_win32_filefunc64A @112 | 94 | fill_win32_filefunc64A @112 |
| 95 | fill_win32_filefunc64W @113 | 95 | fill_win32_filefunc64W @113 |
| 96 | |||
| 97 | ; quick hack by hkuno@microhouse.co.jp | ||
| 98 | unzOpen64 @120 | ||
| 99 | unzOpen2_64 @121 | ||
| 100 | unzGetGlobalInfo64 @122 | ||
| 101 | unzGetCurrentFileInfo64 @124 | ||
| 102 | unzGetCurrentFileZStreamPos64 @125 | ||
| 103 | unztell64 @126 | ||
| 104 | unzGetFilePos64 @127 | ||
| 105 | unzGoToFilePos64 @128 | ||
| 106 | |||
| 107 | zipOpen64 @130 | ||
| 108 | zipOpen2_64 @131 | ||
| 109 | zipOpenNewFileInZip64 @132 | ||
| 110 | zipOpenNewFileInZip2_64 @133 | ||
| 111 | zipOpenNewFileInZip3_64 @134 | ||
| 112 | zipOpenNewFileInZip4_64 @135 | ||
| 113 | zipCloseFileInZipRaw64 @136 | ||
| 114 | ; end hack | ||
diff --git a/contrib/vstudio/vc10/zlibvc.sln b/contrib/vstudio/vc10/zlibvc.sln new file mode 100644 index 0000000..6d2ef64 --- /dev/null +++ b/contrib/vstudio/vc10/zlibvc.sln | |||
| @@ -0,0 +1,135 @@ | |||
| 1 |  | ||
| 2 | Microsoft Visual Studio Solution File, Format Version 11.00 | ||
| 3 | # Visual Studio 2010 | ||
| 4 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}" | ||
| 5 | EndProject | ||
| 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}" | ||
| 7 | EndProject | ||
| 8 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcxproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}" | ||
| 9 | EndProject | ||
| 10 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlibdll", "testzlibdll.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}" | ||
| 11 | EndProject | ||
| 12 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcxproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}" | ||
| 13 | EndProject | ||
| 14 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}" | ||
| 15 | EndProject | ||
| 16 | Global | ||
| 17 | GlobalSection(SolutionConfigurationPlatforms) = preSolution | ||
| 18 | Debug|Itanium = Debug|Itanium | ||
| 19 | Debug|Win32 = Debug|Win32 | ||
| 20 | Debug|x64 = Debug|x64 | ||
| 21 | Release|Itanium = Release|Itanium | ||
| 22 | Release|Win32 = Release|Win32 | ||
| 23 | Release|x64 = Release|x64 | ||
| 24 | ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium | ||
| 25 | ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32 | ||
| 26 | ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64 | ||
| 27 | EndGlobalSection | ||
| 28 | GlobalSection(ProjectConfigurationPlatforms) = postSolution | ||
| 29 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Itanium | ||
| 30 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.Build.0 = Debug|Itanium | ||
| 31 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32 | ||
| 32 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32 | ||
| 33 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64 | ||
| 34 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64 | ||
| 35 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Itanium | ||
| 36 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.Build.0 = Release|Itanium | ||
| 37 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.ActiveCfg = Release|Win32 | ||
| 38 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Win32.Build.0 = Release|Win32 | ||
| 39 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.ActiveCfg = ReleaseWithoutAsm|x64 | ||
| 40 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = ReleaseWithoutAsm|x64 | ||
| 41 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium | ||
| 42 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium | ||
| 43 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32 | ||
| 44 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32 | ||
| 45 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64 | ||
| 46 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64 | ||
| 47 | {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Itanium | ||
| 48 | {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.Build.0 = Debug|Itanium | ||
| 49 | {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32 | ||
| 50 | {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32 | ||
| 51 | {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64 | ||
| 52 | {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64 | ||
| 53 | {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Itanium | ||
| 54 | {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.Build.0 = Release|Itanium | ||
| 55 | {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32 | ||
| 56 | {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32 | ||
| 57 | {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64 | ||
| 58 | {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64 | ||
| 59 | {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium | ||
| 60 | {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium | ||
| 61 | {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32 | ||
| 62 | {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32 | ||
| 63 | {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64 | ||
| 64 | {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64 | ||
| 65 | {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Itanium | ||
| 66 | {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.Build.0 = Debug|Itanium | ||
| 67 | {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32 | ||
| 68 | {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32 | ||
| 69 | {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64 | ||
| 70 | {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64 | ||
| 71 | {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Itanium | ||
| 72 | {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.Build.0 = Release|Itanium | ||
| 73 | {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32 | ||
| 74 | {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32 | ||
| 75 | {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64 | ||
| 76 | {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64 | ||
| 77 | {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Itanium | ||
| 78 | {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.Build.0 = ReleaseWithoutAsm|Itanium | ||
| 79 | {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32 | ||
| 80 | {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32 | ||
| 81 | {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64 | ||
| 82 | {AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64 | ||
| 83 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Itanium | ||
| 84 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.Build.0 = Debug|Itanium | ||
| 85 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32 | ||
| 86 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32 | ||
| 87 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64 | ||
| 88 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64 | ||
| 89 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Itanium | ||
| 90 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.Build.0 = Release|Itanium | ||
| 91 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32 | ||
| 92 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32 | ||
| 93 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64 | ||
| 94 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64 | ||
| 95 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium | ||
| 96 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium | ||
| 97 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Itanium | ||
| 98 | {C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Itanium | ||
| 99 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Itanium | ||
| 100 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.Build.0 = Debug|Itanium | ||
| 101 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32 | ||
| 102 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32 | ||
| 103 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64 | ||
| 104 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64 | ||
| 105 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Itanium | ||
| 106 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.Build.0 = Release|Itanium | ||
| 107 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32 | ||
| 108 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32 | ||
| 109 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64 | ||
| 110 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64 | ||
| 111 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium | ||
| 112 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium | ||
| 113 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Itanium | ||
| 114 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Itanium | ||
| 115 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Itanium | ||
| 116 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.Build.0 = Debug|Itanium | ||
| 117 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32 | ||
| 118 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32 | ||
| 119 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64 | ||
| 120 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64 | ||
| 121 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Itanium | ||
| 122 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.Build.0 = Release|Itanium | ||
| 123 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32 | ||
| 124 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32 | ||
| 125 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64 | ||
| 126 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64 | ||
| 127 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Itanium | ||
| 128 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.Build.0 = Release|Itanium | ||
| 129 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Itanium | ||
| 130 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|Itanium | ||
| 131 | EndGlobalSection | ||
| 132 | GlobalSection(SolutionProperties) = preSolution | ||
| 133 | HideSolutionNode = FALSE | ||
| 134 | EndGlobalSection | ||
| 135 | EndGlobal | ||
diff --git a/contrib/vstudio/vc10/zlibvc.vcxproj b/contrib/vstudio/vc10/zlibvc.vcxproj new file mode 100644 index 0000000..e1067fa --- /dev/null +++ b/contrib/vstudio/vc10/zlibvc.vcxproj | |||
| @@ -0,0 +1,669 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | <ItemGroup Label="ProjectConfigurations"> | ||
| 4 | <ProjectConfiguration Include="Debug|Itanium"> | ||
| 5 | <Configuration>Debug</Configuration> | ||
| 6 | <Platform>Itanium</Platform> | ||
| 7 | </ProjectConfiguration> | ||
| 8 | <ProjectConfiguration Include="Debug|Win32"> | ||
| 9 | <Configuration>Debug</Configuration> | ||
| 10 | <Platform>Win32</Platform> | ||
| 11 | </ProjectConfiguration> | ||
| 12 | <ProjectConfiguration Include="Debug|x64"> | ||
| 13 | <Configuration>Debug</Configuration> | ||
| 14 | <Platform>x64</Platform> | ||
| 15 | </ProjectConfiguration> | ||
| 16 | <ProjectConfiguration Include="ReleaseWithoutAsm|Itanium"> | ||
| 17 | <Configuration>ReleaseWithoutAsm</Configuration> | ||
| 18 | <Platform>Itanium</Platform> | ||
| 19 | </ProjectConfiguration> | ||
| 20 | <ProjectConfiguration Include="ReleaseWithoutAsm|Win32"> | ||
| 21 | <Configuration>ReleaseWithoutAsm</Configuration> | ||
| 22 | <Platform>Win32</Platform> | ||
| 23 | </ProjectConfiguration> | ||
| 24 | <ProjectConfiguration Include="ReleaseWithoutAsm|x64"> | ||
| 25 | <Configuration>ReleaseWithoutAsm</Configuration> | ||
| 26 | <Platform>x64</Platform> | ||
| 27 | </ProjectConfiguration> | ||
| 28 | <ProjectConfiguration Include="Release|Itanium"> | ||
| 29 | <Configuration>Release</Configuration> | ||
| 30 | <Platform>Itanium</Platform> | ||
| 31 | </ProjectConfiguration> | ||
| 32 | <ProjectConfiguration Include="Release|Win32"> | ||
| 33 | <Configuration>Release</Configuration> | ||
| 34 | <Platform>Win32</Platform> | ||
| 35 | </ProjectConfiguration> | ||
| 36 | <ProjectConfiguration Include="Release|x64"> | ||
| 37 | <Configuration>Release</Configuration> | ||
| 38 | <Platform>x64</Platform> | ||
| 39 | </ProjectConfiguration> | ||
| 40 | </ItemGroup> | ||
| 41 | <PropertyGroup Label="Globals"> | ||
| 42 | <ProjectGuid>{8FD826F8-3739-44E6-8CC8-997122E53B8D}</ProjectGuid> | ||
| 43 | </PropertyGroup> | ||
| 44 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> | ||
| 45 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> | ||
| 46 | <ConfigurationType>DynamicLibrary</ConfigurationType> | ||
| 47 | <UseOfMfc>false</UseOfMfc> | ||
| 48 | <WholeProgramOptimization>true</WholeProgramOptimization> | ||
| 49 | </PropertyGroup> | ||
| 50 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration"> | ||
| 51 | <ConfigurationType>DynamicLibrary</ConfigurationType> | ||
| 52 | <UseOfMfc>false</UseOfMfc> | ||
| 53 | <WholeProgramOptimization>true</WholeProgramOptimization> | ||
| 54 | </PropertyGroup> | ||
| 55 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> | ||
| 56 | <ConfigurationType>DynamicLibrary</ConfigurationType> | ||
| 57 | <UseOfMfc>false</UseOfMfc> | ||
| 58 | </PropertyGroup> | ||
| 59 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration"> | ||
| 60 | <ConfigurationType>DynamicLibrary</ConfigurationType> | ||
| 61 | <UseOfMfc>false</UseOfMfc> | ||
| 62 | <WholeProgramOptimization>true</WholeProgramOptimization> | ||
| 63 | </PropertyGroup> | ||
| 64 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration"> | ||
| 65 | <ConfigurationType>DynamicLibrary</ConfigurationType> | ||
| 66 | <UseOfMfc>false</UseOfMfc> | ||
| 67 | <WholeProgramOptimization>true</WholeProgramOptimization> | ||
| 68 | </PropertyGroup> | ||
| 69 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration"> | ||
| 70 | <ConfigurationType>DynamicLibrary</ConfigurationType> | ||
| 71 | <UseOfMfc>false</UseOfMfc> | ||
| 72 | </PropertyGroup> | ||
| 73 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> | ||
| 74 | <ConfigurationType>DynamicLibrary</ConfigurationType> | ||
| 75 | <UseOfMfc>false</UseOfMfc> | ||
| 76 | <WholeProgramOptimization>true</WholeProgramOptimization> | ||
| 77 | </PropertyGroup> | ||
| 78 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration"> | ||
| 79 | <ConfigurationType>DynamicLibrary</ConfigurationType> | ||
| 80 | <UseOfMfc>false</UseOfMfc> | ||
| 81 | <WholeProgramOptimization>true</WholeProgramOptimization> | ||
| 82 | </PropertyGroup> | ||
| 83 | <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> | ||
| 84 | <ConfigurationType>DynamicLibrary</ConfigurationType> | ||
| 85 | <UseOfMfc>false</UseOfMfc> | ||
| 86 | </PropertyGroup> | ||
| 87 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> | ||
| 88 | <ImportGroup Label="ExtensionSettings"> | ||
| 89 | </ImportGroup> | ||
| 90 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets"> | ||
| 91 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 92 | </ImportGroup> | ||
| 93 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets"> | ||
| 94 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 95 | </ImportGroup> | ||
| 96 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets"> | ||
| 97 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 98 | </ImportGroup> | ||
| 99 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets"> | ||
| 100 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 101 | </ImportGroup> | ||
| 102 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets"> | ||
| 103 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 104 | </ImportGroup> | ||
| 105 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets"> | ||
| 106 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 107 | </ImportGroup> | ||
| 108 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets"> | ||
| 109 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 110 | </ImportGroup> | ||
| 111 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets"> | ||
| 112 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 113 | </ImportGroup> | ||
| 114 | <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets"> | ||
| 115 | <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" /> | ||
| 116 | </ImportGroup> | ||
| 117 | <PropertyGroup Label="UserMacros" /> | ||
| 118 | <PropertyGroup> | ||
| 119 | <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion> | ||
| 120 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\</OutDir> | ||
| 121 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir> | ||
| 122 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental> | ||
| 123 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest> | ||
| 124 | <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\</OutDir> | ||
| 125 | <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir> | ||
| 126 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental> | ||
| 127 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest> | ||
| 128 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\</OutDir> | ||
| 129 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir> | ||
| 130 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental> | ||
| 131 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest> | ||
| 132 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\</OutDir> | ||
| 133 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir> | ||
| 134 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental> | ||
| 135 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest> | ||
| 136 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir> | ||
| 137 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir> | ||
| 138 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental> | ||
| 139 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest> | ||
| 140 | <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\</OutDir> | ||
| 141 | <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir> | ||
| 142 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</LinkIncremental> | ||
| 143 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest> | ||
| 144 | <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir> | ||
| 145 | <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir> | ||
| 146 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental> | ||
| 147 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest> | ||
| 148 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\</OutDir> | ||
| 149 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir> | ||
| 150 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental> | ||
| 151 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest> | ||
| 152 | <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir> | ||
| 153 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir> | ||
| 154 | <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental> | ||
| 155 | <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest> | ||
| 156 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 157 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" /> | ||
| 158 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" /> | ||
| 159 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 160 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> | ||
| 161 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" /> | ||
| 162 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 163 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> | ||
| 164 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" /> | ||
| 165 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 166 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" /> | ||
| 167 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" /> | ||
| 168 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 169 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" /> | ||
| 170 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" /> | ||
| 171 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 172 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" /> | ||
| 173 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" /> | ||
| 174 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 175 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" /> | ||
| 176 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" /> | ||
| 177 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 178 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> | ||
| 179 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" /> | ||
| 180 | <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet> | ||
| 181 | <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> | ||
| 182 | <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" /> | ||
| 183 | </PropertyGroup> | ||
| 184 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> | ||
| 185 | <Midl> | ||
| 186 | <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 187 | <MkTypLibCompatible>true</MkTypLibCompatible> | ||
| 188 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 189 | <TargetEnvironment>Win32</TargetEnvironment> | ||
| 190 | <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName> | ||
| 191 | </Midl> | ||
| 192 | <ClCompile> | ||
| 193 | <Optimization>Disabled</Optimization> | ||
| 194 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 195 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 196 | <ExceptionHandling> | ||
| 197 | </ExceptionHandling> | ||
| 198 | <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> | ||
| 199 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 200 | <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile> | ||
| 201 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 202 | <ObjectFileName>$(IntDir)</ObjectFileName> | ||
| 203 | <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName> | ||
| 204 | <BrowseInformation> | ||
| 205 | </BrowseInformation> | ||
| 206 | <WarningLevel>Level3</WarningLevel> | ||
| 207 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 208 | <DebugInformationFormat>EditAndContinue</DebugInformationFormat> | ||
| 209 | </ClCompile> | ||
| 210 | <ResourceCompile> | ||
| 211 | <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 212 | <Culture>0x040c</Culture> | ||
| 213 | </ResourceCompile> | ||
| 214 | <Link> | ||
| 215 | <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> | ||
| 216 | <AdditionalDependencies>..\..\masmx86\gvmat32.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 217 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> | ||
| 218 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 219 | <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> | ||
| 220 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 221 | <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile> | ||
| 222 | <GenerateMapFile>true</GenerateMapFile> | ||
| 223 | <MapFileName>$(OutDir)zlibwapi.map</MapFileName> | ||
| 224 | <SubSystem>Windows</SubSystem> | ||
| 225 | <RandomizedBaseAddress>false</RandomizedBaseAddress> | ||
| 226 | <DataExecutionPrevention> | ||
| 227 | </DataExecutionPrevention> | ||
| 228 | <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> | ||
| 229 | </Link> | ||
| 230 | </ItemDefinitionGroup> | ||
| 231 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'"> | ||
| 232 | <Midl> | ||
| 233 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 234 | <MkTypLibCompatible>true</MkTypLibCompatible> | ||
| 235 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 236 | <TargetEnvironment>Win32</TargetEnvironment> | ||
| 237 | <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName> | ||
| 238 | </Midl> | ||
| 239 | <ClCompile> | ||
| 240 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | ||
| 241 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 242 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 243 | <StringPooling>true</StringPooling> | ||
| 244 | <ExceptionHandling> | ||
| 245 | </ExceptionHandling> | ||
| 246 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | ||
| 247 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 248 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 249 | <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile> | ||
| 250 | <AssemblerOutput>All</AssemblerOutput> | ||
| 251 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 252 | <ObjectFileName>$(IntDir)</ObjectFileName> | ||
| 253 | <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName> | ||
| 254 | <BrowseInformation> | ||
| 255 | </BrowseInformation> | ||
| 256 | <WarningLevel>Level3</WarningLevel> | ||
| 257 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 258 | </ClCompile> | ||
| 259 | <ResourceCompile> | ||
| 260 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 261 | <Culture>0x040c</Culture> | ||
| 262 | </ResourceCompile> | ||
| 263 | <Link> | ||
| 264 | <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> | ||
| 265 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> | ||
| 266 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 267 | <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> | ||
| 268 | <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> | ||
| 269 | <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile> | ||
| 270 | <GenerateMapFile>true</GenerateMapFile> | ||
| 271 | <MapFileName>$(OutDir)zlibwapi.map</MapFileName> | ||
| 272 | <SubSystem>Windows</SubSystem> | ||
| 273 | <RandomizedBaseAddress>false</RandomizedBaseAddress> | ||
| 274 | <DataExecutionPrevention> | ||
| 275 | </DataExecutionPrevention> | ||
| 276 | <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> | ||
| 277 | </Link> | ||
| 278 | </ItemDefinitionGroup> | ||
| 279 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> | ||
| 280 | <Midl> | ||
| 281 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 282 | <MkTypLibCompatible>true</MkTypLibCompatible> | ||
| 283 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 284 | <TargetEnvironment>Win32</TargetEnvironment> | ||
| 285 | <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName> | ||
| 286 | </Midl> | ||
| 287 | <ClCompile> | ||
| 288 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | ||
| 289 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 290 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 291 | <StringPooling>true</StringPooling> | ||
| 292 | <ExceptionHandling> | ||
| 293 | </ExceptionHandling> | ||
| 294 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | ||
| 295 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 296 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 297 | <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile> | ||
| 298 | <AssemblerOutput>All</AssemblerOutput> | ||
| 299 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 300 | <ObjectFileName>$(IntDir)</ObjectFileName> | ||
| 301 | <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName> | ||
| 302 | <BrowseInformation> | ||
| 303 | </BrowseInformation> | ||
| 304 | <WarningLevel>Level3</WarningLevel> | ||
| 305 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 306 | </ClCompile> | ||
| 307 | <ResourceCompile> | ||
| 308 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 309 | <Culture>0x040c</Culture> | ||
| 310 | </ResourceCompile> | ||
| 311 | <Link> | ||
| 312 | <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions> | ||
| 313 | <AdditionalDependencies>..\..\masmx86\gvmat32.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 314 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> | ||
| 315 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 316 | <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> | ||
| 317 | <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> | ||
| 318 | <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile> | ||
| 319 | <GenerateMapFile>true</GenerateMapFile> | ||
| 320 | <MapFileName>$(OutDir)zlibwapi.map</MapFileName> | ||
| 321 | <SubSystem>Windows</SubSystem> | ||
| 322 | <RandomizedBaseAddress>false</RandomizedBaseAddress> | ||
| 323 | <DataExecutionPrevention> | ||
| 324 | </DataExecutionPrevention> | ||
| 325 | <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> | ||
| 326 | </Link> | ||
| 327 | </ItemDefinitionGroup> | ||
| 328 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> | ||
| 329 | <Midl> | ||
| 330 | <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 331 | <MkTypLibCompatible>true</MkTypLibCompatible> | ||
| 332 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 333 | <TargetEnvironment>X64</TargetEnvironment> | ||
| 334 | <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName> | ||
| 335 | </Midl> | ||
| 336 | <ClCompile> | ||
| 337 | <Optimization>Disabled</Optimization> | ||
| 338 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 339 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 340 | <ExceptionHandling> | ||
| 341 | </ExceptionHandling> | ||
| 342 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
| 343 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 344 | <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile> | ||
| 345 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 346 | <ObjectFileName>$(IntDir)</ObjectFileName> | ||
| 347 | <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName> | ||
| 348 | <BrowseInformation> | ||
| 349 | </BrowseInformation> | ||
| 350 | <WarningLevel>Level3</WarningLevel> | ||
| 351 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 352 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | ||
| 353 | </ClCompile> | ||
| 354 | <ResourceCompile> | ||
| 355 | <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 356 | <Culture>0x040c</Culture> | ||
| 357 | </ResourceCompile> | ||
| 358 | <Link> | ||
| 359 | <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 360 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> | ||
| 361 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 362 | <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> | ||
| 363 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 364 | <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile> | ||
| 365 | <GenerateMapFile>true</GenerateMapFile> | ||
| 366 | <MapFileName>$(OutDir)zlibwapi.map</MapFileName> | ||
| 367 | <SubSystem>Windows</SubSystem> | ||
| 368 | <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> | ||
| 369 | <TargetMachine>MachineX64</TargetMachine> | ||
| 370 | </Link> | ||
| 371 | </ItemDefinitionGroup> | ||
| 372 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'"> | ||
| 373 | <Midl> | ||
| 374 | <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 375 | <MkTypLibCompatible>true</MkTypLibCompatible> | ||
| 376 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 377 | <TargetEnvironment>Itanium</TargetEnvironment> | ||
| 378 | <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName> | ||
| 379 | </Midl> | ||
| 380 | <ClCompile> | ||
| 381 | <Optimization>Disabled</Optimization> | ||
| 382 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 383 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 384 | <ExceptionHandling> | ||
| 385 | </ExceptionHandling> | ||
| 386 | <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary> | ||
| 387 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 388 | <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile> | ||
| 389 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 390 | <ObjectFileName>$(IntDir)</ObjectFileName> | ||
| 391 | <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName> | ||
| 392 | <BrowseInformation> | ||
| 393 | </BrowseInformation> | ||
| 394 | <WarningLevel>Level3</WarningLevel> | ||
| 395 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 396 | <DebugInformationFormat>ProgramDatabase</DebugInformationFormat> | ||
| 397 | </ClCompile> | ||
| 398 | <ResourceCompile> | ||
| 399 | <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 400 | <Culture>0x040c</Culture> | ||
| 401 | </ResourceCompile> | ||
| 402 | <Link> | ||
| 403 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> | ||
| 404 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 405 | <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> | ||
| 406 | <GenerateDebugInformation>true</GenerateDebugInformation> | ||
| 407 | <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile> | ||
| 408 | <GenerateMapFile>true</GenerateMapFile> | ||
| 409 | <MapFileName>$(OutDir)zlibwapi.map</MapFileName> | ||
| 410 | <SubSystem>Windows</SubSystem> | ||
| 411 | <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> | ||
| 412 | <TargetMachine>MachineIA64</TargetMachine> | ||
| 413 | </Link> | ||
| 414 | </ItemDefinitionGroup> | ||
| 415 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'"> | ||
| 416 | <Midl> | ||
| 417 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 418 | <MkTypLibCompatible>true</MkTypLibCompatible> | ||
| 419 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 420 | <TargetEnvironment>X64</TargetEnvironment> | ||
| 421 | <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName> | ||
| 422 | </Midl> | ||
| 423 | <ClCompile> | ||
| 424 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | ||
| 425 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 426 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 427 | <StringPooling>true</StringPooling> | ||
| 428 | <ExceptionHandling> | ||
| 429 | </ExceptionHandling> | ||
| 430 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | ||
| 431 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 432 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 433 | <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile> | ||
| 434 | <AssemblerOutput>All</AssemblerOutput> | ||
| 435 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 436 | <ObjectFileName>$(IntDir)</ObjectFileName> | ||
| 437 | <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName> | ||
| 438 | <BrowseInformation> | ||
| 439 | </BrowseInformation> | ||
| 440 | <WarningLevel>Level3</WarningLevel> | ||
| 441 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 442 | </ClCompile> | ||
| 443 | <ResourceCompile> | ||
| 444 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 445 | <Culture>0x040c</Culture> | ||
| 446 | </ResourceCompile> | ||
| 447 | <Link> | ||
| 448 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> | ||
| 449 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 450 | <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> | ||
| 451 | <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> | ||
| 452 | <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile> | ||
| 453 | <GenerateMapFile>true</GenerateMapFile> | ||
| 454 | <MapFileName>$(OutDir)zlibwapi.map</MapFileName> | ||
| 455 | <SubSystem>Windows</SubSystem> | ||
| 456 | <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> | ||
| 457 | <TargetMachine>MachineX64</TargetMachine> | ||
| 458 | </Link> | ||
| 459 | </ItemDefinitionGroup> | ||
| 460 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'"> | ||
| 461 | <Midl> | ||
| 462 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 463 | <MkTypLibCompatible>true</MkTypLibCompatible> | ||
| 464 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 465 | <TargetEnvironment>Itanium</TargetEnvironment> | ||
| 466 | <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName> | ||
| 467 | </Midl> | ||
| 468 | <ClCompile> | ||
| 469 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | ||
| 470 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 471 | <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 472 | <StringPooling>true</StringPooling> | ||
| 473 | <ExceptionHandling> | ||
| 474 | </ExceptionHandling> | ||
| 475 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | ||
| 476 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 477 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 478 | <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile> | ||
| 479 | <AssemblerOutput>All</AssemblerOutput> | ||
| 480 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 481 | <ObjectFileName>$(IntDir)</ObjectFileName> | ||
| 482 | <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName> | ||
| 483 | <BrowseInformation> | ||
| 484 | </BrowseInformation> | ||
| 485 | <WarningLevel>Level3</WarningLevel> | ||
| 486 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 487 | </ClCompile> | ||
| 488 | <ResourceCompile> | ||
| 489 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 490 | <Culture>0x040c</Culture> | ||
| 491 | </ResourceCompile> | ||
| 492 | <Link> | ||
| 493 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> | ||
| 494 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 495 | <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> | ||
| 496 | <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> | ||
| 497 | <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile> | ||
| 498 | <GenerateMapFile>true</GenerateMapFile> | ||
| 499 | <MapFileName>$(OutDir)zlibwapi.map</MapFileName> | ||
| 500 | <SubSystem>Windows</SubSystem> | ||
| 501 | <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> | ||
| 502 | <TargetMachine>MachineIA64</TargetMachine> | ||
| 503 | </Link> | ||
| 504 | </ItemDefinitionGroup> | ||
| 505 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> | ||
| 506 | <Midl> | ||
| 507 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 508 | <MkTypLibCompatible>true</MkTypLibCompatible> | ||
| 509 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 510 | <TargetEnvironment>X64</TargetEnvironment> | ||
| 511 | <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName> | ||
| 512 | </Midl> | ||
| 513 | <ClCompile> | ||
| 514 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | ||
| 515 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 516 | <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 517 | <StringPooling>true</StringPooling> | ||
| 518 | <ExceptionHandling> | ||
| 519 | </ExceptionHandling> | ||
| 520 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | ||
| 521 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 522 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 523 | <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile> | ||
| 524 | <AssemblerOutput>All</AssemblerOutput> | ||
| 525 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 526 | <ObjectFileName>$(IntDir)</ObjectFileName> | ||
| 527 | <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName> | ||
| 528 | <BrowseInformation> | ||
| 529 | </BrowseInformation> | ||
| 530 | <WarningLevel>Level3</WarningLevel> | ||
| 531 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 532 | </ClCompile> | ||
| 533 | <ResourceCompile> | ||
| 534 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 535 | <Culture>0x040c</Culture> | ||
| 536 | </ResourceCompile> | ||
| 537 | <Link> | ||
| 538 | <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies> | ||
| 539 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> | ||
| 540 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 541 | <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> | ||
| 542 | <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> | ||
| 543 | <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile> | ||
| 544 | <GenerateMapFile>true</GenerateMapFile> | ||
| 545 | <MapFileName>$(OutDir)zlibwapi.map</MapFileName> | ||
| 546 | <SubSystem>Windows</SubSystem> | ||
| 547 | <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> | ||
| 548 | <TargetMachine>MachineX64</TargetMachine> | ||
| 549 | </Link> | ||
| 550 | </ItemDefinitionGroup> | ||
| 551 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'"> | ||
| 552 | <Midl> | ||
| 553 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 554 | <MkTypLibCompatible>true</MkTypLibCompatible> | ||
| 555 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 556 | <TargetEnvironment>Itanium</TargetEnvironment> | ||
| 557 | <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName> | ||
| 558 | </Midl> | ||
| 559 | <ClCompile> | ||
| 560 | <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion> | ||
| 561 | <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 562 | <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 563 | <StringPooling>true</StringPooling> | ||
| 564 | <ExceptionHandling> | ||
| 565 | </ExceptionHandling> | ||
| 566 | <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> | ||
| 567 | <BufferSecurityCheck>false</BufferSecurityCheck> | ||
| 568 | <FunctionLevelLinking>true</FunctionLevelLinking> | ||
| 569 | <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile> | ||
| 570 | <AssemblerOutput>All</AssemblerOutput> | ||
| 571 | <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation> | ||
| 572 | <ObjectFileName>$(IntDir)</ObjectFileName> | ||
| 573 | <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName> | ||
| 574 | <BrowseInformation> | ||
| 575 | </BrowseInformation> | ||
| 576 | <WarningLevel>Level3</WarningLevel> | ||
| 577 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 578 | </ClCompile> | ||
| 579 | <ResourceCompile> | ||
| 580 | <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 581 | <Culture>0x040c</Culture> | ||
| 582 | </ResourceCompile> | ||
| 583 | <Link> | ||
| 584 | <OutputFile>$(OutDir)zlibwapi.dll</OutputFile> | ||
| 585 | <SuppressStartupBanner>true</SuppressStartupBanner> | ||
| 586 | <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> | ||
| 587 | <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile> | ||
| 588 | <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile> | ||
| 589 | <GenerateMapFile>true</GenerateMapFile> | ||
| 590 | <MapFileName>$(OutDir)zlibwapi.map</MapFileName> | ||
| 591 | <SubSystem>Windows</SubSystem> | ||
| 592 | <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary> | ||
| 593 | <TargetMachine>MachineIA64</TargetMachine> | ||
| 594 | </Link> | ||
| 595 | </ItemDefinitionGroup> | ||
| 596 | <ItemGroup> | ||
| 597 | <ClCompile Include="..\..\..\adler32.c" /> | ||
| 598 | <ClCompile Include="..\..\..\compress.c" /> | ||
| 599 | <ClCompile Include="..\..\..\crc32.c" /> | ||
| 600 | <ClCompile Include="..\..\..\deflate.c" /> | ||
| 601 | <ClCompile Include="..\..\masmx86\gvmat32c.c"> | ||
| 602 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild> | ||
| 603 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> | ||
| 604 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild> | ||
| 605 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild> | ||
| 606 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">true</ExcludedFromBuild> | ||
| 607 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild> | ||
| 608 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> | ||
| 609 | </ClCompile> | ||
| 610 | <ClCompile Include="..\..\..\gzclose.c" /> | ||
| 611 | <ClCompile Include="..\..\..\gzio.c" /> | ||
| 612 | <ClCompile Include="..\..\..\gzlib.c" /> | ||
| 613 | <ClCompile Include="..\..\..\gzread.c" /> | ||
| 614 | <ClCompile Include="..\..\..\gzwrite.c" /> | ||
| 615 | <ClCompile Include="..\..\..\infback.c" /> | ||
| 616 | <ClCompile Include="..\..\masmx64\inffas8664.c"> | ||
| 617 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild> | ||
| 618 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> | ||
| 619 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild> | ||
| 620 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild> | ||
| 621 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild> | ||
| 622 | <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> | ||
| 623 | </ClCompile> | ||
| 624 | <ClCompile Include="..\..\..\inffast.c" /> | ||
| 625 | <ClCompile Include="..\..\..\inflate.c" /> | ||
| 626 | <ClCompile Include="..\..\..\inftrees.c" /> | ||
| 627 | <ClCompile Include="..\..\minizip\ioapi.c" /> | ||
| 628 | <ClCompile Include="..\..\minizip\iowin32.c" /> | ||
| 629 | <ClCompile Include="..\..\..\trees.c" /> | ||
| 630 | <ClCompile Include="..\..\..\uncompr.c" /> | ||
| 631 | <ClCompile Include="..\..\minizip\unzip.c"> | ||
| 632 | <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 633 | <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 634 | <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 635 | <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 636 | <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 637 | <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 638 | </ClCompile> | ||
| 639 | <ClCompile Include="..\..\minizip\zip.c"> | ||
| 640 | <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 641 | <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 642 | <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 643 | <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 644 | <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> | ||
| 645 | <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions> | ||
| 646 | </ClCompile> | ||
| 647 | <ClCompile Include="..\..\..\zutil.c" /> | ||
| 648 | </ItemGroup> | ||
| 649 | <ItemGroup> | ||
| 650 | <ResourceCompile Include="zlib.rc" /> | ||
| 651 | </ItemGroup> | ||
| 652 | <ItemGroup> | ||
| 653 | <None Include="zlibvc.def" /> | ||
| 654 | </ItemGroup> | ||
| 655 | <ItemGroup> | ||
| 656 | <ClInclude Include="..\..\..\deflate.h" /> | ||
| 657 | <ClInclude Include="..\..\..\infblock.h" /> | ||
| 658 | <ClInclude Include="..\..\..\infcodes.h" /> | ||
| 659 | <ClInclude Include="..\..\..\inffast.h" /> | ||
| 660 | <ClInclude Include="..\..\..\inftrees.h" /> | ||
| 661 | <ClInclude Include="..\..\..\infutil.h" /> | ||
| 662 | <ClInclude Include="..\..\..\zconf.h" /> | ||
| 663 | <ClInclude Include="..\..\..\zlib.h" /> | ||
| 664 | <ClInclude Include="..\..\..\zutil.h" /> | ||
| 665 | </ItemGroup> | ||
| 666 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | ||
| 667 | <ImportGroup Label="ExtensionTargets"> | ||
| 668 | </ImportGroup> | ||
| 669 | </Project> \ No newline at end of file | ||
diff --git a/contrib/vstudio/vc10/zlibvc.vcxproj.filters b/contrib/vstudio/vc10/zlibvc.vcxproj.filters new file mode 100644 index 0000000..7b595c4 --- /dev/null +++ b/contrib/vstudio/vc10/zlibvc.vcxproj.filters | |||
| @@ -0,0 +1,124 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | <ItemGroup> | ||
| 4 | <Filter Include="Source Files"> | ||
| 5 | <UniqueIdentifier>{07934a85-8b61-443d-a0ee-b2eedb74f3cd}</UniqueIdentifier> | ||
| 6 | <Extensions>cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90</Extensions> | ||
| 7 | </Filter> | ||
| 8 | <Filter Include="Header Files"> | ||
| 9 | <UniqueIdentifier>{1d99675b-433d-4a21-9e50-ed4ab8b19762}</UniqueIdentifier> | ||
| 10 | <Extensions>h;hpp;hxx;hm;inl;fi;fd</Extensions> | ||
| 11 | </Filter> | ||
| 12 | <Filter Include="Resource Files"> | ||
| 13 | <UniqueIdentifier>{431c0958-fa71-44d0-9084-2d19d100c0cc}</UniqueIdentifier> | ||
| 14 | <Extensions>ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe</Extensions> | ||
| 15 | </Filter> | ||
| 16 | </ItemGroup> | ||
| 17 | <ItemGroup> | ||
| 18 | <ClCompile Include="..\..\..\adler32.c"> | ||
| 19 | <Filter>Source Files</Filter> | ||
| 20 | </ClCompile> | ||
| 21 | <ClCompile Include="..\..\..\compress.c"> | ||
| 22 | <Filter>Source Files</Filter> | ||
| 23 | </ClCompile> | ||
| 24 | <ClCompile Include="..\..\..\crc32.c"> | ||
| 25 | <Filter>Source Files</Filter> | ||
| 26 | </ClCompile> | ||
| 27 | <ClCompile Include="..\..\..\deflate.c"> | ||
| 28 | <Filter>Source Files</Filter> | ||
| 29 | </ClCompile> | ||
| 30 | <ClCompile Include="..\..\masmx86\gvmat32c.c"> | ||
| 31 | <Filter>Source Files</Filter> | ||
| 32 | </ClCompile> | ||
| 33 | <ClCompile Include="..\..\..\gzclose.c"> | ||
| 34 | <Filter>Source Files</Filter> | ||
| 35 | </ClCompile> | ||
| 36 | <ClCompile Include="..\..\..\gzio.c"> | ||
| 37 | <Filter>Source Files</Filter> | ||
| 38 | </ClCompile> | ||
| 39 | <ClCompile Include="..\..\..\gzlib.c"> | ||
| 40 | <Filter>Source Files</Filter> | ||
| 41 | </ClCompile> | ||
| 42 | <ClCompile Include="..\..\..\gzread.c"> | ||
| 43 | <Filter>Source Files</Filter> | ||
| 44 | </ClCompile> | ||
| 45 | <ClCompile Include="..\..\..\gzwrite.c"> | ||
| 46 | <Filter>Source Files</Filter> | ||
| 47 | </ClCompile> | ||
| 48 | <ClCompile Include="..\..\..\infback.c"> | ||
| 49 | <Filter>Source Files</Filter> | ||
| 50 | </ClCompile> | ||
| 51 | <ClCompile Include="..\..\masmx64\inffas8664.c"> | ||
| 52 | <Filter>Source Files</Filter> | ||
| 53 | </ClCompile> | ||
| 54 | <ClCompile Include="..\..\..\inffast.c"> | ||
| 55 | <Filter>Source Files</Filter> | ||
| 56 | </ClCompile> | ||
| 57 | <ClCompile Include="..\..\..\inflate.c"> | ||
| 58 | <Filter>Source Files</Filter> | ||
| 59 | </ClCompile> | ||
| 60 | <ClCompile Include="..\..\..\inftrees.c"> | ||
| 61 | <Filter>Source Files</Filter> | ||
| 62 | </ClCompile> | ||
| 63 | <ClCompile Include="..\..\minizip\ioapi.c"> | ||
| 64 | <Filter>Source Files</Filter> | ||
| 65 | </ClCompile> | ||
| 66 | <ClCompile Include="..\..\minizip\iowin32.c"> | ||
| 67 | <Filter>Source Files</Filter> | ||
| 68 | </ClCompile> | ||
| 69 | <ClCompile Include="..\..\..\trees.c"> | ||
| 70 | <Filter>Source Files</Filter> | ||
| 71 | </ClCompile> | ||
| 72 | <ClCompile Include="..\..\..\uncompr.c"> | ||
| 73 | <Filter>Source Files</Filter> | ||
| 74 | </ClCompile> | ||
| 75 | <ClCompile Include="..\..\minizip\unzip.c"> | ||
| 76 | <Filter>Source Files</Filter> | ||
| 77 | </ClCompile> | ||
| 78 | <ClCompile Include="..\..\minizip\zip.c"> | ||
| 79 | <Filter>Source Files</Filter> | ||
| 80 | </ClCompile> | ||
| 81 | <ClCompile Include="..\..\..\zutil.c"> | ||
| 82 | <Filter>Source Files</Filter> | ||
| 83 | </ClCompile> | ||
| 84 | </ItemGroup> | ||
| 85 | <ItemGroup> | ||
| 86 | <ResourceCompile Include="zlib.rc"> | ||
| 87 | <Filter>Source Files</Filter> | ||
| 88 | </ResourceCompile> | ||
| 89 | </ItemGroup> | ||
| 90 | <ItemGroup> | ||
| 91 | <None Include="zlibvc.def"> | ||
| 92 | <Filter>Source Files</Filter> | ||
| 93 | </None> | ||
| 94 | </ItemGroup> | ||
| 95 | <ItemGroup> | ||
| 96 | <ClInclude Include="..\..\..\deflate.h"> | ||
| 97 | <Filter>Header Files</Filter> | ||
| 98 | </ClInclude> | ||
| 99 | <ClInclude Include="..\..\..\infblock.h"> | ||
| 100 | <Filter>Header Files</Filter> | ||
| 101 | </ClInclude> | ||
| 102 | <ClInclude Include="..\..\..\infcodes.h"> | ||
| 103 | <Filter>Header Files</Filter> | ||
| 104 | </ClInclude> | ||
| 105 | <ClInclude Include="..\..\..\inffast.h"> | ||
| 106 | <Filter>Header Files</Filter> | ||
| 107 | </ClInclude> | ||
| 108 | <ClInclude Include="..\..\..\inftrees.h"> | ||
| 109 | <Filter>Header Files</Filter> | ||
| 110 | </ClInclude> | ||
| 111 | <ClInclude Include="..\..\..\infutil.h"> | ||
| 112 | <Filter>Header Files</Filter> | ||
| 113 | </ClInclude> | ||
| 114 | <ClInclude Include="..\..\..\zconf.h"> | ||
| 115 | <Filter>Header Files</Filter> | ||
| 116 | </ClInclude> | ||
| 117 | <ClInclude Include="..\..\..\zlib.h"> | ||
| 118 | <Filter>Header Files</Filter> | ||
| 119 | </ClInclude> | ||
| 120 | <ClInclude Include="..\..\..\zutil.h"> | ||
| 121 | <Filter>Header Files</Filter> | ||
| 122 | </ClInclude> | ||
| 123 | </ItemGroup> | ||
| 124 | </Project> \ No newline at end of file | ||
diff --git a/contrib/vstudio/vc10/zlibvc.vcxproj.user b/contrib/vstudio/vc10/zlibvc.vcxproj.user new file mode 100644 index 0000000..695b5c7 --- /dev/null +++ b/contrib/vstudio/vc10/zlibvc.vcxproj.user | |||
| @@ -0,0 +1,3 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | ||
| 3 | </Project> \ No newline at end of file | ||
diff --git a/contrib/vstudio/vc7/miniunz.vcproj b/contrib/vstudio/vc7/miniunz.vcproj deleted file mode 100644 index ad5117c..0000000 --- a/contrib/vstudio/vc7/miniunz.vcproj +++ /dev/null | |||
| @@ -1,126 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding = "Windows-1252"?> | ||
| 2 | <VisualStudioProject | ||
| 3 | ProjectType="Visual C++" | ||
| 4 | Version="7.00" | ||
| 5 | Name="miniunz" | ||
| 6 | ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694382A}" | ||
| 7 | Keyword="Win32Proj"> | ||
| 8 | <Platforms> | ||
| 9 | <Platform | ||
| 10 | Name="Win32"/> | ||
| 11 | </Platforms> | ||
| 12 | <Configurations> | ||
| 13 | <Configuration | ||
| 14 | Name="Debug|Win32" | ||
| 15 | OutputDirectory="Debug" | ||
| 16 | IntermediateDirectory="Debug" | ||
| 17 | ConfigurationType="1" | ||
| 18 | CharacterSet="2"> | ||
| 19 | <Tool | ||
| 20 | Name="VCCLCompilerTool" | ||
| 21 | Optimization="0" | ||
| 22 | AdditionalIncludeDirectories="..\..\..;..\..\minizip" | ||
| 23 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE" | ||
| 24 | MinimalRebuild="TRUE" | ||
| 25 | BasicRuntimeChecks="3" | ||
| 26 | RuntimeLibrary="5" | ||
| 27 | UsePrecompiledHeader="0" | ||
| 28 | WarningLevel="3" | ||
| 29 | Detect64BitPortabilityProblems="TRUE" | ||
| 30 | DebugInformationFormat="4"/> | ||
| 31 | <Tool | ||
| 32 | Name="VCCustomBuildTool"/> | ||
| 33 | <Tool | ||
| 34 | Name="VCLinkerTool" | ||
| 35 | OutputFile="$(OutDir)/miniunz.exe" | ||
| 36 | LinkIncremental="2" | ||
| 37 | GenerateDebugInformation="TRUE" | ||
| 38 | ProgramDatabaseFile="$(OutDir)/miniunz.pdb" | ||
| 39 | SubSystem="1" | ||
| 40 | TargetMachine="1"/> | ||
| 41 | <Tool | ||
| 42 | Name="VCMIDLTool"/> | ||
| 43 | <Tool | ||
| 44 | Name="VCPostBuildEventTool"/> | ||
| 45 | <Tool | ||
| 46 | Name="VCPreBuildEventTool"/> | ||
| 47 | <Tool | ||
| 48 | Name="VCPreLinkEventTool"/> | ||
| 49 | <Tool | ||
| 50 | Name="VCResourceCompilerTool"/> | ||
| 51 | <Tool | ||
| 52 | Name="VCWebServiceProxyGeneratorTool"/> | ||
| 53 | <Tool | ||
| 54 | Name="VCWebDeploymentTool"/> | ||
| 55 | </Configuration> | ||
| 56 | <Configuration | ||
| 57 | Name="Release|Win32" | ||
| 58 | OutputDirectory="Release" | ||
| 59 | IntermediateDirectory="Release" | ||
| 60 | ConfigurationType="1" | ||
| 61 | CharacterSet="2"> | ||
| 62 | <Tool | ||
| 63 | Name="VCCLCompilerTool" | ||
| 64 | Optimization="2" | ||
| 65 | InlineFunctionExpansion="1" | ||
| 66 | OmitFramePointers="TRUE" | ||
| 67 | AdditionalIncludeDirectories="..\..\..;..\..\minizip" | ||
| 68 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE" | ||
| 69 | StringPooling="TRUE" | ||
| 70 | RuntimeLibrary="4" | ||
| 71 | EnableFunctionLevelLinking="TRUE" | ||
| 72 | UsePrecompiledHeader="0" | ||
| 73 | WarningLevel="3" | ||
| 74 | Detect64BitPortabilityProblems="TRUE" | ||
| 75 | DebugInformationFormat="3"/> | ||
| 76 | <Tool | ||
| 77 | Name="VCCustomBuildTool"/> | ||
| 78 | <Tool | ||
| 79 | Name="VCLinkerTool" | ||
| 80 | OutputFile="$(OutDir)/miniunz.exe" | ||
| 81 | LinkIncremental="1" | ||
| 82 | GenerateDebugInformation="TRUE" | ||
| 83 | SubSystem="1" | ||
| 84 | OptimizeReferences="2" | ||
| 85 | EnableCOMDATFolding="2" | ||
| 86 | OptimizeForWindows98="1" | ||
| 87 | TargetMachine="1"/> | ||
| 88 | <Tool | ||
| 89 | Name="VCMIDLTool"/> | ||
| 90 | <Tool | ||
| 91 | Name="VCPostBuildEventTool"/> | ||
| 92 | <Tool | ||
| 93 | Name="VCPreBuildEventTool"/> | ||
| 94 | <Tool | ||
| 95 | Name="VCPreLinkEventTool"/> | ||
| 96 | <Tool | ||
| 97 | Name="VCResourceCompilerTool"/> | ||
| 98 | <Tool | ||
| 99 | Name="VCWebServiceProxyGeneratorTool"/> | ||
| 100 | <Tool | ||
| 101 | Name="VCWebDeploymentTool"/> | ||
| 102 | </Configuration> | ||
| 103 | </Configurations> | ||
| 104 | <Files> | ||
| 105 | <Filter | ||
| 106 | Name="Source Files" | ||
| 107 | Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"> | ||
| 108 | <File | ||
| 109 | RelativePath="..\..\minizip\miniunz.c"> | ||
| 110 | </File> | ||
| 111 | </Filter> | ||
| 112 | <Filter | ||
| 113 | Name="Header Files" | ||
| 114 | Filter="h;hpp;hxx;hm;inl;inc"> | ||
| 115 | </Filter> | ||
| 116 | <Filter | ||
| 117 | Name="Resource Files" | ||
| 118 | Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> | ||
| 119 | </Filter> | ||
| 120 | <File | ||
| 121 | RelativePath="ReleaseDll\zlibwapi.lib"> | ||
| 122 | </File> | ||
| 123 | </Files> | ||
| 124 | <Globals> | ||
| 125 | </Globals> | ||
| 126 | </VisualStudioProject> | ||
diff --git a/contrib/vstudio/vc7/minizip.vcproj b/contrib/vstudio/vc7/minizip.vcproj deleted file mode 100644 index fb5b632..0000000 --- a/contrib/vstudio/vc7/minizip.vcproj +++ /dev/null | |||
| @@ -1,126 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding = "Windows-1252"?> | ||
| 2 | <VisualStudioProject | ||
| 3 | ProjectType="Visual C++" | ||
| 4 | Version="7.00" | ||
| 5 | Name="minizip" | ||
| 6 | ProjectGUID="{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}" | ||
| 7 | Keyword="Win32Proj"> | ||
| 8 | <Platforms> | ||
| 9 | <Platform | ||
| 10 | Name="Win32"/> | ||
| 11 | </Platforms> | ||
| 12 | <Configurations> | ||
| 13 | <Configuration | ||
| 14 | Name="Debug|Win32" | ||
| 15 | OutputDirectory="Debug" | ||
| 16 | IntermediateDirectory="Debug" | ||
| 17 | ConfigurationType="1" | ||
| 18 | CharacterSet="2"> | ||
| 19 | <Tool | ||
| 20 | Name="VCCLCompilerTool" | ||
| 21 | Optimization="0" | ||
| 22 | AdditionalIncludeDirectories="..\..\..;..\..\minizip" | ||
| 23 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE" | ||
| 24 | MinimalRebuild="TRUE" | ||
| 25 | BasicRuntimeChecks="3" | ||
| 26 | RuntimeLibrary="5" | ||
| 27 | UsePrecompiledHeader="0" | ||
| 28 | WarningLevel="3" | ||
| 29 | Detect64BitPortabilityProblems="TRUE" | ||
| 30 | DebugInformationFormat="4"/> | ||
| 31 | <Tool | ||
| 32 | Name="VCCustomBuildTool"/> | ||
| 33 | <Tool | ||
| 34 | Name="VCLinkerTool" | ||
| 35 | OutputFile="$(OutDir)/minizip.exe" | ||
| 36 | LinkIncremental="2" | ||
| 37 | GenerateDebugInformation="TRUE" | ||
| 38 | ProgramDatabaseFile="$(OutDir)/minizip.pdb" | ||
| 39 | SubSystem="1" | ||
| 40 | TargetMachine="1"/> | ||
| 41 | <Tool | ||
| 42 | Name="VCMIDLTool"/> | ||
| 43 | <Tool | ||
| 44 | Name="VCPostBuildEventTool"/> | ||
| 45 | <Tool | ||
| 46 | Name="VCPreBuildEventTool"/> | ||
| 47 | <Tool | ||
| 48 | Name="VCPreLinkEventTool"/> | ||
| 49 | <Tool | ||
| 50 | Name="VCResourceCompilerTool"/> | ||
| 51 | <Tool | ||
| 52 | Name="VCWebServiceProxyGeneratorTool"/> | ||
| 53 | <Tool | ||
| 54 | Name="VCWebDeploymentTool"/> | ||
| 55 | </Configuration> | ||
| 56 | <Configuration | ||
| 57 | Name="Release|Win32" | ||
| 58 | OutputDirectory="Release" | ||
| 59 | IntermediateDirectory="Release" | ||
| 60 | ConfigurationType="1" | ||
| 61 | CharacterSet="2"> | ||
| 62 | <Tool | ||
| 63 | Name="VCCLCompilerTool" | ||
| 64 | Optimization="2" | ||
| 65 | InlineFunctionExpansion="1" | ||
| 66 | OmitFramePointers="TRUE" | ||
| 67 | AdditionalIncludeDirectories="..\..\..;..\..\minizip" | ||
| 68 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE" | ||
| 69 | StringPooling="TRUE" | ||
| 70 | RuntimeLibrary="4" | ||
| 71 | EnableFunctionLevelLinking="TRUE" | ||
| 72 | UsePrecompiledHeader="0" | ||
| 73 | WarningLevel="3" | ||
| 74 | Detect64BitPortabilityProblems="TRUE" | ||
| 75 | DebugInformationFormat="3"/> | ||
| 76 | <Tool | ||
| 77 | Name="VCCustomBuildTool"/> | ||
| 78 | <Tool | ||
| 79 | Name="VCLinkerTool" | ||
| 80 | OutputFile="$(OutDir)/minizip.exe" | ||
| 81 | LinkIncremental="1" | ||
| 82 | GenerateDebugInformation="TRUE" | ||
| 83 | SubSystem="1" | ||
| 84 | OptimizeReferences="2" | ||
| 85 | EnableCOMDATFolding="2" | ||
| 86 | OptimizeForWindows98="1" | ||
| 87 | TargetMachine="1"/> | ||
| 88 | <Tool | ||
| 89 | Name="VCMIDLTool"/> | ||
| 90 | <Tool | ||
| 91 | Name="VCPostBuildEventTool"/> | ||
| 92 | <Tool | ||
| 93 | Name="VCPreBuildEventTool"/> | ||
| 94 | <Tool | ||
| 95 | Name="VCPreLinkEventTool"/> | ||
| 96 | <Tool | ||
| 97 | Name="VCResourceCompilerTool"/> | ||
| 98 | <Tool | ||
| 99 | Name="VCWebServiceProxyGeneratorTool"/> | ||
| 100 | <Tool | ||
| 101 | Name="VCWebDeploymentTool"/> | ||
| 102 | </Configuration> | ||
| 103 | </Configurations> | ||
| 104 | <Files> | ||
| 105 | <Filter | ||
| 106 | Name="Source Files" | ||
| 107 | Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"> | ||
| 108 | <File | ||
| 109 | RelativePath="..\..\minizip\minizip.c"> | ||
| 110 | </File> | ||
| 111 | </Filter> | ||
| 112 | <Filter | ||
| 113 | Name="Header Files" | ||
| 114 | Filter="h;hpp;hxx;hm;inl;inc"> | ||
| 115 | </Filter> | ||
| 116 | <Filter | ||
| 117 | Name="Resource Files" | ||
| 118 | Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> | ||
| 119 | </Filter> | ||
| 120 | <File | ||
| 121 | RelativePath="ReleaseDll\zlibwapi.lib"> | ||
| 122 | </File> | ||
| 123 | </Files> | ||
| 124 | <Globals> | ||
| 125 | </Globals> | ||
| 126 | </VisualStudioProject> | ||
diff --git a/contrib/vstudio/vc7/testzlib.vcproj b/contrib/vstudio/vc7/testzlib.vcproj deleted file mode 100644 index 97bc3e8..0000000 --- a/contrib/vstudio/vc7/testzlib.vcproj +++ /dev/null | |||
| @@ -1,126 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding = "Windows-1252"?> | ||
| 2 | <VisualStudioProject | ||
| 3 | ProjectType="Visual C++" | ||
| 4 | Version="7.00" | ||
| 5 | Name="testZlibDll" | ||
| 6 | ProjectGUID="{AA6666AA-E09F-4135-9C0C-4FE50C3C654C}" | ||
| 7 | Keyword="Win32Proj"> | ||
| 8 | <Platforms> | ||
| 9 | <Platform | ||
| 10 | Name="Win32"/> | ||
| 11 | </Platforms> | ||
| 12 | <Configurations> | ||
| 13 | <Configuration | ||
| 14 | Name="Debug|Win32" | ||
| 15 | OutputDirectory="Debug" | ||
| 16 | IntermediateDirectory="Debug" | ||
| 17 | ConfigurationType="1" | ||
| 18 | CharacterSet="2"> | ||
| 19 | <Tool | ||
| 20 | Name="VCCLCompilerTool" | ||
| 21 | Optimization="0" | ||
| 22 | AdditionalIncludeDirectories="..\..\.." | ||
| 23 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE" | ||
| 24 | MinimalRebuild="TRUE" | ||
| 25 | BasicRuntimeChecks="3" | ||
| 26 | RuntimeLibrary="5" | ||
| 27 | UsePrecompiledHeader="0" | ||
| 28 | WarningLevel="3" | ||
| 29 | Detect64BitPortabilityProblems="TRUE" | ||
| 30 | DebugInformationFormat="4"/> | ||
| 31 | <Tool | ||
| 32 | Name="VCCustomBuildTool"/> | ||
| 33 | <Tool | ||
| 34 | Name="VCLinkerTool" | ||
| 35 | OutputFile="$(OutDir)/testzlib.exe" | ||
| 36 | LinkIncremental="2" | ||
| 37 | GenerateDebugInformation="TRUE" | ||
| 38 | ProgramDatabaseFile="$(OutDir)/testzlib.pdb" | ||
| 39 | SubSystem="1" | ||
| 40 | TargetMachine="1"/> | ||
| 41 | <Tool | ||
| 42 | Name="VCMIDLTool"/> | ||
| 43 | <Tool | ||
| 44 | Name="VCPostBuildEventTool"/> | ||
| 45 | <Tool | ||
| 46 | Name="VCPreBuildEventTool"/> | ||
| 47 | <Tool | ||
| 48 | Name="VCPreLinkEventTool"/> | ||
| 49 | <Tool | ||
| 50 | Name="VCResourceCompilerTool"/> | ||
| 51 | <Tool | ||
| 52 | Name="VCWebServiceProxyGeneratorTool"/> | ||
| 53 | <Tool | ||
| 54 | Name="VCWebDeploymentTool"/> | ||
| 55 | </Configuration> | ||
| 56 | <Configuration | ||
| 57 | Name="Release|Win32" | ||
| 58 | OutputDirectory="Release" | ||
| 59 | IntermediateDirectory="Release" | ||
| 60 | ConfigurationType="1" | ||
| 61 | CharacterSet="2"> | ||
| 62 | <Tool | ||
| 63 | Name="VCCLCompilerTool" | ||
| 64 | Optimization="2" | ||
| 65 | InlineFunctionExpansion="1" | ||
| 66 | OmitFramePointers="TRUE" | ||
| 67 | AdditionalIncludeDirectories="..\..\.." | ||
| 68 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE" | ||
| 69 | StringPooling="TRUE" | ||
| 70 | RuntimeLibrary="4" | ||
| 71 | EnableFunctionLevelLinking="TRUE" | ||
| 72 | UsePrecompiledHeader="0" | ||
| 73 | WarningLevel="3" | ||
| 74 | Detect64BitPortabilityProblems="TRUE" | ||
| 75 | DebugInformationFormat="3"/> | ||
| 76 | <Tool | ||
| 77 | Name="VCCustomBuildTool"/> | ||
| 78 | <Tool | ||
| 79 | Name="VCLinkerTool" | ||
| 80 | OutputFile="$(OutDir)/testzlib.exe" | ||
| 81 | LinkIncremental="1" | ||
| 82 | GenerateDebugInformation="TRUE" | ||
| 83 | SubSystem="1" | ||
| 84 | OptimizeReferences="2" | ||
| 85 | EnableCOMDATFolding="2" | ||
| 86 | OptimizeForWindows98="1" | ||
| 87 | TargetMachine="1"/> | ||
| 88 | <Tool | ||
| 89 | Name="VCMIDLTool"/> | ||
| 90 | <Tool | ||
| 91 | Name="VCPostBuildEventTool"/> | ||
| 92 | <Tool | ||
| 93 | Name="VCPreBuildEventTool"/> | ||
| 94 | <Tool | ||
| 95 | Name="VCPreLinkEventTool"/> | ||
| 96 | <Tool | ||
| 97 | Name="VCResourceCompilerTool"/> | ||
| 98 | <Tool | ||
| 99 | Name="VCWebServiceProxyGeneratorTool"/> | ||
| 100 | <Tool | ||
| 101 | Name="VCWebDeploymentTool"/> | ||
| 102 | </Configuration> | ||
| 103 | </Configurations> | ||
| 104 | <Files> | ||
| 105 | <Filter | ||
| 106 | Name="Source Files" | ||
| 107 | Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"> | ||
| 108 | <File | ||
| 109 | RelativePath="..\..\testzlib\testzlib.c"> | ||
| 110 | </File> | ||
| 111 | </Filter> | ||
| 112 | <Filter | ||
| 113 | Name="Header Files" | ||
| 114 | Filter="h;hpp;hxx;hm;inl;inc"> | ||
| 115 | </Filter> | ||
| 116 | <Filter | ||
| 117 | Name="Resource Files" | ||
| 118 | Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"> | ||
| 119 | </Filter> | ||
| 120 | <File | ||
| 121 | RelativePath="ReleaseDll\zlibwapi.lib"> | ||
| 122 | </File> | ||
| 123 | </Files> | ||
| 124 | <Globals> | ||
| 125 | </Globals> | ||
| 126 | </VisualStudioProject> | ||
diff --git a/contrib/vstudio/vc7/zlibstat.vcproj b/contrib/vstudio/vc7/zlibstat.vcproj deleted file mode 100644 index 3c37959..0000000 --- a/contrib/vstudio/vc7/zlibstat.vcproj +++ /dev/null | |||
| @@ -1,258 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding = "Windows-1252"?> | ||
| 2 | <VisualStudioProject | ||
| 3 | ProjectType="Visual C++" | ||
| 4 | Version="7.00" | ||
| 5 | Name="zlibstat" | ||
| 6 | SccProjectName="" | ||
| 7 | SccLocalPath=""> | ||
| 8 | <Platforms> | ||
| 9 | <Platform | ||
| 10 | Name="Win32"/> | ||
| 11 | </Platforms> | ||
| 12 | <Configurations> | ||
| 13 | <Configuration | ||
| 14 | Name="Debug|Win32" | ||
| 15 | OutputDirectory=".\zlibstatDebug" | ||
| 16 | IntermediateDirectory=".\zlibstatDebug" | ||
| 17 | ConfigurationType="4" | ||
| 18 | UseOfMFC="0" | ||
| 19 | ATLMinimizesCRunTimeLibraryUsage="FALSE"> | ||
| 20 | <Tool | ||
| 21 | Name="VCCLCompilerTool" | ||
| 22 | Optimization="0" | ||
| 23 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | ||
| 24 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI" | ||
| 25 | ExceptionHandling="FALSE" | ||
| 26 | RuntimeLibrary="5" | ||
| 27 | PrecompiledHeaderFile=".\zlibstatDebug/zlibstat.pch" | ||
| 28 | AssemblerListingLocation=".\zlibstatDebug/" | ||
| 29 | ObjectFile=".\zlibstatDebug/" | ||
| 30 | ProgramDataBaseFileName=".\zlibstatDebug/" | ||
| 31 | WarningLevel="3" | ||
| 32 | SuppressStartupBanner="TRUE" | ||
| 33 | DebugInformationFormat="1"/> | ||
| 34 | <Tool | ||
| 35 | Name="VCCustomBuildTool"/> | ||
| 36 | <Tool | ||
| 37 | Name="VCLibrarianTool" | ||
| 38 | AdditionalOptions="/NODEFAULTLIB " | ||
| 39 | OutputFile=".\zlibstatDebug\zlibstat.lib" | ||
| 40 | SuppressStartupBanner="TRUE"/> | ||
| 41 | <Tool | ||
| 42 | Name="VCMIDLTool"/> | ||
| 43 | <Tool | ||
| 44 | Name="VCPostBuildEventTool"/> | ||
| 45 | <Tool | ||
| 46 | Name="VCPreBuildEventTool"/> | ||
| 47 | <Tool | ||
| 48 | Name="VCPreLinkEventTool"/> | ||
| 49 | <Tool | ||
| 50 | Name="VCResourceCompilerTool" | ||
| 51 | Culture="1036"/> | ||
| 52 | <Tool | ||
| 53 | Name="VCWebServiceProxyGeneratorTool"/> | ||
| 54 | </Configuration> | ||
| 55 | <Configuration | ||
| 56 | Name="ReleaseAxp|Win32" | ||
| 57 | OutputDirectory=".\zlibsta0" | ||
| 58 | IntermediateDirectory=".\zlibsta0" | ||
| 59 | ConfigurationType="4" | ||
| 60 | UseOfMFC="0" | ||
| 61 | ATLMinimizesCRunTimeLibraryUsage="FALSE"> | ||
| 62 | <Tool | ||
| 63 | Name="VCCLCompilerTool" | ||
| 64 | InlineFunctionExpansion="1" | ||
| 65 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | ||
| 66 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI" | ||
| 67 | StringPooling="TRUE" | ||
| 68 | ExceptionHandling="FALSE" | ||
| 69 | RuntimeLibrary="4" | ||
| 70 | EnableFunctionLevelLinking="TRUE" | ||
| 71 | PrecompiledHeaderFile=".\zlibsta0/zlibstat.pch" | ||
| 72 | AssemblerListingLocation=".\zlibsta0/" | ||
| 73 | ObjectFile=".\zlibsta0/" | ||
| 74 | ProgramDataBaseFileName=".\zlibsta0/" | ||
| 75 | WarningLevel="3" | ||
| 76 | SuppressStartupBanner="TRUE"/> | ||
| 77 | <Tool | ||
| 78 | Name="VCCustomBuildTool"/> | ||
| 79 | <Tool | ||
| 80 | Name="VCLibrarianTool" | ||
| 81 | AdditionalOptions="/NODEFAULTLIB " | ||
| 82 | OutputFile=".\zlibsta0\zlibstat.lib" | ||
| 83 | SuppressStartupBanner="TRUE"/> | ||
| 84 | <Tool | ||
| 85 | Name="VCMIDLTool"/> | ||
| 86 | <Tool | ||
| 87 | Name="VCPostBuildEventTool"/> | ||
| 88 | <Tool | ||
| 89 | Name="VCPreBuildEventTool"/> | ||
| 90 | <Tool | ||
| 91 | Name="VCPreLinkEventTool"/> | ||
| 92 | <Tool | ||
| 93 | Name="VCResourceCompilerTool"/> | ||
| 94 | <Tool | ||
| 95 | Name="VCWebServiceProxyGeneratorTool"/> | ||
| 96 | </Configuration> | ||
| 97 | <Configuration | ||
| 98 | Name="Release|Win32" | ||
| 99 | OutputDirectory=".\zlibstat" | ||
| 100 | IntermediateDirectory=".\zlibstat" | ||
| 101 | ConfigurationType="4" | ||
| 102 | UseOfMFC="0" | ||
| 103 | ATLMinimizesCRunTimeLibraryUsage="FALSE"> | ||
| 104 | <Tool | ||
| 105 | Name="VCCLCompilerTool" | ||
| 106 | InlineFunctionExpansion="1" | ||
| 107 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | ||
| 108 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;ASMV;ASMINF" | ||
| 109 | StringPooling="TRUE" | ||
| 110 | ExceptionHandling="FALSE" | ||
| 111 | RuntimeLibrary="4" | ||
| 112 | EnableFunctionLevelLinking="TRUE" | ||
| 113 | PrecompiledHeaderFile=".\zlibstat/zlibstat.pch" | ||
| 114 | AssemblerListingLocation=".\zlibstat/" | ||
| 115 | ObjectFile=".\zlibstat/" | ||
| 116 | ProgramDataBaseFileName=".\zlibstat/" | ||
| 117 | WarningLevel="3" | ||
| 118 | SuppressStartupBanner="TRUE"/> | ||
| 119 | <Tool | ||
| 120 | Name="VCCustomBuildTool"/> | ||
| 121 | <Tool | ||
| 122 | Name="VCLibrarianTool" | ||
| 123 | AdditionalOptions="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj /NODEFAULTLIB " | ||
| 124 | OutputFile=".\zlibstat\zlibstat.lib" | ||
| 125 | SuppressStartupBanner="TRUE"/> | ||
| 126 | <Tool | ||
| 127 | Name="VCMIDLTool"/> | ||
| 128 | <Tool | ||
| 129 | Name="VCPostBuildEventTool"/> | ||
| 130 | <Tool | ||
| 131 | Name="VCPreBuildEventTool"/> | ||
| 132 | <Tool | ||
| 133 | Name="VCPreLinkEventTool"/> | ||
| 134 | <Tool | ||
| 135 | Name="VCResourceCompilerTool" | ||
| 136 | Culture="1036"/> | ||
| 137 | <Tool | ||
| 138 | Name="VCWebServiceProxyGeneratorTool"/> | ||
| 139 | </Configuration> | ||
| 140 | <Configuration | ||
| 141 | Name="ReleaseWithoutAsm|Win32" | ||
| 142 | OutputDirectory="zlibstatWithoutAsm" | ||
| 143 | IntermediateDirectory="zlibstatWithoutAsm" | ||
| 144 | ConfigurationType="4" | ||
| 145 | UseOfMFC="0" | ||
| 146 | ATLMinimizesCRunTimeLibraryUsage="FALSE"> | ||
| 147 | <Tool | ||
| 148 | Name="VCCLCompilerTool" | ||
| 149 | InlineFunctionExpansion="1" | ||
| 150 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | ||
| 151 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI" | ||
| 152 | StringPooling="TRUE" | ||
| 153 | ExceptionHandling="FALSE" | ||
| 154 | RuntimeLibrary="4" | ||
| 155 | EnableFunctionLevelLinking="TRUE" | ||
| 156 | PrecompiledHeaderFile=".\zlibstat/zlibstat.pch" | ||
| 157 | AssemblerListingLocation=".\zlibstatWithoutAsm/" | ||
| 158 | ObjectFile=".\zlibstatWithoutAsm/" | ||
| 159 | ProgramDataBaseFileName=".\zlibstatWithoutAsm/" | ||
| 160 | WarningLevel="3" | ||
| 161 | SuppressStartupBanner="TRUE"/> | ||
| 162 | <Tool | ||
| 163 | Name="VCCustomBuildTool"/> | ||
| 164 | <Tool | ||
| 165 | Name="VCLibrarianTool" | ||
| 166 | AdditionalOptions=" /NODEFAULTLIB " | ||
| 167 | OutputFile=".\zlibstatWithoutAsm\zlibstat.lib" | ||
| 168 | SuppressStartupBanner="TRUE"/> | ||
| 169 | <Tool | ||
| 170 | Name="VCMIDLTool"/> | ||
| 171 | <Tool | ||
| 172 | Name="VCPostBuildEventTool"/> | ||
| 173 | <Tool | ||
| 174 | Name="VCPreBuildEventTool"/> | ||
| 175 | <Tool | ||
| 176 | Name="VCPreLinkEventTool"/> | ||
| 177 | <Tool | ||
| 178 | Name="VCResourceCompilerTool" | ||
| 179 | Culture="1036"/> | ||
| 180 | <Tool | ||
| 181 | Name="VCWebServiceProxyGeneratorTool"/> | ||
| 182 | </Configuration> | ||
| 183 | </Configurations> | ||
| 184 | <Files> | ||
| 185 | <Filter | ||
| 186 | Name="Source Files" | ||
| 187 | Filter=""> | ||
| 188 | <File | ||
| 189 | RelativePath="..\..\..\adler32.c"> | ||
| 190 | </File> | ||
| 191 | <File | ||
| 192 | RelativePath="..\..\..\compress.c"> | ||
| 193 | </File> | ||
| 194 | <File | ||
| 195 | RelativePath="..\..\..\crc32.c"> | ||
| 196 | </File> | ||
| 197 | <File | ||
| 198 | RelativePath="..\..\..\deflate.c"> | ||
| 199 | </File> | ||
| 200 | <File | ||
| 201 | RelativePath="..\..\masmx86\gvmat32c.c"> | ||
| 202 | </File> | ||
| 203 | <File | ||
| 204 | RelativePath="..\..\..\gzclose.c"> | ||
| 205 | </File> | ||
| 206 | <File | ||
| 207 | RelativePath="..\..\..\gzio.c"> | ||
| 208 | </File> | ||
| 209 | <File | ||
| 210 | RelativePath="..\..\..\gzlib.c"> | ||
| 211 | </File> | ||
| 212 | <File | ||
| 213 | RelativePath="..\..\..\gzread.c"> | ||
| 214 | </File> | ||
| 215 | <File | ||
| 216 | RelativePath="..\..\..\gzwrite.c"> | ||
| 217 | </File> | ||
| 218 | <File | ||
| 219 | RelativePath="..\..\..\infback.c"> | ||
| 220 | </File> | ||
| 221 | <File | ||
| 222 | RelativePath="..\..\..\inffast.c"> | ||
| 223 | </File> | ||
| 224 | <File | ||
| 225 | RelativePath="..\..\..\inflate.c"> | ||
| 226 | </File> | ||
| 227 | <File | ||
| 228 | RelativePath="..\..\..\inftrees.c"> | ||
| 229 | </File> | ||
| 230 | <File | ||
| 231 | RelativePath="..\..\minizip\ioapi.c"> | ||
| 232 | </File> | ||
| 233 | <File | ||
| 234 | RelativePath="..\..\..\trees.c"> | ||
| 235 | </File> | ||
| 236 | <File | ||
| 237 | RelativePath="..\..\..\uncompr.c"> | ||
| 238 | </File> | ||
| 239 | <File | ||
| 240 | RelativePath="..\..\minizip\unzip.c"> | ||
| 241 | </File> | ||
| 242 | <File | ||
| 243 | RelativePath="..\..\minizip\zip.c"> | ||
| 244 | </File> | ||
| 245 | <File | ||
| 246 | RelativePath=".\zlib.rc"> | ||
| 247 | </File> | ||
| 248 | <File | ||
| 249 | RelativePath=".\zlibvc.def"> | ||
| 250 | </File> | ||
| 251 | <File | ||
| 252 | RelativePath="..\..\..\zutil.c"> | ||
| 253 | </File> | ||
| 254 | </Filter> | ||
| 255 | </Files> | ||
| 256 | <Globals> | ||
| 257 | </Globals> | ||
| 258 | </VisualStudioProject> | ||
diff --git a/contrib/vstudio/vc7/zlibvc.def b/contrib/vstudio/vc7/zlibvc.def index a40e715..0b6a9e9 100644 --- a/contrib/vstudio/vc7/zlibvc.def +++ b/contrib/vstudio/vc7/zlibvc.def | |||
| @@ -90,3 +90,25 @@ EXPORTS | |||
| 90 | unzGoToFilePos @101 | 90 | unzGoToFilePos @101 |
| 91 | 91 | ||
| 92 | fill_win32_filefunc @110 | 92 | fill_win32_filefunc @110 |
| 93 | fill_win32_filefunc64 @111 | ||
| 94 | fill_win32_filefunc64A @112 | ||
| 95 | fill_win32_filefunc64W @113 | ||
| 96 | |||
| 97 | ; quick hack by hkuno@microhouse.co.jp | ||
| 98 | unzOpen64 @120 | ||
| 99 | unzOpen2_64 @121 | ||
| 100 | unzGetGlobalInfo64 @122 | ||
| 101 | unzGetCurrentFileInfo64 @124 | ||
| 102 | unzGetCurrentFileZStreamPos64 @125 | ||
| 103 | unztell64 @126 | ||
| 104 | unzGetFilePos64 @127 | ||
| 105 | unzGoToFilePos64 @128 | ||
| 106 | |||
| 107 | zipOpen64 @130 | ||
| 108 | zipOpen2_64 @131 | ||
| 109 | zipOpenNewFileInZip64 @132 | ||
| 110 | zipOpenNewFileInZip2_64 @133 | ||
| 111 | zipOpenNewFileInZip3_64 @134 | ||
| 112 | zipOpenNewFileInZip4_64 @135 | ||
| 113 | zipCloseFileInZipRaw64 @136 | ||
| 114 | ; end hack | ||
diff --git a/contrib/vstudio/vc7/zlibvc.sln b/contrib/vstudio/vc7/zlibvc.sln deleted file mode 100644 index 927b42b..0000000 --- a/contrib/vstudio/vc7/zlibvc.sln +++ /dev/null | |||
| @@ -1,78 +0,0 @@ | |||
| 1 | Microsoft Visual Studio Solution File, Format Version 7.00 | ||
| 2 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}" | ||
| 3 | EndProject | ||
| 4 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}" | ||
| 5 | EndProject | ||
| 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}" | ||
| 7 | EndProject | ||
| 8 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}" | ||
| 9 | EndProject | ||
| 10 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testZlibDll", "testzlib.vcproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654C}" | ||
| 11 | EndProject | ||
| 12 | Global | ||
| 13 | GlobalSection(SolutionConfiguration) = preSolution | ||
| 14 | ConfigName.0 = Debug | ||
| 15 | ConfigName.1 = Release | ||
| 16 | ConfigName.2 = ReleaseAxp | ||
| 17 | ConfigName.3 = ReleaseWithoutAsm | ||
| 18 | ConfigName.4 = ReleaseWithoutCrtdll | ||
| 19 | EndGlobalSection | ||
| 20 | GlobalSection(ProjectDependencies) = postSolution | ||
| 21 | EndGlobalSection | ||
| 22 | GlobalSection(ProjectConfiguration) = postSolution | ||
| 23 | {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug.ActiveCfg = Debug|Win32 | ||
| 24 | {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug.Build.0 = Debug|Win32 | ||
| 25 | {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release.ActiveCfg = Release|Win32 | ||
| 26 | {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release.Build.0 = Release|Win32 | ||
| 27 | {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseAxp.ActiveCfg = ReleaseAxp|Win32 | ||
| 28 | {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseAxp.Build.0 = ReleaseAxp|Win32 | ||
| 29 | {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm.ActiveCfg = ReleaseWithoutAsm|Win32 | ||
| 30 | {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm.Build.0 = ReleaseWithoutAsm|Win32 | ||
| 31 | {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutCrtdll.ActiveCfg = ReleaseAxp|Win32 | ||
| 32 | {745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutCrtdll.Build.0 = ReleaseAxp|Win32 | ||
| 33 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug.ActiveCfg = Debug|Win32 | ||
| 34 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug.Build.0 = Debug|Win32 | ||
| 35 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release.ActiveCfg = Release|Win32 | ||
| 36 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release.Build.0 = Release|Win32 | ||
| 37 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseAxp.ActiveCfg = ReleaseAxp|Win32 | ||
| 38 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseAxp.Build.0 = ReleaseAxp|Win32 | ||
| 39 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm.ActiveCfg = ReleaseWithoutAsm|Win32 | ||
| 40 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm.Build.0 = ReleaseWithoutAsm|Win32 | ||
| 41 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutCrtdll.ActiveCfg = ReleaseWithoutCrtdll|Win32 | ||
| 42 | {8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutCrtdll.Build.0 = ReleaseWithoutCrtdll|Win32 | ||
| 43 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug.ActiveCfg = Debug|Win32 | ||
| 44 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug.Build.0 = Debug|Win32 | ||
| 45 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release.ActiveCfg = Release|Win32 | ||
| 46 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release.Build.0 = Release|Win32 | ||
| 47 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseAxp.ActiveCfg = Release|Win32 | ||
| 48 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseAxp.Build.0 = Release|Win32 | ||
| 49 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm.ActiveCfg = Release|Win32 | ||
| 50 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm.Build.0 = Release|Win32 | ||
| 51 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutCrtdll.ActiveCfg = Release|Win32 | ||
| 52 | {48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutCrtdll.Build.0 = Release|Win32 | ||
| 53 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug.ActiveCfg = Debug|Win32 | ||
| 54 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug.Build.0 = Debug|Win32 | ||
| 55 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release.ActiveCfg = Release|Win32 | ||
| 56 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release.Build.0 = Release|Win32 | ||
| 57 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseAxp.ActiveCfg = Release|Win32 | ||
| 58 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseAxp.Build.0 = Release|Win32 | ||
| 59 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm.ActiveCfg = Release|Win32 | ||
| 60 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm.Build.0 = Release|Win32 | ||
| 61 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutCrtdll.ActiveCfg = Release|Win32 | ||
| 62 | {C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutCrtdll.Build.0 = Release|Win32 | ||
| 63 | {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.Debug.ActiveCfg = Debug|Win32 | ||
| 64 | {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.Debug.Build.0 = Debug|Win32 | ||
| 65 | {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.Release.ActiveCfg = Release|Win32 | ||
| 66 | {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.Release.Build.0 = Release|Win32 | ||
| 67 | {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseAxp.ActiveCfg = Release|Win32 | ||
| 68 | {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseAxp.Build.0 = Release|Win32 | ||
| 69 | {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseWithoutAsm.ActiveCfg = Release|Win32 | ||
| 70 | {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseWithoutAsm.Build.0 = Release|Win32 | ||
| 71 | {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseWithoutCrtdll.ActiveCfg = Release|Win32 | ||
| 72 | {AA6666AA-E09F-4135-9C0C-4FE50C3C654C}.ReleaseWithoutCrtdll.Build.0 = Release|Win32 | ||
| 73 | EndGlobalSection | ||
| 74 | GlobalSection(ExtensibilityGlobals) = postSolution | ||
| 75 | EndGlobalSection | ||
| 76 | GlobalSection(ExtensibilityAddIns) = postSolution | ||
| 77 | EndGlobalSection | ||
| 78 | EndGlobal | ||
diff --git a/contrib/vstudio/vc7/zlibvc.vcproj b/contrib/vstudio/vc7/zlibvc.vcproj deleted file mode 100644 index 2c66643..0000000 --- a/contrib/vstudio/vc7/zlibvc.vcproj +++ /dev/null | |||
| @@ -1,457 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding = "Windows-1252"?> | ||
| 2 | <VisualStudioProject | ||
| 3 | ProjectType="Visual C++" | ||
| 4 | Version="7.00" | ||
| 5 | Name="zlibvc" | ||
| 6 | SccProjectName="" | ||
| 7 | SccLocalPath=""> | ||
| 8 | <Platforms> | ||
| 9 | <Platform | ||
| 10 | Name="Win32"/> | ||
| 11 | </Platforms> | ||
| 12 | <Configurations> | ||
| 13 | <Configuration | ||
| 14 | Name="Debug|Win32" | ||
| 15 | OutputDirectory=".\DebugDll" | ||
| 16 | IntermediateDirectory=".\DebugDll" | ||
| 17 | ConfigurationType="2" | ||
| 18 | UseOfMFC="0" | ||
| 19 | ATLMinimizesCRunTimeLibraryUsage="FALSE"> | ||
| 20 | <Tool | ||
| 21 | Name="VCCLCompilerTool" | ||
| 22 | Optimization="0" | ||
| 23 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | ||
| 24 | PreprocessorDefinitions="WIN32,ZLIB_WINAPI,ASMV,ASMINF" | ||
| 25 | ExceptionHandling="FALSE" | ||
| 26 | RuntimeLibrary="1" | ||
| 27 | PrecompiledHeaderFile=".\DebugDll/zlibvc.pch" | ||
| 28 | AssemblerListingLocation=".\DebugDll/" | ||
| 29 | ObjectFile=".\DebugDll/" | ||
| 30 | ProgramDataBaseFileName=".\DebugDll/" | ||
| 31 | WarningLevel="3" | ||
| 32 | SuppressStartupBanner="TRUE" | ||
| 33 | DebugInformationFormat="4"/> | ||
| 34 | <Tool | ||
| 35 | Name="VCCustomBuildTool"/> | ||
| 36 | <Tool | ||
| 37 | Name="VCLinkerTool" | ||
| 38 | AdditionalOptions="/MACHINE:I386" | ||
| 39 | AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj" | ||
| 40 | OutputFile=".\DebugDll\zlibwapi.dll" | ||
| 41 | LinkIncremental="2" | ||
| 42 | SuppressStartupBanner="TRUE" | ||
| 43 | ModuleDefinitionFile=".\zlibvc.def" | ||
| 44 | GenerateDebugInformation="TRUE" | ||
| 45 | ProgramDatabaseFile=".\DebugDll/zlibwapi.pdb" | ||
| 46 | SubSystem="2" | ||
| 47 | ImportLibrary=".\DebugDll/zlibwapi.lib"/> | ||
| 48 | <Tool | ||
| 49 | Name="VCMIDLTool" | ||
| 50 | PreprocessorDefinitions="_DEBUG" | ||
| 51 | MkTypLibCompatible="TRUE" | ||
| 52 | SuppressStartupBanner="TRUE" | ||
| 53 | TargetEnvironment="1" | ||
| 54 | TypeLibraryName=".\DebugDll/zlibvc.tlb"/> | ||
| 55 | <Tool | ||
| 56 | Name="VCPostBuildEventTool"/> | ||
| 57 | <Tool | ||
| 58 | Name="VCPreBuildEventTool"/> | ||
| 59 | <Tool | ||
| 60 | Name="VCPreLinkEventTool"/> | ||
| 61 | <Tool | ||
| 62 | Name="VCResourceCompilerTool" | ||
| 63 | PreprocessorDefinitions="_DEBUG" | ||
| 64 | Culture="1036"/> | ||
| 65 | <Tool | ||
| 66 | Name="VCWebServiceProxyGeneratorTool"/> | ||
| 67 | <Tool | ||
| 68 | Name="VCWebDeploymentTool"/> | ||
| 69 | </Configuration> | ||
| 70 | <Configuration | ||
| 71 | Name="ReleaseWithoutAsm|Win32" | ||
| 72 | OutputDirectory=".\zlibDllWithoutAsm" | ||
| 73 | IntermediateDirectory=".\zlibDllWithoutAsm" | ||
| 74 | ConfigurationType="2" | ||
| 75 | UseOfMFC="0" | ||
| 76 | ATLMinimizesCRunTimeLibraryUsage="FALSE" | ||
| 77 | WholeProgramOptimization="TRUE"> | ||
| 78 | <Tool | ||
| 79 | Name="VCCLCompilerTool" | ||
| 80 | InlineFunctionExpansion="1" | ||
| 81 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | ||
| 82 | PreprocessorDefinitions="WIN32,ZLIB_WINAPI" | ||
| 83 | StringPooling="TRUE" | ||
| 84 | ExceptionHandling="FALSE" | ||
| 85 | RuntimeLibrary="0" | ||
| 86 | EnableFunctionLevelLinking="TRUE" | ||
| 87 | PrecompiledHeaderFile=".\zlibDllWithoutAsm/zlibvc.pch" | ||
| 88 | AssemblerOutput="2" | ||
| 89 | AssemblerListingLocation=".\zlibDllWithoutAsm/" | ||
| 90 | ObjectFile=".\zlibDllWithoutAsm/" | ||
| 91 | ProgramDataBaseFileName=".\zlibDllWithoutAsm/" | ||
| 92 | BrowseInformation="1" | ||
| 93 | WarningLevel="3" | ||
| 94 | SuppressStartupBanner="TRUE"/> | ||
| 95 | <Tool | ||
| 96 | Name="VCCustomBuildTool"/> | ||
| 97 | <Tool | ||
| 98 | Name="VCLinkerTool" | ||
| 99 | AdditionalOptions="/MACHINE:I386" | ||
| 100 | AdditionalDependencies="crtdll.lib" | ||
| 101 | OutputFile=".\zlibDllWithoutAsm\zlibwapi.dll" | ||
| 102 | LinkIncremental="1" | ||
| 103 | SuppressStartupBanner="TRUE" | ||
| 104 | IgnoreAllDefaultLibraries="TRUE" | ||
| 105 | ModuleDefinitionFile=".\zlibvc.def" | ||
| 106 | ProgramDatabaseFile=".\zlibDllWithoutAsm/zlibwapi.pdb" | ||
| 107 | GenerateMapFile="TRUE" | ||
| 108 | MapFileName=".\zlibDllWithoutAsm/zlibwapi.map" | ||
| 109 | SubSystem="2" | ||
| 110 | OptimizeForWindows98="1" | ||
| 111 | ImportLibrary=".\zlibDllWithoutAsm/zlibwapi.lib"/> | ||
| 112 | <Tool | ||
| 113 | Name="VCMIDLTool" | ||
| 114 | PreprocessorDefinitions="NDEBUG" | ||
| 115 | MkTypLibCompatible="TRUE" | ||
| 116 | SuppressStartupBanner="TRUE" | ||
| 117 | TargetEnvironment="1" | ||
| 118 | TypeLibraryName=".\zlibDllWithoutAsm/zlibvc.tlb"/> | ||
| 119 | <Tool | ||
| 120 | Name="VCPostBuildEventTool"/> | ||
| 121 | <Tool | ||
| 122 | Name="VCPreBuildEventTool"/> | ||
| 123 | <Tool | ||
| 124 | Name="VCPreLinkEventTool"/> | ||
| 125 | <Tool | ||
| 126 | Name="VCResourceCompilerTool" | ||
| 127 | PreprocessorDefinitions="NDEBUG" | ||
| 128 | Culture="1036"/> | ||
| 129 | <Tool | ||
| 130 | Name="VCWebServiceProxyGeneratorTool"/> | ||
| 131 | <Tool | ||
| 132 | Name="VCWebDeploymentTool"/> | ||
| 133 | </Configuration> | ||
| 134 | <Configuration | ||
| 135 | Name="ReleaseWithoutCrtdll|Win32" | ||
| 136 | OutputDirectory=".\zlibDllWithoutCrtDll" | ||
| 137 | IntermediateDirectory=".\zlibDllWithoutCrtDll" | ||
| 138 | ConfigurationType="2" | ||
| 139 | UseOfMFC="0" | ||
| 140 | ATLMinimizesCRunTimeLibraryUsage="FALSE" | ||
| 141 | WholeProgramOptimization="TRUE"> | ||
| 142 | <Tool | ||
| 143 | Name="VCCLCompilerTool" | ||
| 144 | InlineFunctionExpansion="1" | ||
| 145 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | ||
| 146 | PreprocessorDefinitions="WIN32,ZLIB_WINAPI,ASMV,ASMINF" | ||
| 147 | StringPooling="TRUE" | ||
| 148 | ExceptionHandling="FALSE" | ||
| 149 | RuntimeLibrary="0" | ||
| 150 | EnableFunctionLevelLinking="TRUE" | ||
| 151 | PrecompiledHeaderFile=".\zlibDllWithoutCrtDll/zlibvc.pch" | ||
| 152 | AssemblerOutput="2" | ||
| 153 | AssemblerListingLocation=".\zlibDllWithoutCrtDll/" | ||
| 154 | ObjectFile=".\zlibDllWithoutCrtDll/" | ||
| 155 | ProgramDataBaseFileName=".\zlibDllWithoutCrtDll/" | ||
| 156 | BrowseInformation="1" | ||
| 157 | WarningLevel="3" | ||
| 158 | SuppressStartupBanner="TRUE"/> | ||
| 159 | <Tool | ||
| 160 | Name="VCCustomBuildTool"/> | ||
| 161 | <Tool | ||
| 162 | Name="VCLinkerTool" | ||
| 163 | AdditionalOptions="/MACHINE:I386" | ||
| 164 | AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj " | ||
| 165 | OutputFile=".\zlibDllWithoutCrtDll\zlibwapi.dll" | ||
| 166 | LinkIncremental="1" | ||
| 167 | SuppressStartupBanner="TRUE" | ||
| 168 | IgnoreAllDefaultLibraries="FALSE" | ||
| 169 | ModuleDefinitionFile=".\zlibvc.def" | ||
| 170 | ProgramDatabaseFile=".\zlibDllWithoutCrtDll/zlibwapi.pdb" | ||
| 171 | GenerateMapFile="TRUE" | ||
| 172 | MapFileName=".\zlibDllWithoutCrtDll/zlibwapi.map" | ||
| 173 | SubSystem="2" | ||
| 174 | OptimizeForWindows98="1" | ||
| 175 | ImportLibrary=".\zlibDllWithoutCrtDll/zlibwapi.lib"/> | ||
| 176 | <Tool | ||
| 177 | Name="VCMIDLTool" | ||
| 178 | PreprocessorDefinitions="NDEBUG" | ||
| 179 | MkTypLibCompatible="TRUE" | ||
| 180 | SuppressStartupBanner="TRUE" | ||
| 181 | TargetEnvironment="1" | ||
| 182 | TypeLibraryName=".\zlibDllWithoutCrtDll/zlibvc.tlb"/> | ||
| 183 | <Tool | ||
| 184 | Name="VCPostBuildEventTool"/> | ||
| 185 | <Tool | ||
| 186 | Name="VCPreBuildEventTool"/> | ||
| 187 | <Tool | ||
| 188 | Name="VCPreLinkEventTool"/> | ||
| 189 | <Tool | ||
| 190 | Name="VCResourceCompilerTool" | ||
| 191 | PreprocessorDefinitions="NDEBUG" | ||
| 192 | Culture="1036"/> | ||
| 193 | <Tool | ||
| 194 | Name="VCWebServiceProxyGeneratorTool"/> | ||
| 195 | <Tool | ||
| 196 | Name="VCWebDeploymentTool"/> | ||
| 197 | </Configuration> | ||
| 198 | <Configuration | ||
| 199 | Name="ReleaseAxp|Win32" | ||
| 200 | OutputDirectory=".\zlibvc__" | ||
| 201 | IntermediateDirectory=".\zlibvc__" | ||
| 202 | ConfigurationType="2" | ||
| 203 | UseOfMFC="0" | ||
| 204 | ATLMinimizesCRunTimeLibraryUsage="FALSE" | ||
| 205 | WholeProgramOptimization="TRUE"> | ||
| 206 | <Tool | ||
| 207 | Name="VCCLCompilerTool" | ||
| 208 | InlineFunctionExpansion="1" | ||
| 209 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | ||
| 210 | PreprocessorDefinitions="WIN32,ZLIB_WINAPI" | ||
| 211 | StringPooling="TRUE" | ||
| 212 | ExceptionHandling="FALSE" | ||
| 213 | RuntimeLibrary="0" | ||
| 214 | EnableFunctionLevelLinking="TRUE" | ||
| 215 | PrecompiledHeaderFile=".\zlibvc__/zlibvc.pch" | ||
| 216 | AssemblerOutput="2" | ||
| 217 | AssemblerListingLocation=".\zlibvc__/" | ||
| 218 | ObjectFile=".\zlibvc__/" | ||
| 219 | ProgramDataBaseFileName=".\zlibvc__/" | ||
| 220 | BrowseInformation="1" | ||
| 221 | WarningLevel="3" | ||
| 222 | SuppressStartupBanner="TRUE"/> | ||
| 223 | <Tool | ||
| 224 | Name="VCCustomBuildTool"/> | ||
| 225 | <Tool | ||
| 226 | Name="VCLinkerTool" | ||
| 227 | AdditionalDependencies="crtdll.lib" | ||
| 228 | OutputFile="zlibvc__\zlibwapi.dll" | ||
| 229 | LinkIncremental="1" | ||
| 230 | SuppressStartupBanner="TRUE" | ||
| 231 | IgnoreAllDefaultLibraries="TRUE" | ||
| 232 | ModuleDefinitionFile=".\zlibvc.def" | ||
| 233 | ProgramDatabaseFile=".\zlibvc__/zlibwapi.pdb" | ||
| 234 | GenerateMapFile="TRUE" | ||
| 235 | MapFileName=".\zlibvc__/zlibwapi.map" | ||
| 236 | SubSystem="2" | ||
| 237 | ImportLibrary=".\zlibvc__/zlibwapi.lib"/> | ||
| 238 | <Tool | ||
| 239 | Name="VCMIDLTool" | ||
| 240 | PreprocessorDefinitions="NDEBUG" | ||
| 241 | MkTypLibCompatible="TRUE" | ||
| 242 | SuppressStartupBanner="TRUE" | ||
| 243 | TargetEnvironment="1" | ||
| 244 | TypeLibraryName=".\zlibvc__/zlibvc.tlb"/> | ||
| 245 | <Tool | ||
| 246 | Name="VCPostBuildEventTool"/> | ||
| 247 | <Tool | ||
| 248 | Name="VCPreBuildEventTool"/> | ||
| 249 | <Tool | ||
| 250 | Name="VCPreLinkEventTool"/> | ||
| 251 | <Tool | ||
| 252 | Name="VCResourceCompilerTool" | ||
| 253 | PreprocessorDefinitions="NDEBUG" | ||
| 254 | Culture="1036"/> | ||
| 255 | <Tool | ||
| 256 | Name="VCWebServiceProxyGeneratorTool"/> | ||
| 257 | <Tool | ||
| 258 | Name="VCWebDeploymentTool"/> | ||
| 259 | </Configuration> | ||
| 260 | <Configuration | ||
| 261 | Name="Release|Win32" | ||
| 262 | OutputDirectory=".\ReleaseDll" | ||
| 263 | IntermediateDirectory=".\ReleaseDll" | ||
| 264 | ConfigurationType="2" | ||
| 265 | UseOfMFC="0" | ||
| 266 | ATLMinimizesCRunTimeLibraryUsage="FALSE" | ||
| 267 | WholeProgramOptimization="TRUE"> | ||
| 268 | <Tool | ||
| 269 | Name="VCCLCompilerTool" | ||
| 270 | InlineFunctionExpansion="1" | ||
| 271 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | ||
| 272 | PreprocessorDefinitions="WIN32,ZLIB_WINAPI,ASMV,ASMINF" | ||
| 273 | StringPooling="TRUE" | ||
| 274 | ExceptionHandling="FALSE" | ||
| 275 | RuntimeLibrary="0" | ||
| 276 | EnableFunctionLevelLinking="TRUE" | ||
| 277 | PrecompiledHeaderFile=".\ReleaseDll/zlibvc.pch" | ||
| 278 | AssemblerOutput="2" | ||
| 279 | AssemblerListingLocation=".\ReleaseDll/" | ||
| 280 | ObjectFile=".\ReleaseDll/" | ||
| 281 | ProgramDataBaseFileName=".\ReleaseDll/" | ||
| 282 | BrowseInformation="1" | ||
| 283 | WarningLevel="3" | ||
| 284 | SuppressStartupBanner="TRUE"/> | ||
| 285 | <Tool | ||
| 286 | Name="VCCustomBuildTool"/> | ||
| 287 | <Tool | ||
| 288 | Name="VCLinkerTool" | ||
| 289 | AdditionalOptions="/MACHINE:I386" | ||
| 290 | AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj crtdll.lib" | ||
| 291 | OutputFile=".\ReleaseDll\zlibwapi.dll" | ||
| 292 | LinkIncremental="1" | ||
| 293 | SuppressStartupBanner="TRUE" | ||
| 294 | IgnoreAllDefaultLibraries="TRUE" | ||
| 295 | ModuleDefinitionFile=".\zlibvc.def" | ||
| 296 | ProgramDatabaseFile=".\ReleaseDll/zlibwapi.pdb" | ||
| 297 | GenerateMapFile="TRUE" | ||
| 298 | MapFileName=".\ReleaseDll/zlibwapi.map" | ||
| 299 | SubSystem="2" | ||
| 300 | OptimizeForWindows98="1" | ||
| 301 | ImportLibrary=".\ReleaseDll/zlibwapi.lib"/> | ||
| 302 | <Tool | ||
| 303 | Name="VCMIDLTool" | ||
| 304 | PreprocessorDefinitions="NDEBUG" | ||
| 305 | MkTypLibCompatible="TRUE" | ||
| 306 | SuppressStartupBanner="TRUE" | ||
| 307 | TargetEnvironment="1" | ||
| 308 | TypeLibraryName=".\Release/zlibvc.tlb"/> | ||
| 309 | <Tool | ||
| 310 | Name="VCPostBuildEventTool"/> | ||
| 311 | <Tool | ||
| 312 | Name="VCPreBuildEventTool"/> | ||
| 313 | <Tool | ||
| 314 | Name="VCPreLinkEventTool"/> | ||
| 315 | <Tool | ||
| 316 | Name="VCResourceCompilerTool" | ||
| 317 | PreprocessorDefinitions="NDEBUG" | ||
| 318 | Culture="1036"/> | ||
| 319 | <Tool | ||
| 320 | Name="VCWebServiceProxyGeneratorTool"/> | ||
| 321 | <Tool | ||
| 322 | Name="VCWebDeploymentTool"/> | ||
| 323 | </Configuration> | ||
| 324 | </Configurations> | ||
| 325 | <Files> | ||
| 326 | <Filter | ||
| 327 | Name="Source Files" | ||
| 328 | Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"> | ||
| 329 | <File | ||
| 330 | RelativePath="..\..\..\adler32.c"> | ||
| 331 | </File> | ||
| 332 | <File | ||
| 333 | RelativePath="..\..\..\compress.c"> | ||
| 334 | </File> | ||
| 335 | <File | ||
| 336 | RelativePath="..\..\..\crc32.c"> | ||
| 337 | </File> | ||
| 338 | <File | ||
| 339 | RelativePath="..\..\..\deflate.c"> | ||
| 340 | </File> | ||
| 341 | <File | ||
| 342 | RelativePath="..\..\masmx86\gvmat32c.c"> | ||
| 343 | <FileConfiguration | ||
| 344 | Name="ReleaseWithoutAsm|Win32" | ||
| 345 | ExcludedFromBuild="TRUE"> | ||
| 346 | <Tool | ||
| 347 | Name="VCCLCompilerTool"/> | ||
| 348 | </FileConfiguration> | ||
| 349 | </File> | ||
| 350 | <File | ||
| 351 | RelativePath="..\..\..\gzclose.c"> | ||
| 352 | </File> | ||
| 353 | <File | ||
| 354 | RelativePath="..\..\..\gzio.c"> | ||
| 355 | </File> | ||
| 356 | <File | ||
| 357 | RelativePath="..\..\..\gzlib.c"> | ||
| 358 | </File> | ||
| 359 | <File | ||
| 360 | RelativePath="..\..\..\gzread.c"> | ||
| 361 | </File> | ||
| 362 | <File | ||
| 363 | RelativePath="..\..\..\gzwrite.c"> | ||
| 364 | </File> | ||
| 365 | <File | ||
| 366 | RelativePath="..\..\..\infback.c"> | ||
| 367 | </File> | ||
| 368 | <File | ||
| 369 | RelativePath="..\..\..\inffast.c"> | ||
| 370 | </File> | ||
| 371 | <File | ||
| 372 | RelativePath="..\..\..\inflate.c"> | ||
| 373 | </File> | ||
| 374 | <File | ||
| 375 | RelativePath="..\..\..\inftrees.c"> | ||
| 376 | </File> | ||
| 377 | <File | ||
| 378 | RelativePath="..\..\minizip\ioapi.c"> | ||
| 379 | </File> | ||
| 380 | <File | ||
| 381 | RelativePath="..\..\minizip\iowin32.c"> | ||
| 382 | </File> | ||
| 383 | <File | ||
| 384 | RelativePath="..\..\..\trees.c"> | ||
| 385 | </File> | ||
| 386 | <File | ||
| 387 | RelativePath="..\..\..\uncompr.c"> | ||
| 388 | </File> | ||
| 389 | <File | ||
| 390 | RelativePath="..\..\minizip\unzip.c"> | ||
| 391 | <FileConfiguration | ||
| 392 | Name="Release|Win32"> | ||
| 393 | <Tool | ||
| 394 | Name="VCCLCompilerTool" | ||
| 395 | AdditionalIncludeDirectories="" | ||
| 396 | PreprocessorDefinitions="ZLIB_INTERNAL"/> | ||
| 397 | </FileConfiguration> | ||
| 398 | </File> | ||
| 399 | <File | ||
| 400 | RelativePath="..\..\minizip\zip.c"> | ||
| 401 | <FileConfiguration | ||
| 402 | Name="Release|Win32"> | ||
| 403 | <Tool | ||
| 404 | Name="VCCLCompilerTool" | ||
| 405 | AdditionalIncludeDirectories="" | ||
| 406 | PreprocessorDefinitions="ZLIB_INTERNAL"/> | ||
| 407 | </FileConfiguration> | ||
| 408 | </File> | ||
| 409 | <File | ||
| 410 | RelativePath=".\zlib.rc"> | ||
| 411 | </File> | ||
| 412 | <File | ||
| 413 | RelativePath=".\zlibvc.def"> | ||
| 414 | </File> | ||
| 415 | <File | ||
| 416 | RelativePath="..\..\..\zutil.c"> | ||
| 417 | </File> | ||
| 418 | </Filter> | ||
| 419 | <Filter | ||
| 420 | Name="Header Files" | ||
| 421 | Filter="h;hpp;hxx;hm;inl;fi;fd"> | ||
| 422 | <File | ||
| 423 | RelativePath="..\..\..\deflate.h"> | ||
| 424 | </File> | ||
| 425 | <File | ||
| 426 | RelativePath="..\..\..\infblock.h"> | ||
| 427 | </File> | ||
| 428 | <File | ||
| 429 | RelativePath="..\..\..\infcodes.h"> | ||
| 430 | </File> | ||
| 431 | <File | ||
| 432 | RelativePath="..\..\..\inffast.h"> | ||
| 433 | </File> | ||
| 434 | <File | ||
| 435 | RelativePath="..\..\..\inftrees.h"> | ||
| 436 | </File> | ||
| 437 | <File | ||
| 438 | RelativePath="..\..\..\infutil.h"> | ||
| 439 | </File> | ||
| 440 | <File | ||
| 441 | RelativePath="..\..\..\zconf.h"> | ||
| 442 | </File> | ||
| 443 | <File | ||
| 444 | RelativePath="..\..\..\zlib.h"> | ||
| 445 | </File> | ||
| 446 | <File | ||
| 447 | RelativePath="..\..\..\zutil.h"> | ||
| 448 | </File> | ||
| 449 | </Filter> | ||
| 450 | <Filter | ||
| 451 | Name="Resource Files" | ||
| 452 | Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe"> | ||
| 453 | </Filter> | ||
| 454 | </Files> | ||
| 455 | <Globals> | ||
| 456 | </Globals> | ||
| 457 | </VisualStudioProject> | ||
diff --git a/contrib/vstudio/vc8/zlibvc.def b/contrib/vstudio/vc8/zlibvc.def index a40e715..0b6a9e9 100644 --- a/contrib/vstudio/vc8/zlibvc.def +++ b/contrib/vstudio/vc8/zlibvc.def | |||
| @@ -90,3 +90,25 @@ EXPORTS | |||
| 90 | unzGoToFilePos @101 | 90 | unzGoToFilePos @101 |
| 91 | 91 | ||
| 92 | fill_win32_filefunc @110 | 92 | fill_win32_filefunc @110 |
| 93 | fill_win32_filefunc64 @111 | ||
| 94 | fill_win32_filefunc64A @112 | ||
| 95 | fill_win32_filefunc64W @113 | ||
| 96 | |||
| 97 | ; quick hack by hkuno@microhouse.co.jp | ||
| 98 | unzOpen64 @120 | ||
| 99 | unzOpen2_64 @121 | ||
| 100 | unzGetGlobalInfo64 @122 | ||
| 101 | unzGetCurrentFileInfo64 @124 | ||
| 102 | unzGetCurrentFileZStreamPos64 @125 | ||
| 103 | unztell64 @126 | ||
| 104 | unzGetFilePos64 @127 | ||
| 105 | unzGoToFilePos64 @128 | ||
| 106 | |||
| 107 | zipOpen64 @130 | ||
| 108 | zipOpen2_64 @131 | ||
| 109 | zipOpenNewFileInZip64 @132 | ||
| 110 | zipOpenNewFileInZip2_64 @133 | ||
| 111 | zipOpenNewFileInZip3_64 @134 | ||
| 112 | zipOpenNewFileInZip4_64 @135 | ||
| 113 | zipCloseFileInZipRaw64 @136 | ||
| 114 | ; end hack | ||
diff --git a/contrib/vstudio/vc8/zlibvc.vcproj b/contrib/vstudio/vc8/zlibvc.vcproj deleted file mode 100644 index f06273b..0000000 --- a/contrib/vstudio/vc8/zlibvc.vcproj +++ /dev/null | |||
| @@ -1,1230 +0,0 @@ | |||
| 1 | <?xml version="1.0" encoding="Windows-1252"?> | ||
| 2 | <VisualStudioProject | ||
| 3 | ProjectType="Visual C++" | ||
| 4 | Version="8,00" | ||
| 5 | Name="zlibvc" | ||
| 6 | ProjectGUID="{8FD826F8-3739-44E6-8CC8-997122E53B8D}" | ||
| 7 | > | ||
| 8 | <Platforms> | ||
| 9 | <Platform | ||
| 10 | Name="Win32" | ||
| 11 | /> | ||
| 12 | <Platform | ||
| 13 | Name="x64" | ||
| 14 | /> | ||
| 15 | <Platform | ||
| 16 | Name="Itanium" | ||
| 17 | /> | ||
| 18 | </Platforms> | ||
| 19 | <ToolFiles> | ||
| 20 | </ToolFiles> | ||
| 21 | <Configurations> | ||
| 22 | <Configuration | ||
| 23 | Name="Debug|Win32" | ||
| 24 | OutputDirectory="x86\ZlibDll$(ConfigurationName)" | ||
| 25 | IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp" | ||
| 26 | ConfigurationType="2" | ||
| 27 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | ||
| 28 | UseOfMFC="0" | ||
| 29 | ATLMinimizesCRunTimeLibraryUsage="false" | ||
| 30 | > | ||
| 31 | <Tool | ||
| 32 | Name="VCPreBuildEventTool" | ||
| 33 | /> | ||
| 34 | <Tool | ||
| 35 | Name="VCCustomBuildTool" | ||
| 36 | /> | ||
| 37 | <Tool | ||
| 38 | Name="VCXMLDataGeneratorTool" | ||
| 39 | /> | ||
| 40 | <Tool | ||
| 41 | Name="VCWebServiceProxyGeneratorTool" | ||
| 42 | /> | ||
| 43 | <Tool | ||
| 44 | Name="VCMIDLTool" | ||
| 45 | PreprocessorDefinitions="_DEBUG" | ||
| 46 | MkTypLibCompatible="true" | ||
| 47 | SuppressStartupBanner="true" | ||
| 48 | TargetEnvironment="1" | ||
| 49 | TypeLibraryName="$(OutDir)/zlibvc.tlb" | ||
| 50 | /> | ||
| 51 | <Tool | ||
| 52 | Name="VCCLCompilerTool" | ||
| 53 | Optimization="0" | ||
| 54 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | ||
| 55 | PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI,ASMV,ASMINF" | ||
| 56 | ExceptionHandling="0" | ||
| 57 | RuntimeLibrary="1" | ||
| 58 | BufferSecurityCheck="false" | ||
| 59 | PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" | ||
| 60 | AssemblerListingLocation="$(IntDir)\" | ||
| 61 | ObjectFile="$(IntDir)\" | ||
| 62 | ProgramDataBaseFileName="$(OutDir)\" | ||
| 63 | BrowseInformation="0" | ||
| 64 | WarningLevel="3" | ||
| 65 | SuppressStartupBanner="true" | ||
| 66 | DebugInformationFormat="4" | ||
| 67 | /> | ||
| 68 | <Tool | ||
| 69 | Name="VCManagedResourceCompilerTool" | ||
| 70 | /> | ||
| 71 | <Tool | ||
| 72 | Name="VCResourceCompilerTool" | ||
| 73 | PreprocessorDefinitions="_DEBUG" | ||
| 74 | Culture="1036" | ||
| 75 | /> | ||
| 76 | <Tool | ||
| 77 | Name="VCPreLinkEventTool" | ||
| 78 | /> | ||
| 79 | <Tool | ||
| 80 | Name="VCLinkerTool" | ||
| 81 | AdditionalOptions="/MACHINE:I386" | ||
| 82 | AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj" | ||
| 83 | OutputFile="$(OutDir)\zlibwapi.dll" | ||
| 84 | LinkIncremental="2" | ||
| 85 | SuppressStartupBanner="true" | ||
| 86 | GenerateManifest="false" | ||
| 87 | ModuleDefinitionFile=".\zlibvc.def" | ||
| 88 | GenerateDebugInformation="true" | ||
| 89 | ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" | ||
| 90 | GenerateMapFile="true" | ||
| 91 | MapFileName="$(OutDir)/zlibwapi.map" | ||
| 92 | SubSystem="2" | ||
| 93 | ImportLibrary="$(OutDir)/zlibwapi.lib" | ||
| 94 | /> | ||
| 95 | <Tool | ||
| 96 | Name="VCALinkTool" | ||
| 97 | /> | ||
| 98 | <Tool | ||
| 99 | Name="VCManifestTool" | ||
| 100 | /> | ||
| 101 | <Tool | ||
| 102 | Name="VCXDCMakeTool" | ||
| 103 | /> | ||
| 104 | <Tool | ||
| 105 | Name="VCBscMakeTool" | ||
| 106 | /> | ||
| 107 | <Tool | ||
| 108 | Name="VCFxCopTool" | ||
| 109 | /> | ||
| 110 | <Tool | ||
| 111 | Name="VCAppVerifierTool" | ||
| 112 | /> | ||
| 113 | <Tool | ||
| 114 | Name="VCWebDeploymentTool" | ||
| 115 | /> | ||
| 116 | <Tool | ||
| 117 | Name="VCPostBuildEventTool" | ||
| 118 | /> | ||
| 119 | </Configuration> | ||
| 120 | <Configuration | ||
| 121 | Name="Debug|x64" | ||
| 122 | OutputDirectory="x64\ZlibDll$(ConfigurationName)" | ||
| 123 | IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp" | ||
| 124 | ConfigurationType="2" | ||
| 125 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | ||
| 126 | UseOfMFC="0" | ||
| 127 | ATLMinimizesCRunTimeLibraryUsage="false" | ||
| 128 | > | ||
| 129 | <Tool | ||
| 130 | Name="VCPreBuildEventTool" | ||
| 131 | /> | ||
| 132 | <Tool | ||
| 133 | Name="VCCustomBuildTool" | ||
| 134 | /> | ||
| 135 | <Tool | ||
| 136 | Name="VCXMLDataGeneratorTool" | ||
| 137 | /> | ||
| 138 | <Tool | ||
| 139 | Name="VCWebServiceProxyGeneratorTool" | ||
| 140 | /> | ||
| 141 | <Tool | ||
| 142 | Name="VCMIDLTool" | ||
| 143 | PreprocessorDefinitions="_DEBUG" | ||
| 144 | MkTypLibCompatible="true" | ||
| 145 | SuppressStartupBanner="true" | ||
| 146 | TargetEnvironment="3" | ||
| 147 | TypeLibraryName="$(OutDir)/zlibvc.tlb" | ||
| 148 | /> | ||
| 149 | <Tool | ||
| 150 | Name="VCCLCompilerTool" | ||
| 151 | Optimization="0" | ||
| 152 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | ||
| 153 | PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI,ASMV,ASMINF;WIN64" | ||
| 154 | ExceptionHandling="0" | ||
| 155 | RuntimeLibrary="3" | ||
| 156 | BufferSecurityCheck="false" | ||
| 157 | PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" | ||
| 158 | AssemblerListingLocation="$(IntDir)\" | ||
| 159 | ObjectFile="$(IntDir)\" | ||
| 160 | ProgramDataBaseFileName="$(OutDir)\" | ||
| 161 | BrowseInformation="0" | ||
| 162 | WarningLevel="3" | ||
| 163 | SuppressStartupBanner="true" | ||
| 164 | DebugInformationFormat="3" | ||
| 165 | /> | ||
| 166 | <Tool | ||
| 167 | Name="VCManagedResourceCompilerTool" | ||
| 168 | /> | ||
| 169 | <Tool | ||
| 170 | Name="VCResourceCompilerTool" | ||
| 171 | PreprocessorDefinitions="_DEBUG" | ||
| 172 | Culture="1036" | ||
| 173 | /> | ||
| 174 | <Tool | ||
| 175 | Name="VCPreLinkEventTool" | ||
| 176 | /> | ||
| 177 | <Tool | ||
| 178 | Name="VCLinkerTool" | ||
| 179 | AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj " | ||
| 180 | OutputFile="$(OutDir)\zlibwapi.dll" | ||
| 181 | LinkIncremental="2" | ||
| 182 | SuppressStartupBanner="true" | ||
| 183 | GenerateManifest="false" | ||
| 184 | ModuleDefinitionFile=".\zlibvc.def" | ||
| 185 | GenerateDebugInformation="true" | ||
| 186 | ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" | ||
| 187 | GenerateMapFile="true" | ||
| 188 | MapFileName="$(OutDir)/zlibwapi.map" | ||
| 189 | SubSystem="2" | ||
| 190 | ImportLibrary="$(OutDir)/zlibwapi.lib" | ||
| 191 | TargetMachine="17" | ||
| 192 | /> | ||
| 193 | <Tool | ||
| 194 | Name="VCALinkTool" | ||
| 195 | /> | ||
| 196 | <Tool | ||
| 197 | Name="VCManifestTool" | ||
| 198 | /> | ||
| 199 | <Tool | ||
| 200 | Name="VCXDCMakeTool" | ||
| 201 | /> | ||
| 202 | <Tool | ||
| 203 | Name="VCBscMakeTool" | ||
| 204 | /> | ||
| 205 | <Tool | ||
| 206 | Name="VCFxCopTool" | ||
| 207 | /> | ||
| 208 | <Tool | ||
| 209 | Name="VCAppVerifierTool" | ||
| 210 | /> | ||
| 211 | <Tool | ||
| 212 | Name="VCWebDeploymentTool" | ||
| 213 | /> | ||
| 214 | <Tool | ||
| 215 | Name="VCPostBuildEventTool" | ||
| 216 | /> | ||
| 217 | </Configuration> | ||
| 218 | <Configuration | ||
| 219 | Name="Debug|Itanium" | ||
| 220 | OutputDirectory="ia64\ZlibDll$(ConfigurationName)" | ||
| 221 | IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp" | ||
| 222 | ConfigurationType="2" | ||
| 223 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | ||
| 224 | UseOfMFC="0" | ||
| 225 | ATLMinimizesCRunTimeLibraryUsage="false" | ||
| 226 | > | ||
| 227 | <Tool | ||
| 228 | Name="VCPreBuildEventTool" | ||
| 229 | /> | ||
| 230 | <Tool | ||
| 231 | Name="VCCustomBuildTool" | ||
| 232 | /> | ||
| 233 | <Tool | ||
| 234 | Name="VCXMLDataGeneratorTool" | ||
| 235 | /> | ||
| 236 | <Tool | ||
| 237 | Name="VCWebServiceProxyGeneratorTool" | ||
| 238 | /> | ||
| 239 | <Tool | ||
| 240 | Name="VCMIDLTool" | ||
| 241 | PreprocessorDefinitions="_DEBUG" | ||
| 242 | MkTypLibCompatible="true" | ||
| 243 | SuppressStartupBanner="true" | ||
| 244 | TargetEnvironment="2" | ||
| 245 | TypeLibraryName="$(OutDir)/zlibvc.tlb" | ||
| 246 | /> | ||
| 247 | <Tool | ||
| 248 | Name="VCCLCompilerTool" | ||
| 249 | Optimization="0" | ||
| 250 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | ||
| 251 | PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;WIN64" | ||
| 252 | ExceptionHandling="0" | ||
| 253 | RuntimeLibrary="3" | ||
| 254 | BufferSecurityCheck="false" | ||
| 255 | PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" | ||
| 256 | AssemblerListingLocation="$(IntDir)\" | ||
| 257 | ObjectFile="$(IntDir)\" | ||
| 258 | ProgramDataBaseFileName="$(OutDir)\" | ||
| 259 | BrowseInformation="0" | ||
| 260 | WarningLevel="3" | ||
| 261 | SuppressStartupBanner="true" | ||
| 262 | DebugInformationFormat="3" | ||
| 263 | /> | ||
| 264 | <Tool | ||
| 265 | Name="VCManagedResourceCompilerTool" | ||
| 266 | /> | ||
| 267 | <Tool | ||
| 268 | Name="VCResourceCompilerTool" | ||
| 269 | PreprocessorDefinitions="_DEBUG" | ||
| 270 | Culture="1036" | ||
| 271 | /> | ||
| 272 | <Tool | ||
| 273 | Name="VCPreLinkEventTool" | ||
| 274 | /> | ||
| 275 | <Tool | ||
| 276 | Name="VCLinkerTool" | ||
| 277 | OutputFile="$(OutDir)\zlibwapi.dll" | ||
| 278 | LinkIncremental="2" | ||
| 279 | SuppressStartupBanner="true" | ||
| 280 | GenerateManifest="false" | ||
| 281 | ModuleDefinitionFile=".\zlibvc.def" | ||
| 282 | GenerateDebugInformation="true" | ||
| 283 | ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" | ||
| 284 | GenerateMapFile="true" | ||
| 285 | MapFileName="$(OutDir)/zlibwapi.map" | ||
| 286 | SubSystem="2" | ||
| 287 | ImportLibrary="$(OutDir)/zlibwapi.lib" | ||
| 288 | TargetMachine="5" | ||
| 289 | /> | ||
| 290 | <Tool | ||
| 291 | Name="VCALinkTool" | ||
| 292 | /> | ||
| 293 | <Tool | ||
| 294 | Name="VCManifestTool" | ||
| 295 | /> | ||
| 296 | <Tool | ||
| 297 | Name="VCXDCMakeTool" | ||
| 298 | /> | ||
| 299 | <Tool | ||
| 300 | Name="VCBscMakeTool" | ||
| 301 | /> | ||
| 302 | <Tool | ||
| 303 | Name="VCFxCopTool" | ||
| 304 | /> | ||
| 305 | <Tool | ||
| 306 | Name="VCAppVerifierTool" | ||
| 307 | /> | ||
| 308 | <Tool | ||
| 309 | Name="VCWebDeploymentTool" | ||
| 310 | /> | ||
| 311 | <Tool | ||
| 312 | Name="VCPostBuildEventTool" | ||
| 313 | /> | ||
| 314 | </Configuration> | ||
| 315 | <Configuration | ||
| 316 | Name="ReleaseWithoutAsm|Win32" | ||
| 317 | OutputDirectory="x86\ZlibDll$(ConfigurationName)" | ||
| 318 | IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp" | ||
| 319 | ConfigurationType="2" | ||
| 320 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | ||
| 321 | UseOfMFC="0" | ||
| 322 | ATLMinimizesCRunTimeLibraryUsage="false" | ||
| 323 | WholeProgramOptimization="1" | ||
| 324 | > | ||
| 325 | <Tool | ||
| 326 | Name="VCPreBuildEventTool" | ||
| 327 | /> | ||
| 328 | <Tool | ||
| 329 | Name="VCCustomBuildTool" | ||
| 330 | /> | ||
| 331 | <Tool | ||
| 332 | Name="VCXMLDataGeneratorTool" | ||
| 333 | /> | ||
| 334 | <Tool | ||
| 335 | Name="VCWebServiceProxyGeneratorTool" | ||
| 336 | /> | ||
| 337 | <Tool | ||
| 338 | Name="VCMIDLTool" | ||
| 339 | PreprocessorDefinitions="NDEBUG" | ||
| 340 | MkTypLibCompatible="true" | ||
| 341 | SuppressStartupBanner="true" | ||
| 342 | TargetEnvironment="1" | ||
| 343 | TypeLibraryName="$(OutDir)/zlibvc.tlb" | ||
| 344 | /> | ||
| 345 | <Tool | ||
| 346 | Name="VCCLCompilerTool" | ||
| 347 | InlineFunctionExpansion="1" | ||
| 348 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | ||
| 349 | PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI" | ||
| 350 | StringPooling="true" | ||
| 351 | ExceptionHandling="0" | ||
| 352 | RuntimeLibrary="2" | ||
| 353 | BufferSecurityCheck="false" | ||
| 354 | EnableFunctionLevelLinking="true" | ||
| 355 | PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" | ||
| 356 | AssemblerOutput="2" | ||
| 357 | AssemblerListingLocation="$(IntDir)\" | ||
| 358 | ObjectFile="$(IntDir)\" | ||
| 359 | ProgramDataBaseFileName="$(OutDir)\" | ||
| 360 | BrowseInformation="0" | ||
| 361 | WarningLevel="3" | ||
| 362 | SuppressStartupBanner="true" | ||
| 363 | /> | ||
| 364 | <Tool | ||
| 365 | Name="VCManagedResourceCompilerTool" | ||
| 366 | /> | ||
| 367 | <Tool | ||
| 368 | Name="VCResourceCompilerTool" | ||
| 369 | PreprocessorDefinitions="NDEBUG" | ||
| 370 | Culture="1036" | ||
| 371 | /> | ||
| 372 | <Tool | ||
| 373 | Name="VCPreLinkEventTool" | ||
| 374 | /> | ||
| 375 | <Tool | ||
| 376 | Name="VCLinkerTool" | ||
| 377 | AdditionalOptions="/MACHINE:I386" | ||
| 378 | OutputFile="$(OutDir)\zlibwapi.dll" | ||
| 379 | LinkIncremental="1" | ||
| 380 | SuppressStartupBanner="true" | ||
| 381 | GenerateManifest="false" | ||
| 382 | IgnoreAllDefaultLibraries="false" | ||
| 383 | ModuleDefinitionFile=".\zlibvc.def" | ||
| 384 | ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" | ||
| 385 | GenerateMapFile="true" | ||
| 386 | MapFileName="$(OutDir)/zlibwapi.map" | ||
| 387 | SubSystem="2" | ||
| 388 | OptimizeForWindows98="1" | ||
| 389 | ImportLibrary="$(OutDir)/zlibwapi.lib" | ||
| 390 | /> | ||
| 391 | <Tool | ||
| 392 | Name="VCALinkTool" | ||
| 393 | /> | ||
| 394 | <Tool | ||
| 395 | Name="VCManifestTool" | ||
| 396 | /> | ||
| 397 | <Tool | ||
| 398 | Name="VCXDCMakeTool" | ||
| 399 | /> | ||
| 400 | <Tool | ||
| 401 | Name="VCBscMakeTool" | ||
| 402 | /> | ||
| 403 | <Tool | ||
| 404 | Name="VCFxCopTool" | ||
| 405 | /> | ||
| 406 | <Tool | ||
| 407 | Name="VCAppVerifierTool" | ||
| 408 | /> | ||
| 409 | <Tool | ||
| 410 | Name="VCWebDeploymentTool" | ||
| 411 | /> | ||
| 412 | <Tool | ||
| 413 | Name="VCPostBuildEventTool" | ||
| 414 | /> | ||
| 415 | </Configuration> | ||
| 416 | <Configuration | ||
| 417 | Name="ReleaseWithoutAsm|x64" | ||
| 418 | OutputDirectory="x64\ZlibDll$(ConfigurationName)" | ||
| 419 | IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp" | ||
| 420 | ConfigurationType="2" | ||
| 421 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | ||
| 422 | UseOfMFC="0" | ||
| 423 | ATLMinimizesCRunTimeLibraryUsage="false" | ||
| 424 | WholeProgramOptimization="1" | ||
| 425 | > | ||
| 426 | <Tool | ||
| 427 | Name="VCPreBuildEventTool" | ||
| 428 | /> | ||
| 429 | <Tool | ||
| 430 | Name="VCCustomBuildTool" | ||
| 431 | /> | ||
| 432 | <Tool | ||
| 433 | Name="VCXMLDataGeneratorTool" | ||
| 434 | /> | ||
| 435 | <Tool | ||
| 436 | Name="VCWebServiceProxyGeneratorTool" | ||
| 437 | /> | ||
| 438 | <Tool | ||
| 439 | Name="VCMIDLTool" | ||
| 440 | PreprocessorDefinitions="NDEBUG" | ||
| 441 | MkTypLibCompatible="true" | ||
| 442 | SuppressStartupBanner="true" | ||
| 443 | TargetEnvironment="3" | ||
| 444 | TypeLibraryName="$(OutDir)/zlibvc.tlb" | ||
| 445 | /> | ||
| 446 | <Tool | ||
| 447 | Name="VCCLCompilerTool" | ||
| 448 | InlineFunctionExpansion="1" | ||
| 449 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | ||
| 450 | PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI;WIN64" | ||
| 451 | StringPooling="true" | ||
| 452 | ExceptionHandling="0" | ||
| 453 | RuntimeLibrary="2" | ||
| 454 | BufferSecurityCheck="false" | ||
| 455 | EnableFunctionLevelLinking="true" | ||
| 456 | PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" | ||
| 457 | AssemblerOutput="2" | ||
| 458 | AssemblerListingLocation="$(IntDir)\" | ||
| 459 | ObjectFile="$(IntDir)\" | ||
| 460 | ProgramDataBaseFileName="$(OutDir)\" | ||
| 461 | BrowseInformation="0" | ||
| 462 | WarningLevel="3" | ||
| 463 | SuppressStartupBanner="true" | ||
| 464 | /> | ||
| 465 | <Tool | ||
| 466 | Name="VCManagedResourceCompilerTool" | ||
| 467 | /> | ||
| 468 | <Tool | ||
| 469 | Name="VCResourceCompilerTool" | ||
| 470 | PreprocessorDefinitions="NDEBUG" | ||
| 471 | Culture="1036" | ||
| 472 | /> | ||
| 473 | <Tool | ||
| 474 | Name="VCPreLinkEventTool" | ||
| 475 | /> | ||
| 476 | <Tool | ||
| 477 | Name="VCLinkerTool" | ||
| 478 | OutputFile="$(OutDir)\zlibwapi.dll" | ||
| 479 | LinkIncremental="1" | ||
| 480 | SuppressStartupBanner="true" | ||
| 481 | GenerateManifest="false" | ||
| 482 | IgnoreAllDefaultLibraries="false" | ||
| 483 | ModuleDefinitionFile=".\zlibvc.def" | ||
| 484 | ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" | ||
| 485 | GenerateMapFile="true" | ||
| 486 | MapFileName="$(OutDir)/zlibwapi.map" | ||
| 487 | SubSystem="2" | ||
| 488 | OptimizeForWindows98="1" | ||
| 489 | ImportLibrary="$(OutDir)/zlibwapi.lib" | ||
| 490 | TargetMachine="17" | ||
| 491 | /> | ||
| 492 | <Tool | ||
| 493 | Name="VCALinkTool" | ||
| 494 | /> | ||
| 495 | <Tool | ||
| 496 | Name="VCManifestTool" | ||
| 497 | /> | ||
| 498 | <Tool | ||
| 499 | Name="VCXDCMakeTool" | ||
| 500 | /> | ||
| 501 | <Tool | ||
| 502 | Name="VCBscMakeTool" | ||
| 503 | /> | ||
| 504 | <Tool | ||
| 505 | Name="VCFxCopTool" | ||
| 506 | /> | ||
| 507 | <Tool | ||
| 508 | Name="VCAppVerifierTool" | ||
| 509 | /> | ||
| 510 | <Tool | ||
| 511 | Name="VCWebDeploymentTool" | ||
| 512 | /> | ||
| 513 | <Tool | ||
| 514 | Name="VCPostBuildEventTool" | ||
| 515 | /> | ||
| 516 | </Configuration> | ||
| 517 | <Configuration | ||
| 518 | Name="ReleaseWithoutAsm|Itanium" | ||
| 519 | OutputDirectory="ia64\ZlibDll$(ConfigurationName)" | ||
| 520 | IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp" | ||
| 521 | ConfigurationType="2" | ||
| 522 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | ||
| 523 | UseOfMFC="0" | ||
| 524 | ATLMinimizesCRunTimeLibraryUsage="false" | ||
| 525 | WholeProgramOptimization="1" | ||
| 526 | > | ||
| 527 | <Tool | ||
| 528 | Name="VCPreBuildEventTool" | ||
| 529 | /> | ||
| 530 | <Tool | ||
| 531 | Name="VCCustomBuildTool" | ||
| 532 | /> | ||
| 533 | <Tool | ||
| 534 | Name="VCXMLDataGeneratorTool" | ||
| 535 | /> | ||
| 536 | <Tool | ||
| 537 | Name="VCWebServiceProxyGeneratorTool" | ||
| 538 | /> | ||
| 539 | <Tool | ||
| 540 | Name="VCMIDLTool" | ||
| 541 | PreprocessorDefinitions="NDEBUG" | ||
| 542 | MkTypLibCompatible="true" | ||
| 543 | SuppressStartupBanner="true" | ||
| 544 | TargetEnvironment="2" | ||
| 545 | TypeLibraryName="$(OutDir)/zlibvc.tlb" | ||
| 546 | /> | ||
| 547 | <Tool | ||
| 548 | Name="VCCLCompilerTool" | ||
| 549 | InlineFunctionExpansion="1" | ||
| 550 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | ||
| 551 | PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI;WIN64" | ||
| 552 | StringPooling="true" | ||
| 553 | ExceptionHandling="0" | ||
| 554 | RuntimeLibrary="2" | ||
| 555 | BufferSecurityCheck="false" | ||
| 556 | EnableFunctionLevelLinking="true" | ||
| 557 | PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" | ||
| 558 | AssemblerOutput="2" | ||
| 559 | AssemblerListingLocation="$(IntDir)\" | ||
| 560 | ObjectFile="$(IntDir)\" | ||
| 561 | ProgramDataBaseFileName="$(OutDir)\" | ||
| 562 | BrowseInformation="0" | ||
| 563 | WarningLevel="3" | ||
| 564 | SuppressStartupBanner="true" | ||
| 565 | /> | ||
| 566 | <Tool | ||
| 567 | Name="VCManagedResourceCompilerTool" | ||
| 568 | /> | ||
| 569 | <Tool | ||
| 570 | Name="VCResourceCompilerTool" | ||
| 571 | PreprocessorDefinitions="NDEBUG" | ||
| 572 | Culture="1036" | ||
| 573 | /> | ||
| 574 | <Tool | ||
| 575 | Name="VCPreLinkEventTool" | ||
| 576 | /> | ||
| 577 | <Tool | ||
| 578 | Name="VCLinkerTool" | ||
| 579 | OutputFile="$(OutDir)\zlibwapi.dll" | ||
| 580 | LinkIncremental="1" | ||
| 581 | SuppressStartupBanner="true" | ||
| 582 | GenerateManifest="false" | ||
| 583 | IgnoreAllDefaultLibraries="false" | ||
| 584 | ModuleDefinitionFile=".\zlibvc.def" | ||
| 585 | ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" | ||
| 586 | GenerateMapFile="true" | ||
| 587 | MapFileName="$(OutDir)/zlibwapi.map" | ||
| 588 | SubSystem="2" | ||
| 589 | OptimizeForWindows98="1" | ||
| 590 | ImportLibrary="$(OutDir)/zlibwapi.lib" | ||
| 591 | TargetMachine="5" | ||
| 592 | /> | ||
| 593 | <Tool | ||
| 594 | Name="VCALinkTool" | ||
| 595 | /> | ||
| 596 | <Tool | ||
| 597 | Name="VCManifestTool" | ||
| 598 | /> | ||
| 599 | <Tool | ||
| 600 | Name="VCXDCMakeTool" | ||
| 601 | /> | ||
| 602 | <Tool | ||
| 603 | Name="VCBscMakeTool" | ||
| 604 | /> | ||
| 605 | <Tool | ||
| 606 | Name="VCFxCopTool" | ||
| 607 | /> | ||
| 608 | <Tool | ||
| 609 | Name="VCAppVerifierTool" | ||
| 610 | /> | ||
| 611 | <Tool | ||
| 612 | Name="VCWebDeploymentTool" | ||
| 613 | /> | ||
| 614 | <Tool | ||
| 615 | Name="VCPostBuildEventTool" | ||
| 616 | /> | ||
| 617 | </Configuration> | ||
| 618 | <Configuration | ||
| 619 | Name="Release|Win32" | ||
| 620 | OutputDirectory="x86\ZlibDll$(ConfigurationName)" | ||
| 621 | IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp" | ||
| 622 | ConfigurationType="2" | ||
| 623 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | ||
| 624 | UseOfMFC="0" | ||
| 625 | ATLMinimizesCRunTimeLibraryUsage="false" | ||
| 626 | WholeProgramOptimization="1" | ||
| 627 | > | ||
| 628 | <Tool | ||
| 629 | Name="VCPreBuildEventTool" | ||
| 630 | /> | ||
| 631 | <Tool | ||
| 632 | Name="VCCustomBuildTool" | ||
| 633 | /> | ||
| 634 | <Tool | ||
| 635 | Name="VCXMLDataGeneratorTool" | ||
| 636 | /> | ||
| 637 | <Tool | ||
| 638 | Name="VCWebServiceProxyGeneratorTool" | ||
| 639 | /> | ||
| 640 | <Tool | ||
| 641 | Name="VCMIDLTool" | ||
| 642 | PreprocessorDefinitions="NDEBUG" | ||
| 643 | MkTypLibCompatible="true" | ||
| 644 | SuppressStartupBanner="true" | ||
| 645 | TargetEnvironment="1" | ||
| 646 | TypeLibraryName="$(OutDir)/zlibvc.tlb" | ||
| 647 | /> | ||
| 648 | <Tool | ||
| 649 | Name="VCCLCompilerTool" | ||
| 650 | InlineFunctionExpansion="1" | ||
| 651 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | ||
| 652 | PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;ASMV;ASMINF" | ||
| 653 | StringPooling="true" | ||
| 654 | ExceptionHandling="0" | ||
| 655 | RuntimeLibrary="2" | ||
| 656 | BufferSecurityCheck="false" | ||
| 657 | EnableFunctionLevelLinking="true" | ||
| 658 | PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" | ||
| 659 | AssemblerOutput="2" | ||
| 660 | AssemblerListingLocation="$(IntDir)\" | ||
| 661 | ObjectFile="$(IntDir)\" | ||
| 662 | ProgramDataBaseFileName="$(OutDir)\" | ||
| 663 | BrowseInformation="0" | ||
| 664 | WarningLevel="3" | ||
| 665 | SuppressStartupBanner="true" | ||
| 666 | /> | ||
| 667 | <Tool | ||
| 668 | Name="VCManagedResourceCompilerTool" | ||
| 669 | /> | ||
| 670 | <Tool | ||
| 671 | Name="VCResourceCompilerTool" | ||
| 672 | PreprocessorDefinitions="NDEBUG" | ||
| 673 | Culture="1036" | ||
| 674 | /> | ||
| 675 | <Tool | ||
| 676 | Name="VCPreLinkEventTool" | ||
| 677 | /> | ||
| 678 | <Tool | ||
| 679 | Name="VCLinkerTool" | ||
| 680 | AdditionalOptions="/MACHINE:I386" | ||
| 681 | AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj " | ||
| 682 | OutputFile="$(OutDir)\zlibwapi.dll" | ||
| 683 | LinkIncremental="1" | ||
| 684 | SuppressStartupBanner="true" | ||
| 685 | GenerateManifest="false" | ||
| 686 | IgnoreAllDefaultLibraries="false" | ||
| 687 | ModuleDefinitionFile=".\zlibvc.def" | ||
| 688 | ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" | ||
| 689 | GenerateMapFile="true" | ||
| 690 | MapFileName="$(OutDir)/zlibwapi.map" | ||
| 691 | SubSystem="2" | ||
| 692 | OptimizeForWindows98="1" | ||
| 693 | ImportLibrary="$(OutDir)/zlibwapi.lib" | ||
| 694 | /> | ||
| 695 | <Tool | ||
| 696 | Name="VCALinkTool" | ||
| 697 | /> | ||
| 698 | <Tool | ||
| 699 | Name="VCManifestTool" | ||
| 700 | /> | ||
| 701 | <Tool | ||
| 702 | Name="VCXDCMakeTool" | ||
| 703 | /> | ||
| 704 | <Tool | ||
| 705 | Name="VCBscMakeTool" | ||
| 706 | /> | ||
| 707 | <Tool | ||
| 708 | Name="VCFxCopTool" | ||
| 709 | /> | ||
| 710 | <Tool | ||
| 711 | Name="VCAppVerifierTool" | ||
| 712 | /> | ||
| 713 | <Tool | ||
| 714 | Name="VCWebDeploymentTool" | ||
| 715 | /> | ||
| 716 | <Tool | ||
| 717 | Name="VCPostBuildEventTool" | ||
| 718 | /> | ||
| 719 | </Configuration> | ||
| 720 | <Configuration | ||
| 721 | Name="Release|x64" | ||
| 722 | OutputDirectory="x64\ZlibDll$(ConfigurationName)" | ||
| 723 | IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp" | ||
| 724 | ConfigurationType="2" | ||
| 725 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | ||
| 726 | UseOfMFC="0" | ||
| 727 | ATLMinimizesCRunTimeLibraryUsage="false" | ||
| 728 | WholeProgramOptimization="1" | ||
| 729 | > | ||
| 730 | <Tool | ||
| 731 | Name="VCPreBuildEventTool" | ||
| 732 | /> | ||
| 733 | <Tool | ||
| 734 | Name="VCCustomBuildTool" | ||
| 735 | /> | ||
| 736 | <Tool | ||
| 737 | Name="VCXMLDataGeneratorTool" | ||
| 738 | /> | ||
| 739 | <Tool | ||
| 740 | Name="VCWebServiceProxyGeneratorTool" | ||
| 741 | /> | ||
| 742 | <Tool | ||
| 743 | Name="VCMIDLTool" | ||
| 744 | PreprocessorDefinitions="NDEBUG" | ||
| 745 | MkTypLibCompatible="true" | ||
| 746 | SuppressStartupBanner="true" | ||
| 747 | TargetEnvironment="3" | ||
| 748 | TypeLibraryName="$(OutDir)/zlibvc.tlb" | ||
| 749 | /> | ||
| 750 | <Tool | ||
| 751 | Name="VCCLCompilerTool" | ||
| 752 | InlineFunctionExpansion="1" | ||
| 753 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | ||
| 754 | PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;ASMV;ASMINF;WIN64" | ||
| 755 | StringPooling="true" | ||
| 756 | ExceptionHandling="0" | ||
| 757 | RuntimeLibrary="2" | ||
| 758 | BufferSecurityCheck="false" | ||
| 759 | EnableFunctionLevelLinking="true" | ||
| 760 | PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" | ||
| 761 | AssemblerOutput="2" | ||
| 762 | AssemblerListingLocation="$(IntDir)\" | ||
| 763 | ObjectFile="$(IntDir)\" | ||
| 764 | ProgramDataBaseFileName="$(OutDir)\" | ||
| 765 | BrowseInformation="0" | ||
| 766 | WarningLevel="3" | ||
| 767 | SuppressStartupBanner="true" | ||
| 768 | /> | ||
| 769 | <Tool | ||
| 770 | Name="VCManagedResourceCompilerTool" | ||
| 771 | /> | ||
| 772 | <Tool | ||
| 773 | Name="VCResourceCompilerTool" | ||
| 774 | PreprocessorDefinitions="NDEBUG" | ||
| 775 | Culture="1036" | ||
| 776 | /> | ||
| 777 | <Tool | ||
| 778 | Name="VCPreLinkEventTool" | ||
| 779 | /> | ||
| 780 | <Tool | ||
| 781 | Name="VCLinkerTool" | ||
| 782 | AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj " | ||
| 783 | OutputFile="$(OutDir)\zlibwapi.dll" | ||
| 784 | LinkIncremental="1" | ||
| 785 | SuppressStartupBanner="true" | ||
| 786 | GenerateManifest="false" | ||
| 787 | IgnoreAllDefaultLibraries="false" | ||
| 788 | ModuleDefinitionFile=".\zlibvc.def" | ||
| 789 | ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" | ||
| 790 | GenerateMapFile="true" | ||
| 791 | MapFileName="$(OutDir)/zlibwapi.map" | ||
| 792 | SubSystem="2" | ||
| 793 | OptimizeForWindows98="1" | ||
| 794 | ImportLibrary="$(OutDir)/zlibwapi.lib" | ||
| 795 | TargetMachine="17" | ||
| 796 | /> | ||
| 797 | <Tool | ||
| 798 | Name="VCALinkTool" | ||
| 799 | /> | ||
| 800 | <Tool | ||
| 801 | Name="VCManifestTool" | ||
| 802 | /> | ||
| 803 | <Tool | ||
| 804 | Name="VCXDCMakeTool" | ||
| 805 | /> | ||
| 806 | <Tool | ||
| 807 | Name="VCBscMakeTool" | ||
| 808 | /> | ||
| 809 | <Tool | ||
| 810 | Name="VCFxCopTool" | ||
| 811 | /> | ||
| 812 | <Tool | ||
| 813 | Name="VCAppVerifierTool" | ||
| 814 | /> | ||
| 815 | <Tool | ||
| 816 | Name="VCWebDeploymentTool" | ||
| 817 | /> | ||
| 818 | <Tool | ||
| 819 | Name="VCPostBuildEventTool" | ||
| 820 | /> | ||
| 821 | </Configuration> | ||
| 822 | <Configuration | ||
| 823 | Name="Release|Itanium" | ||
| 824 | OutputDirectory="ia64\ZlibDll$(ConfigurationName)" | ||
| 825 | IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp" | ||
| 826 | ConfigurationType="2" | ||
| 827 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | ||
| 828 | UseOfMFC="0" | ||
| 829 | ATLMinimizesCRunTimeLibraryUsage="false" | ||
| 830 | WholeProgramOptimization="1" | ||
| 831 | > | ||
| 832 | <Tool | ||
| 833 | Name="VCPreBuildEventTool" | ||
| 834 | /> | ||
| 835 | <Tool | ||
| 836 | Name="VCCustomBuildTool" | ||
| 837 | /> | ||
| 838 | <Tool | ||
| 839 | Name="VCXMLDataGeneratorTool" | ||
| 840 | /> | ||
| 841 | <Tool | ||
| 842 | Name="VCWebServiceProxyGeneratorTool" | ||
| 843 | /> | ||
| 844 | <Tool | ||
| 845 | Name="VCMIDLTool" | ||
| 846 | PreprocessorDefinitions="NDEBUG" | ||
| 847 | MkTypLibCompatible="true" | ||
| 848 | SuppressStartupBanner="true" | ||
| 849 | TargetEnvironment="2" | ||
| 850 | TypeLibraryName="$(OutDir)/zlibvc.tlb" | ||
| 851 | /> | ||
| 852 | <Tool | ||
| 853 | Name="VCCLCompilerTool" | ||
| 854 | InlineFunctionExpansion="1" | ||
| 855 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | ||
| 856 | PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;WIN64" | ||
| 857 | StringPooling="true" | ||
| 858 | ExceptionHandling="0" | ||
| 859 | RuntimeLibrary="2" | ||
| 860 | BufferSecurityCheck="false" | ||
| 861 | EnableFunctionLevelLinking="true" | ||
| 862 | PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" | ||
| 863 | AssemblerOutput="2" | ||
| 864 | AssemblerListingLocation="$(IntDir)\" | ||
| 865 | ObjectFile="$(IntDir)\" | ||
| 866 | ProgramDataBaseFileName="$(OutDir)\" | ||
| 867 | BrowseInformation="0" | ||
| 868 | WarningLevel="3" | ||
| 869 | SuppressStartupBanner="true" | ||
| 870 | /> | ||
| 871 | <Tool | ||
| 872 | Name="VCManagedResourceCompilerTool" | ||
| 873 | /> | ||
| 874 | <Tool | ||
| 875 | Name="VCResourceCompilerTool" | ||
| 876 | PreprocessorDefinitions="NDEBUG" | ||
| 877 | Culture="1036" | ||
| 878 | /> | ||
| 879 | <Tool | ||
| 880 | Name="VCPreLinkEventTool" | ||
| 881 | /> | ||
| 882 | <Tool | ||
| 883 | Name="VCLinkerTool" | ||
| 884 | OutputFile="$(OutDir)\zlibwapi.dll" | ||
| 885 | LinkIncremental="1" | ||
| 886 | SuppressStartupBanner="true" | ||
| 887 | GenerateManifest="false" | ||
| 888 | IgnoreAllDefaultLibraries="false" | ||
| 889 | ModuleDefinitionFile=".\zlibvc.def" | ||
| 890 | ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" | ||
| 891 | GenerateMapFile="true" | ||
| 892 | MapFileName="$(OutDir)/zlibwapi.map" | ||
| 893 | SubSystem="2" | ||
| 894 | OptimizeForWindows98="1" | ||
| 895 | ImportLibrary="$(OutDir)/zlibwapi.lib" | ||
| 896 | TargetMachine="5" | ||
| 897 | /> | ||
| 898 | <Tool | ||
| 899 | Name="VCALinkTool" | ||
| 900 | /> | ||
| 901 | <Tool | ||
| 902 | Name="VCManifestTool" | ||
| 903 | /> | ||
| 904 | <Tool | ||
| 905 | Name="VCXDCMakeTool" | ||
| 906 | /> | ||
| 907 | <Tool | ||
| 908 | Name="VCBscMakeTool" | ||
| 909 | /> | ||
| 910 | <Tool | ||
| 911 | Name="VCFxCopTool" | ||
| 912 | /> | ||
| 913 | <Tool | ||
| 914 | Name="VCAppVerifierTool" | ||
| 915 | /> | ||
| 916 | <Tool | ||
| 917 | Name="VCWebDeploymentTool" | ||
| 918 | /> | ||
| 919 | <Tool | ||
| 920 | Name="VCPostBuildEventTool" | ||
| 921 | /> | ||
| 922 | </Configuration> | ||
| 923 | </Configurations> | ||
| 924 | <References> | ||
| 925 | </References> | ||
| 926 | <Files> | ||
| 927 | <Filter | ||
| 928 | Name="Source Files" | ||
| 929 | Filter="cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90" | ||
| 930 | > | ||
| 931 | <File | ||
| 932 | RelativePath="..\..\..\adler32.c" | ||
| 933 | > | ||
| 934 | </File> | ||
| 935 | <File | ||
| 936 | RelativePath="..\..\..\compress.c" | ||
| 937 | > | ||
| 938 | </File> | ||
| 939 | <File | ||
| 940 | RelativePath="..\..\..\crc32.c" | ||
| 941 | > | ||
| 942 | </File> | ||
| 943 | <File | ||
| 944 | RelativePath="..\..\..\deflate.c" | ||
| 945 | > | ||
| 946 | </File> | ||
| 947 | <File | ||
| 948 | RelativePath="..\..\masmx86\gvmat32c.c" | ||
| 949 | > | ||
| 950 | <FileConfiguration | ||
| 951 | Name="Debug|x64" | ||
| 952 | ExcludedFromBuild="true" | ||
| 953 | > | ||
| 954 | <Tool | ||
| 955 | Name="VCCLCompilerTool" | ||
| 956 | /> | ||
| 957 | </FileConfiguration> | ||
| 958 | <FileConfiguration | ||
| 959 | Name="Debug|Itanium" | ||
| 960 | ExcludedFromBuild="true" | ||
| 961 | > | ||
| 962 | <Tool | ||
| 963 | Name="VCCLCompilerTool" | ||
| 964 | /> | ||
| 965 | </FileConfiguration> | ||
| 966 | <FileConfiguration | ||
| 967 | Name="ReleaseWithoutAsm|Win32" | ||
| 968 | ExcludedFromBuild="true" | ||
| 969 | > | ||
| 970 | <Tool | ||
| 971 | Name="VCCLCompilerTool" | ||
| 972 | /> | ||
| 973 | </FileConfiguration> | ||
| 974 | <FileConfiguration | ||
| 975 | Name="ReleaseWithoutAsm|x64" | ||
| 976 | ExcludedFromBuild="true" | ||
| 977 | > | ||
| 978 | <Tool | ||
| 979 | Name="VCCLCompilerTool" | ||
| 980 | /> | ||
| 981 | </FileConfiguration> | ||
| 982 | <FileConfiguration | ||
| 983 | Name="ReleaseWithoutAsm|Itanium" | ||
| 984 | ExcludedFromBuild="true" | ||
| 985 | > | ||
| 986 | <Tool | ||
| 987 | Name="VCCLCompilerTool" | ||
| 988 | /> | ||
| 989 | </FileConfiguration> | ||
| 990 | <FileConfiguration | ||
| 991 | Name="Release|x64" | ||
| 992 | ExcludedFromBuild="true" | ||
| 993 | > | ||
| 994 | <Tool | ||
| 995 | Name="VCCLCompilerTool" | ||
| 996 | /> | ||
| 997 | </FileConfiguration> | ||
| 998 | <FileConfiguration | ||
| 999 | Name="Release|Itanium" | ||
| 1000 | ExcludedFromBuild="true" | ||
| 1001 | > | ||
| 1002 | <Tool | ||
| 1003 | Name="VCCLCompilerTool" | ||
| 1004 | /> | ||
| 1005 | </FileConfiguration> | ||
| 1006 | </File> | ||
| 1007 | <File | ||
| 1008 | RelativePath="..\..\..\gzclose.c"> | ||
| 1009 | </File> | ||
| 1010 | <File | ||
| 1011 | RelativePath="..\..\..\gzio.c"> | ||
| 1012 | </File> | ||
| 1013 | <File | ||
| 1014 | RelativePath="..\..\..\gzlib.c"> | ||
| 1015 | </File> | ||
| 1016 | <File | ||
| 1017 | RelativePath="..\..\..\gzread.c"> | ||
| 1018 | </File> | ||
| 1019 | <File | ||
| 1020 | RelativePath="..\..\..\gzwrite.c"> | ||
| 1021 | </File> | ||
| 1022 | <File | ||
| 1023 | RelativePath="..\..\..\infback.c" | ||
| 1024 | > | ||
| 1025 | </File> | ||
| 1026 | <File | ||
| 1027 | RelativePath="..\..\masmx64\inffas8664.c" | ||
| 1028 | > | ||
| 1029 | <FileConfiguration | ||
| 1030 | Name="Debug|Win32" | ||
| 1031 | ExcludedFromBuild="true" | ||
| 1032 | > | ||
| 1033 | <Tool | ||
| 1034 | Name="VCCLCompilerTool" | ||
| 1035 | /> | ||
| 1036 | </FileConfiguration> | ||
| 1037 | <FileConfiguration | ||
| 1038 | Name="Debug|Itanium" | ||
| 1039 | ExcludedFromBuild="true" | ||
| 1040 | > | ||
| 1041 | <Tool | ||
| 1042 | Name="VCCLCompilerTool" | ||
| 1043 | /> | ||
| 1044 | </FileConfiguration> | ||
| 1045 | <FileConfiguration | ||
| 1046 | Name="ReleaseWithoutAsm|Win32" | ||
| 1047 | ExcludedFromBuild="true" | ||
| 1048 | > | ||
| 1049 | <Tool | ||
| 1050 | Name="VCCLCompilerTool" | ||
| 1051 | /> | ||
| 1052 | </FileConfiguration> | ||
| 1053 | <FileConfiguration | ||
| 1054 | Name="ReleaseWithoutAsm|Itanium" | ||
| 1055 | ExcludedFromBuild="true" | ||
| 1056 | > | ||
| 1057 | <Tool | ||
| 1058 | Name="VCCLCompilerTool" | ||
| 1059 | /> | ||
| 1060 | </FileConfiguration> | ||
| 1061 | <FileConfiguration | ||
| 1062 | Name="Release|Win32" | ||
| 1063 | ExcludedFromBuild="true" | ||
| 1064 | > | ||
| 1065 | <Tool | ||
| 1066 | Name="VCCLCompilerTool" | ||
| 1067 | /> | ||
| 1068 | </FileConfiguration> | ||
| 1069 | <FileConfiguration | ||
| 1070 | Name="Release|Itanium" | ||
| 1071 | ExcludedFromBuild="true" | ||
| 1072 | > | ||
| 1073 | <Tool | ||
| 1074 | Name="VCCLCompilerTool" | ||
| 1075 | /> | ||
| 1076 | </FileConfiguration> | ||
| 1077 | </File> | ||
| 1078 | <File | ||
| 1079 | RelativePath="..\..\..\inffast.c" | ||
| 1080 | > | ||
| 1081 | </File> | ||
| 1082 | <File | ||
| 1083 | RelativePath="..\..\..\inflate.c" | ||
| 1084 | > | ||
| 1085 | </File> | ||
| 1086 | <File | ||
| 1087 | RelativePath="..\..\..\inftrees.c" | ||
| 1088 | > | ||
| 1089 | </File> | ||
| 1090 | <File | ||
| 1091 | RelativePath="..\..\minizip\ioapi.c" | ||
| 1092 | > | ||
| 1093 | </File> | ||
| 1094 | <File | ||
| 1095 | RelativePath="..\..\minizip\iowin32.c" | ||
| 1096 | > | ||
| 1097 | </File> | ||
| 1098 | <File | ||
| 1099 | RelativePath="..\..\..\trees.c" | ||
| 1100 | > | ||
| 1101 | </File> | ||
| 1102 | <File | ||
| 1103 | RelativePath="..\..\..\uncompr.c" | ||
| 1104 | > | ||
| 1105 | </File> | ||
| 1106 | <File | ||
| 1107 | RelativePath="..\..\minizip\unzip.c" | ||
| 1108 | > | ||
| 1109 | <FileConfiguration | ||
| 1110 | Name="Release|Win32" | ||
| 1111 | > | ||
| 1112 | <Tool | ||
| 1113 | Name="VCCLCompilerTool" | ||
| 1114 | AdditionalIncludeDirectories="" | ||
| 1115 | PreprocessorDefinitions="ZLIB_INTERNAL" | ||
| 1116 | /> | ||
| 1117 | </FileConfiguration> | ||
| 1118 | <FileConfiguration | ||
| 1119 | Name="Release|x64" | ||
| 1120 | > | ||
| 1121 | <Tool | ||
| 1122 | Name="VCCLCompilerTool" | ||
| 1123 | AdditionalIncludeDirectories="" | ||
| 1124 | PreprocessorDefinitions="ZLIB_INTERNAL" | ||
| 1125 | /> | ||
| 1126 | </FileConfiguration> | ||
| 1127 | <FileConfiguration | ||
| 1128 | Name="Release|Itanium" | ||
| 1129 | > | ||
| 1130 | <Tool | ||
| 1131 | Name="VCCLCompilerTool" | ||
| 1132 | AdditionalIncludeDirectories="" | ||
| 1133 | PreprocessorDefinitions="ZLIB_INTERNAL" | ||
| 1134 | /> | ||
| 1135 | </FileConfiguration> | ||
| 1136 | </File> | ||
| 1137 | <File | ||
| 1138 | RelativePath="..\..\minizip\zip.c" | ||
| 1139 | > | ||
| 1140 | <FileConfiguration | ||
| 1141 | Name="Release|Win32" | ||
| 1142 | > | ||
| 1143 | <Tool | ||
| 1144 | Name="VCCLCompilerTool" | ||
| 1145 | AdditionalIncludeDirectories="" | ||
| 1146 | PreprocessorDefinitions="ZLIB_INTERNAL" | ||
| 1147 | /> | ||
| 1148 | </FileConfiguration> | ||
| 1149 | <FileConfiguration | ||
| 1150 | Name="Release|x64" | ||
| 1151 | > | ||
| 1152 | <Tool | ||
| 1153 | Name="VCCLCompilerTool" | ||
| 1154 | AdditionalIncludeDirectories="" | ||
| 1155 | PreprocessorDefinitions="ZLIB_INTERNAL" | ||
| 1156 | /> | ||
| 1157 | </FileConfiguration> | ||
| 1158 | <FileConfiguration | ||
| 1159 | Name="Release|Itanium" | ||
| 1160 | > | ||
| 1161 | <Tool | ||
| 1162 | Name="VCCLCompilerTool" | ||
| 1163 | AdditionalIncludeDirectories="" | ||
| 1164 | PreprocessorDefinitions="ZLIB_INTERNAL" | ||
| 1165 | /> | ||
| 1166 | </FileConfiguration> | ||
| 1167 | </File> | ||
| 1168 | <File | ||
| 1169 | RelativePath=".\zlib.rc" | ||
| 1170 | > | ||
| 1171 | </File> | ||
| 1172 | <File | ||
| 1173 | RelativePath=".\zlibvc.def" | ||
| 1174 | > | ||
| 1175 | </File> | ||
| 1176 | <File | ||
| 1177 | RelativePath="..\..\..\zutil.c" | ||
| 1178 | > | ||
| 1179 | </File> | ||
| 1180 | </Filter> | ||
| 1181 | <Filter | ||
| 1182 | Name="Header Files" | ||
| 1183 | Filter="h;hpp;hxx;hm;inl;fi;fd" | ||
| 1184 | > | ||
| 1185 | <File | ||
| 1186 | RelativePath="..\..\..\deflate.h" | ||
| 1187 | > | ||
| 1188 | </File> | ||
| 1189 | <File | ||
| 1190 | RelativePath="..\..\..\infblock.h" | ||
| 1191 | > | ||
| 1192 | </File> | ||
| 1193 | <File | ||
| 1194 | RelativePath="..\..\..\infcodes.h" | ||
| 1195 | > | ||
| 1196 | </File> | ||
| 1197 | <File | ||
| 1198 | RelativePath="..\..\..\inffast.h" | ||
| 1199 | > | ||
| 1200 | </File> | ||
| 1201 | <File | ||
| 1202 | RelativePath="..\..\..\inftrees.h" | ||
| 1203 | > | ||
| 1204 | </File> | ||
| 1205 | <File | ||
| 1206 | RelativePath="..\..\..\infutil.h" | ||
| 1207 | > | ||
| 1208 | </File> | ||
| 1209 | <File | ||
| 1210 | RelativePath="..\..\..\zconf.h" | ||
| 1211 | > | ||
| 1212 | </File> | ||
| 1213 | <File | ||
| 1214 | RelativePath="..\..\..\zlib.h" | ||
| 1215 | > | ||
| 1216 | </File> | ||
| 1217 | <File | ||
| 1218 | RelativePath="..\..\..\zutil.h" | ||
| 1219 | > | ||
| 1220 | </File> | ||
| 1221 | </Filter> | ||
| 1222 | <Filter | ||
| 1223 | Name="Resource Files" | ||
| 1224 | Filter="ico;cur;bmp;dlg;rc2;rct;bin;cnt;rtf;gif;jpg;jpeg;jpe" | ||
| 1225 | > | ||
| 1226 | </Filter> | ||
| 1227 | </Files> | ||
| 1228 | <Globals> | ||
| 1229 | </Globals> | ||
| 1230 | </VisualStudioProject> | ||
diff --git a/contrib/vstudio/vc8/miniunz.vcproj b/contrib/vstudio/vc9/miniunz.vcproj index 4af53e8..7da32b9 100644 --- a/contrib/vstudio/vc8/miniunz.vcproj +++ b/contrib/vstudio/vc9/miniunz.vcproj | |||
| @@ -1,10 +1,11 @@ | |||
| 1 | <?xml version="1.0" encoding="Windows-1252"?> | 1 | <?xml version="1.0" encoding="Windows-1252"?> |
| 2 | <VisualStudioProject | 2 | <VisualStudioProject |
| 3 | ProjectType="Visual C++" | 3 | ProjectType="Visual C++" |
| 4 | Version="8,00" | 4 | Version="9.00" |
| 5 | Name="miniunz" | 5 | Name="miniunz" |
| 6 | ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694382A}" | 6 | ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694382A}" |
| 7 | Keyword="Win32Proj" | 7 | Keyword="Win32Proj" |
| 8 | TargetFrameworkVersion="131072" | ||
| 8 | > | 9 | > |
| 9 | <Platforms> | 10 | <Platforms> |
| 10 | <Platform | 11 | <Platform |
| @@ -76,6 +77,8 @@ | |||
| 76 | GenerateDebugInformation="true" | 77 | GenerateDebugInformation="true" |
| 77 | ProgramDatabaseFile="$(OutDir)/miniunz.pdb" | 78 | ProgramDatabaseFile="$(OutDir)/miniunz.pdb" |
| 78 | SubSystem="1" | 79 | SubSystem="1" |
| 80 | RandomizedBaseAddress="1" | ||
| 81 | DataExecutionPrevention="0" | ||
| 79 | TargetMachine="1" | 82 | TargetMachine="1" |
| 80 | /> | 83 | /> |
| 81 | <Tool | 84 | <Tool |
| @@ -97,16 +100,13 @@ | |||
| 97 | Name="VCAppVerifierTool" | 100 | Name="VCAppVerifierTool" |
| 98 | /> | 101 | /> |
| 99 | <Tool | 102 | <Tool |
| 100 | Name="VCWebDeploymentTool" | ||
| 101 | /> | ||
| 102 | <Tool | ||
| 103 | Name="VCPostBuildEventTool" | 103 | Name="VCPostBuildEventTool" |
| 104 | /> | 104 | /> |
| 105 | </Configuration> | 105 | </Configuration> |
| 106 | <Configuration | 106 | <Configuration |
| 107 | Name="Debug|x64" | 107 | Name="Release|Win32" |
| 108 | OutputDirectory="x64\MiniUnzip$(ConfigurationName)" | 108 | OutputDirectory="x86\MiniUnzip$(ConfigurationName)" |
| 109 | IntermediateDirectory="x64\MiniUnzip$(ConfigurationName)\Tmp" | 109 | IntermediateDirectory="x86\MiniUnzip$(ConfigurationName)\Tmp" |
| 110 | ConfigurationType="1" | 110 | ConfigurationType="1" |
| 111 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 111 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
| 112 | CharacterSet="2" | 112 | CharacterSet="2" |
| @@ -125,17 +125,19 @@ | |||
| 125 | /> | 125 | /> |
| 126 | <Tool | 126 | <Tool |
| 127 | Name="VCMIDLTool" | 127 | Name="VCMIDLTool" |
| 128 | TargetEnvironment="3" | ||
| 129 | /> | 128 | /> |
| 130 | <Tool | 129 | <Tool |
| 131 | Name="VCCLCompilerTool" | 130 | Name="VCCLCompilerTool" |
| 132 | Optimization="0" | 131 | Optimization="2" |
| 132 | InlineFunctionExpansion="1" | ||
| 133 | OmitFramePointers="true" | ||
| 133 | AdditionalIncludeDirectories="..\..\..;..\..\minizip" | 134 | AdditionalIncludeDirectories="..\..\..;..\..\minizip" |
| 134 | PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64" | 135 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE" |
| 135 | MinimalRebuild="true" | 136 | StringPooling="true" |
| 136 | BasicRuntimeChecks="0" | 137 | BasicRuntimeChecks="0" |
| 137 | RuntimeLibrary="3" | 138 | RuntimeLibrary="0" |
| 138 | BufferSecurityCheck="false" | 139 | BufferSecurityCheck="false" |
| 140 | EnableFunctionLevelLinking="true" | ||
| 139 | UsePrecompiledHeader="0" | 141 | UsePrecompiledHeader="0" |
| 140 | AssemblerListingLocation="$(IntDir)\" | 142 | AssemblerListingLocation="$(IntDir)\" |
| 141 | WarningLevel="3" | 143 | WarningLevel="3" |
| @@ -153,14 +155,18 @@ | |||
| 153 | /> | 155 | /> |
| 154 | <Tool | 156 | <Tool |
| 155 | Name="VCLinkerTool" | 157 | Name="VCLinkerTool" |
| 156 | AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib" | 158 | AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib" |
| 157 | OutputFile="$(OutDir)/miniunz.exe" | 159 | OutputFile="$(OutDir)/miniunz.exe" |
| 158 | LinkIncremental="2" | 160 | LinkIncremental="1" |
| 159 | GenerateManifest="false" | 161 | GenerateManifest="false" |
| 160 | GenerateDebugInformation="true" | 162 | GenerateDebugInformation="true" |
| 161 | ProgramDatabaseFile="$(OutDir)/miniunz.pdb" | ||
| 162 | SubSystem="1" | 163 | SubSystem="1" |
| 163 | TargetMachine="17" | 164 | OptimizeReferences="2" |
| 165 | EnableCOMDATFolding="2" | ||
| 166 | OptimizeForWindows98="1" | ||
| 167 | RandomizedBaseAddress="1" | ||
| 168 | DataExecutionPrevention="0" | ||
| 169 | TargetMachine="1" | ||
| 164 | /> | 170 | /> |
| 165 | <Tool | 171 | <Tool |
| 166 | Name="VCALinkTool" | 172 | Name="VCALinkTool" |
| @@ -181,16 +187,13 @@ | |||
| 181 | Name="VCAppVerifierTool" | 187 | Name="VCAppVerifierTool" |
| 182 | /> | 188 | /> |
| 183 | <Tool | 189 | <Tool |
| 184 | Name="VCWebDeploymentTool" | ||
| 185 | /> | ||
| 186 | <Tool | ||
| 187 | Name="VCPostBuildEventTool" | 190 | Name="VCPostBuildEventTool" |
| 188 | /> | 191 | /> |
| 189 | </Configuration> | 192 | </Configuration> |
| 190 | <Configuration | 193 | <Configuration |
| 191 | Name="Debug|Itanium" | 194 | Name="Debug|x64" |
| 192 | OutputDirectory="ia64\MiniUnzip$(ConfigurationName)" | 195 | OutputDirectory="x64\MiniUnzip$(ConfigurationName)" |
| 193 | IntermediateDirectory="ia64\MiniUnzip$(ConfigurationName)\Tmp" | 196 | IntermediateDirectory="x64\MiniUnzip$(ConfigurationName)\Tmp" |
| 194 | ConfigurationType="1" | 197 | ConfigurationType="1" |
| 195 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 198 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
| 196 | CharacterSet="2" | 199 | CharacterSet="2" |
| @@ -209,7 +212,7 @@ | |||
| 209 | /> | 212 | /> |
| 210 | <Tool | 213 | <Tool |
| 211 | Name="VCMIDLTool" | 214 | Name="VCMIDLTool" |
| 212 | TargetEnvironment="2" | 215 | TargetEnvironment="3" |
| 213 | /> | 216 | /> |
| 214 | <Tool | 217 | <Tool |
| 215 | Name="VCCLCompilerTool" | 218 | Name="VCCLCompilerTool" |
| @@ -237,14 +240,14 @@ | |||
| 237 | /> | 240 | /> |
| 238 | <Tool | 241 | <Tool |
| 239 | Name="VCLinkerTool" | 242 | Name="VCLinkerTool" |
| 240 | AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib" | 243 | AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib" |
| 241 | OutputFile="$(OutDir)/miniunz.exe" | 244 | OutputFile="$(OutDir)/miniunz.exe" |
| 242 | LinkIncremental="2" | 245 | LinkIncremental="2" |
| 243 | GenerateManifest="false" | 246 | GenerateManifest="false" |
| 244 | GenerateDebugInformation="true" | 247 | GenerateDebugInformation="true" |
| 245 | ProgramDatabaseFile="$(OutDir)/miniunz.pdb" | 248 | ProgramDatabaseFile="$(OutDir)/miniunz.pdb" |
| 246 | SubSystem="1" | 249 | SubSystem="1" |
| 247 | TargetMachine="5" | 250 | TargetMachine="17" |
| 248 | /> | 251 | /> |
| 249 | <Tool | 252 | <Tool |
| 250 | Name="VCALinkTool" | 253 | Name="VCALinkTool" |
| @@ -272,9 +275,9 @@ | |||
| 272 | /> | 275 | /> |
| 273 | </Configuration> | 276 | </Configuration> |
| 274 | <Configuration | 277 | <Configuration |
| 275 | Name="Release|Win32" | 278 | Name="Debug|Itanium" |
| 276 | OutputDirectory="x86\MiniUnzip$(ConfigurationName)" | 279 | OutputDirectory="ia64\MiniUnzip$(ConfigurationName)" |
| 277 | IntermediateDirectory="x86\MiniUnzip$(ConfigurationName)\Tmp" | 280 | IntermediateDirectory="ia64\MiniUnzip$(ConfigurationName)\Tmp" |
| 278 | ConfigurationType="1" | 281 | ConfigurationType="1" |
| 279 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 282 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
| 280 | CharacterSet="2" | 283 | CharacterSet="2" |
| @@ -293,19 +296,17 @@ | |||
| 293 | /> | 296 | /> |
| 294 | <Tool | 297 | <Tool |
| 295 | Name="VCMIDLTool" | 298 | Name="VCMIDLTool" |
| 299 | TargetEnvironment="2" | ||
| 296 | /> | 300 | /> |
| 297 | <Tool | 301 | <Tool |
| 298 | Name="VCCLCompilerTool" | 302 | Name="VCCLCompilerTool" |
| 299 | Optimization="2" | 303 | Optimization="0" |
| 300 | InlineFunctionExpansion="1" | ||
| 301 | OmitFramePointers="true" | ||
| 302 | AdditionalIncludeDirectories="..\..\..;..\..\minizip" | 304 | AdditionalIncludeDirectories="..\..\..;..\..\minizip" |
| 303 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE" | 305 | PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64" |
| 304 | StringPooling="true" | 306 | MinimalRebuild="true" |
| 305 | BasicRuntimeChecks="0" | 307 | BasicRuntimeChecks="0" |
| 306 | RuntimeLibrary="0" | 308 | RuntimeLibrary="3" |
| 307 | BufferSecurityCheck="false" | 309 | BufferSecurityCheck="false" |
| 308 | EnableFunctionLevelLinking="true" | ||
| 309 | UsePrecompiledHeader="0" | 310 | UsePrecompiledHeader="0" |
| 310 | AssemblerListingLocation="$(IntDir)\" | 311 | AssemblerListingLocation="$(IntDir)\" |
| 311 | WarningLevel="3" | 312 | WarningLevel="3" |
| @@ -323,16 +324,14 @@ | |||
| 323 | /> | 324 | /> |
| 324 | <Tool | 325 | <Tool |
| 325 | Name="VCLinkerTool" | 326 | Name="VCLinkerTool" |
| 326 | AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib" | 327 | AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib" |
| 327 | OutputFile="$(OutDir)/miniunz.exe" | 328 | OutputFile="$(OutDir)/miniunz.exe" |
| 328 | LinkIncremental="1" | 329 | LinkIncremental="2" |
| 329 | GenerateManifest="false" | 330 | GenerateManifest="false" |
| 330 | GenerateDebugInformation="true" | 331 | GenerateDebugInformation="true" |
| 332 | ProgramDatabaseFile="$(OutDir)/miniunz.pdb" | ||
| 331 | SubSystem="1" | 333 | SubSystem="1" |
| 332 | OptimizeReferences="2" | 334 | TargetMachine="5" |
| 333 | EnableCOMDATFolding="2" | ||
| 334 | OptimizeForWindows98="1" | ||
| 335 | TargetMachine="1" | ||
| 336 | /> | 335 | /> |
| 337 | <Tool | 336 | <Tool |
| 338 | Name="VCALinkTool" | 337 | Name="VCALinkTool" |
diff --git a/contrib/vstudio/vc8/minizip.vcproj b/contrib/vstudio/vc9/minizip.vcproj index 85f64c4..e57e07d 100644 --- a/contrib/vstudio/vc8/minizip.vcproj +++ b/contrib/vstudio/vc9/minizip.vcproj | |||
| @@ -1,10 +1,11 @@ | |||
| 1 | <?xml version="1.0" encoding="Windows-1252"?> | 1 | <?xml version="1.0" encoding="Windows-1252"?> |
| 2 | <VisualStudioProject | 2 | <VisualStudioProject |
| 3 | ProjectType="Visual C++" | 3 | ProjectType="Visual C++" |
| 4 | Version="8,00" | 4 | Version="9.00" |
| 5 | Name="minizip" | 5 | Name="minizip" |
| 6 | ProjectGUID="{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}" | 6 | ProjectGUID="{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}" |
| 7 | Keyword="Win32Proj" | 7 | Keyword="Win32Proj" |
| 8 | TargetFrameworkVersion="131072" | ||
| 8 | > | 9 | > |
| 9 | <Platforms> | 10 | <Platforms> |
| 10 | <Platform | 11 | <Platform |
| @@ -76,6 +77,8 @@ | |||
| 76 | GenerateDebugInformation="true" | 77 | GenerateDebugInformation="true" |
| 77 | ProgramDatabaseFile="$(OutDir)/minizip.pdb" | 78 | ProgramDatabaseFile="$(OutDir)/minizip.pdb" |
| 78 | SubSystem="1" | 79 | SubSystem="1" |
| 80 | RandomizedBaseAddress="1" | ||
| 81 | DataExecutionPrevention="0" | ||
| 79 | TargetMachine="1" | 82 | TargetMachine="1" |
| 80 | /> | 83 | /> |
| 81 | <Tool | 84 | <Tool |
| @@ -97,16 +100,13 @@ | |||
| 97 | Name="VCAppVerifierTool" | 100 | Name="VCAppVerifierTool" |
| 98 | /> | 101 | /> |
| 99 | <Tool | 102 | <Tool |
| 100 | Name="VCWebDeploymentTool" | ||
| 101 | /> | ||
| 102 | <Tool | ||
| 103 | Name="VCPostBuildEventTool" | 103 | Name="VCPostBuildEventTool" |
| 104 | /> | 104 | /> |
| 105 | </Configuration> | 105 | </Configuration> |
| 106 | <Configuration | 106 | <Configuration |
| 107 | Name="Debug|x64" | 107 | Name="Release|Win32" |
| 108 | OutputDirectory="x64\$(ConfigurationName)" | 108 | OutputDirectory="x86\MiniZip$(ConfigurationName)" |
| 109 | IntermediateDirectory="x64\$(ConfigurationName)" | 109 | IntermediateDirectory="x86\MiniZip$(ConfigurationName)\Tmp" |
| 110 | ConfigurationType="1" | 110 | ConfigurationType="1" |
| 111 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 111 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
| 112 | CharacterSet="2" | 112 | CharacterSet="2" |
| @@ -125,17 +125,19 @@ | |||
| 125 | /> | 125 | /> |
| 126 | <Tool | 126 | <Tool |
| 127 | Name="VCMIDLTool" | 127 | Name="VCMIDLTool" |
| 128 | TargetEnvironment="3" | ||
| 129 | /> | 128 | /> |
| 130 | <Tool | 129 | <Tool |
| 131 | Name="VCCLCompilerTool" | 130 | Name="VCCLCompilerTool" |
| 132 | Optimization="0" | 131 | Optimization="2" |
| 132 | InlineFunctionExpansion="1" | ||
| 133 | OmitFramePointers="true" | ||
| 133 | AdditionalIncludeDirectories="..\..\..;..\..\minizip" | 134 | AdditionalIncludeDirectories="..\..\..;..\..\minizip" |
| 134 | PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64" | 135 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE" |
| 135 | MinimalRebuild="true" | 136 | StringPooling="true" |
| 136 | BasicRuntimeChecks="0" | 137 | BasicRuntimeChecks="0" |
| 137 | RuntimeLibrary="3" | 138 | RuntimeLibrary="0" |
| 138 | BufferSecurityCheck="false" | 139 | BufferSecurityCheck="false" |
| 140 | EnableFunctionLevelLinking="true" | ||
| 139 | UsePrecompiledHeader="0" | 141 | UsePrecompiledHeader="0" |
| 140 | AssemblerListingLocation="$(IntDir)\" | 142 | AssemblerListingLocation="$(IntDir)\" |
| 141 | WarningLevel="3" | 143 | WarningLevel="3" |
| @@ -153,14 +155,17 @@ | |||
| 153 | /> | 155 | /> |
| 154 | <Tool | 156 | <Tool |
| 155 | Name="VCLinkerTool" | 157 | Name="VCLinkerTool" |
| 156 | AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib" | 158 | AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib" |
| 157 | OutputFile="$(OutDir)/minizip.exe" | 159 | OutputFile="$(OutDir)/minizip.exe" |
| 158 | LinkIncremental="2" | 160 | LinkIncremental="1" |
| 159 | GenerateManifest="false" | ||
| 160 | GenerateDebugInformation="true" | 161 | GenerateDebugInformation="true" |
| 161 | ProgramDatabaseFile="$(OutDir)/minizip.pdb" | ||
| 162 | SubSystem="1" | 162 | SubSystem="1" |
| 163 | TargetMachine="17" | 163 | OptimizeReferences="2" |
| 164 | EnableCOMDATFolding="2" | ||
| 165 | OptimizeForWindows98="1" | ||
| 166 | RandomizedBaseAddress="1" | ||
| 167 | DataExecutionPrevention="0" | ||
| 168 | TargetMachine="1" | ||
| 164 | /> | 169 | /> |
| 165 | <Tool | 170 | <Tool |
| 166 | Name="VCALinkTool" | 171 | Name="VCALinkTool" |
| @@ -181,16 +186,13 @@ | |||
| 181 | Name="VCAppVerifierTool" | 186 | Name="VCAppVerifierTool" |
| 182 | /> | 187 | /> |
| 183 | <Tool | 188 | <Tool |
| 184 | Name="VCWebDeploymentTool" | ||
| 185 | /> | ||
| 186 | <Tool | ||
| 187 | Name="VCPostBuildEventTool" | 189 | Name="VCPostBuildEventTool" |
| 188 | /> | 190 | /> |
| 189 | </Configuration> | 191 | </Configuration> |
| 190 | <Configuration | 192 | <Configuration |
| 191 | Name="Debug|Itanium" | 193 | Name="Debug|x64" |
| 192 | OutputDirectory="ia64\$(ConfigurationName)" | 194 | OutputDirectory="x64\$(ConfigurationName)" |
| 193 | IntermediateDirectory="ia64\$(ConfigurationName)" | 195 | IntermediateDirectory="x64\$(ConfigurationName)" |
| 194 | ConfigurationType="1" | 196 | ConfigurationType="1" |
| 195 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 197 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
| 196 | CharacterSet="2" | 198 | CharacterSet="2" |
| @@ -209,7 +211,7 @@ | |||
| 209 | /> | 211 | /> |
| 210 | <Tool | 212 | <Tool |
| 211 | Name="VCMIDLTool" | 213 | Name="VCMIDLTool" |
| 212 | TargetEnvironment="2" | 214 | TargetEnvironment="3" |
| 213 | /> | 215 | /> |
| 214 | <Tool | 216 | <Tool |
| 215 | Name="VCCLCompilerTool" | 217 | Name="VCCLCompilerTool" |
| @@ -237,14 +239,14 @@ | |||
| 237 | /> | 239 | /> |
| 238 | <Tool | 240 | <Tool |
| 239 | Name="VCLinkerTool" | 241 | Name="VCLinkerTool" |
| 240 | AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib" | 242 | AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib" |
| 241 | OutputFile="$(OutDir)/minizip.exe" | 243 | OutputFile="$(OutDir)/minizip.exe" |
| 242 | LinkIncremental="2" | 244 | LinkIncremental="2" |
| 243 | GenerateManifest="false" | 245 | GenerateManifest="false" |
| 244 | GenerateDebugInformation="true" | 246 | GenerateDebugInformation="true" |
| 245 | ProgramDatabaseFile="$(OutDir)/minizip.pdb" | 247 | ProgramDatabaseFile="$(OutDir)/minizip.pdb" |
| 246 | SubSystem="1" | 248 | SubSystem="1" |
| 247 | TargetMachine="5" | 249 | TargetMachine="17" |
| 248 | /> | 250 | /> |
| 249 | <Tool | 251 | <Tool |
| 250 | Name="VCALinkTool" | 252 | Name="VCALinkTool" |
| @@ -272,9 +274,9 @@ | |||
| 272 | /> | 274 | /> |
| 273 | </Configuration> | 275 | </Configuration> |
| 274 | <Configuration | 276 | <Configuration |
| 275 | Name="Release|Win32" | 277 | Name="Debug|Itanium" |
| 276 | OutputDirectory="x86\MiniZip$(ConfigurationName)" | 278 | OutputDirectory="ia64\$(ConfigurationName)" |
| 277 | IntermediateDirectory="x86\MiniZip$(ConfigurationName)\Tmp" | 279 | IntermediateDirectory="ia64\$(ConfigurationName)" |
| 278 | ConfigurationType="1" | 280 | ConfigurationType="1" |
| 279 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 281 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
| 280 | CharacterSet="2" | 282 | CharacterSet="2" |
| @@ -293,19 +295,17 @@ | |||
| 293 | /> | 295 | /> |
| 294 | <Tool | 296 | <Tool |
| 295 | Name="VCMIDLTool" | 297 | Name="VCMIDLTool" |
| 298 | TargetEnvironment="2" | ||
| 296 | /> | 299 | /> |
| 297 | <Tool | 300 | <Tool |
| 298 | Name="VCCLCompilerTool" | 301 | Name="VCCLCompilerTool" |
| 299 | Optimization="2" | 302 | Optimization="0" |
| 300 | InlineFunctionExpansion="1" | ||
| 301 | OmitFramePointers="true" | ||
| 302 | AdditionalIncludeDirectories="..\..\..;..\..\minizip" | 303 | AdditionalIncludeDirectories="..\..\..;..\..\minizip" |
| 303 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE" | 304 | PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64" |
| 304 | StringPooling="true" | 305 | MinimalRebuild="true" |
| 305 | BasicRuntimeChecks="0" | 306 | BasicRuntimeChecks="0" |
| 306 | RuntimeLibrary="0" | 307 | RuntimeLibrary="3" |
| 307 | BufferSecurityCheck="false" | 308 | BufferSecurityCheck="false" |
| 308 | EnableFunctionLevelLinking="true" | ||
| 309 | UsePrecompiledHeader="0" | 309 | UsePrecompiledHeader="0" |
| 310 | AssemblerListingLocation="$(IntDir)\" | 310 | AssemblerListingLocation="$(IntDir)\" |
| 311 | WarningLevel="3" | 311 | WarningLevel="3" |
| @@ -323,15 +323,14 @@ | |||
| 323 | /> | 323 | /> |
| 324 | <Tool | 324 | <Tool |
| 325 | Name="VCLinkerTool" | 325 | Name="VCLinkerTool" |
| 326 | AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib" | 326 | AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib" |
| 327 | OutputFile="$(OutDir)/minizip.exe" | 327 | OutputFile="$(OutDir)/minizip.exe" |
| 328 | LinkIncremental="1" | 328 | LinkIncremental="2" |
| 329 | GenerateManifest="false" | ||
| 329 | GenerateDebugInformation="true" | 330 | GenerateDebugInformation="true" |
| 331 | ProgramDatabaseFile="$(OutDir)/minizip.pdb" | ||
| 330 | SubSystem="1" | 332 | SubSystem="1" |
| 331 | OptimizeReferences="2" | 333 | TargetMachine="5" |
| 332 | EnableCOMDATFolding="2" | ||
| 333 | OptimizeForWindows98="1" | ||
| 334 | TargetMachine="1" | ||
| 335 | /> | 334 | /> |
| 336 | <Tool | 335 | <Tool |
| 337 | Name="VCALinkTool" | 336 | Name="VCALinkTool" |
diff --git a/contrib/vstudio/vc8/testzlib.vcproj b/contrib/vstudio/vc9/testzlib.vcproj index 68c3539..9ad07ae 100644 --- a/contrib/vstudio/vc8/testzlib.vcproj +++ b/contrib/vstudio/vc9/testzlib.vcproj | |||
| @@ -1,11 +1,12 @@ | |||
| 1 | <?xml version="1.0" encoding="Windows-1252"?> | 1 | <?xml version="1.0" encoding="Windows-1252"?> |
| 2 | <VisualStudioProject | 2 | <VisualStudioProject |
| 3 | ProjectType="Visual C++" | 3 | ProjectType="Visual C++" |
| 4 | Version="8,00" | 4 | Version="9.00" |
| 5 | Name="testzlib" | 5 | Name="testzlib" |
| 6 | ProjectGUID="{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}" | 6 | ProjectGUID="{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}" |
| 7 | RootNamespace="testzlib" | 7 | RootNamespace="testzlib" |
| 8 | Keyword="Win32Proj" | 8 | Keyword="Win32Proj" |
| 9 | TargetFrameworkVersion="131072" | ||
| 9 | > | 10 | > |
| 10 | <Platforms> | 11 | <Platforms> |
| 11 | <Platform | 12 | <Platform |
| @@ -47,7 +48,7 @@ | |||
| 47 | Name="VCCLCompilerTool" | 48 | Name="VCCLCompilerTool" |
| 48 | Optimization="0" | 49 | Optimization="0" |
| 49 | AdditionalIncludeDirectories="..\..\.." | 50 | AdditionalIncludeDirectories="..\..\.." |
| 50 | PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" | 51 | PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" |
| 51 | MinimalRebuild="true" | 52 | MinimalRebuild="true" |
| 52 | BasicRuntimeChecks="0" | 53 | BasicRuntimeChecks="0" |
| 53 | RuntimeLibrary="1" | 54 | RuntimeLibrary="1" |
| @@ -77,6 +78,8 @@ | |||
| 77 | GenerateDebugInformation="true" | 78 | GenerateDebugInformation="true" |
| 78 | ProgramDatabaseFile="$(OutDir)/testzlib.pdb" | 79 | ProgramDatabaseFile="$(OutDir)/testzlib.pdb" |
| 79 | SubSystem="1" | 80 | SubSystem="1" |
| 81 | RandomizedBaseAddress="1" | ||
| 82 | DataExecutionPrevention="0" | ||
| 80 | TargetMachine="1" | 83 | TargetMachine="1" |
| 81 | /> | 84 | /> |
| 82 | <Tool | 85 | <Tool |
| @@ -98,17 +101,16 @@ | |||
| 98 | Name="VCAppVerifierTool" | 101 | Name="VCAppVerifierTool" |
| 99 | /> | 102 | /> |
| 100 | <Tool | 103 | <Tool |
| 101 | Name="VCWebDeploymentTool" | ||
| 102 | /> | ||
| 103 | <Tool | ||
| 104 | Name="VCPostBuildEventTool" | 104 | Name="VCPostBuildEventTool" |
| 105 | /> | 105 | /> |
| 106 | </Configuration> | 106 | </Configuration> |
| 107 | <Configuration | 107 | <Configuration |
| 108 | Name="Debug|x64" | 108 | Name="ReleaseWithoutAsm|Win32" |
| 109 | OutputDirectory="x64\TestZlib$(ConfigurationName)" | 109 | OutputDirectory="x86\TestZlib$(ConfigurationName)" |
| 110 | IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp" | 110 | IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp" |
| 111 | ConfigurationType="1" | 111 | ConfigurationType="1" |
| 112 | CharacterSet="2" | ||
| 113 | WholeProgramOptimization="1" | ||
| 112 | > | 114 | > |
| 113 | <Tool | 115 | <Tool |
| 114 | Name="VCPreBuildEventTool" | 116 | Name="VCPreBuildEventTool" |
| @@ -127,12 +129,21 @@ | |||
| 127 | /> | 129 | /> |
| 128 | <Tool | 130 | <Tool |
| 129 | Name="VCCLCompilerTool" | 131 | Name="VCCLCompilerTool" |
| 132 | Optimization="2" | ||
| 133 | InlineFunctionExpansion="1" | ||
| 134 | OmitFramePointers="true" | ||
| 130 | AdditionalIncludeDirectories="..\..\.." | 135 | AdditionalIncludeDirectories="..\..\.." |
| 131 | PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" | 136 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" |
| 137 | StringPooling="true" | ||
| 132 | BasicRuntimeChecks="0" | 138 | BasicRuntimeChecks="0" |
| 133 | RuntimeLibrary="3" | 139 | RuntimeLibrary="0" |
| 134 | BufferSecurityCheck="false" | 140 | BufferSecurityCheck="false" |
| 141 | EnableFunctionLevelLinking="true" | ||
| 142 | UsePrecompiledHeader="0" | ||
| 135 | AssemblerListingLocation="$(IntDir)\" | 143 | AssemblerListingLocation="$(IntDir)\" |
| 144 | WarningLevel="3" | ||
| 145 | Detect64BitPortabilityProblems="true" | ||
| 146 | DebugInformationFormat="3" | ||
| 136 | /> | 147 | /> |
| 137 | <Tool | 148 | <Tool |
| 138 | Name="VCManagedResourceCompilerTool" | 149 | Name="VCManagedResourceCompilerTool" |
| @@ -145,8 +156,17 @@ | |||
| 145 | /> | 156 | /> |
| 146 | <Tool | 157 | <Tool |
| 147 | Name="VCLinkerTool" | 158 | Name="VCLinkerTool" |
| 148 | AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj" | 159 | OutputFile="$(OutDir)/testzlib.exe" |
| 160 | LinkIncremental="1" | ||
| 149 | GenerateManifest="false" | 161 | GenerateManifest="false" |
| 162 | GenerateDebugInformation="true" | ||
| 163 | SubSystem="1" | ||
| 164 | OptimizeReferences="2" | ||
| 165 | EnableCOMDATFolding="2" | ||
| 166 | OptimizeForWindows98="1" | ||
| 167 | RandomizedBaseAddress="1" | ||
| 168 | DataExecutionPrevention="0" | ||
| 169 | TargetMachine="1" | ||
| 150 | /> | 170 | /> |
| 151 | <Tool | 171 | <Tool |
| 152 | Name="VCALinkTool" | 172 | Name="VCALinkTool" |
| @@ -167,18 +187,16 @@ | |||
| 167 | Name="VCAppVerifierTool" | 187 | Name="VCAppVerifierTool" |
| 168 | /> | 188 | /> |
| 169 | <Tool | 189 | <Tool |
| 170 | Name="VCWebDeploymentTool" | ||
| 171 | /> | ||
| 172 | <Tool | ||
| 173 | Name="VCPostBuildEventTool" | 190 | Name="VCPostBuildEventTool" |
| 174 | /> | 191 | /> |
| 175 | </Configuration> | 192 | </Configuration> |
| 176 | <Configuration | 193 | <Configuration |
| 177 | Name="Debug|Itanium" | 194 | Name="Release|Win32" |
| 178 | OutputDirectory="ia64\TestZlib$(ConfigurationName)" | 195 | OutputDirectory="x86\TestZlib$(ConfigurationName)" |
| 179 | IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp" | 196 | IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp" |
| 180 | ConfigurationType="1" | 197 | ConfigurationType="1" |
| 181 | CharacterSet="2" | 198 | CharacterSet="2" |
| 199 | WholeProgramOptimization="1" | ||
| 182 | > | 200 | > |
| 183 | <Tool | 201 | <Tool |
| 184 | Name="VCPreBuildEventTool" | 202 | Name="VCPreBuildEventTool" |
| @@ -194,19 +212,20 @@ | |||
| 194 | /> | 212 | /> |
| 195 | <Tool | 213 | <Tool |
| 196 | Name="VCMIDLTool" | 214 | Name="VCMIDLTool" |
| 197 | TargetEnvironment="2" | ||
| 198 | /> | 215 | /> |
| 199 | <Tool | 216 | <Tool |
| 200 | Name="VCCLCompilerTool" | 217 | Name="VCCLCompilerTool" |
| 201 | Optimization="0" | 218 | Optimization="2" |
| 219 | InlineFunctionExpansion="1" | ||
| 220 | OmitFramePointers="true" | ||
| 202 | AdditionalIncludeDirectories="..\..\.." | 221 | AdditionalIncludeDirectories="..\..\.." |
| 203 | PreprocessorDefinitions="ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" | 222 | PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" |
| 204 | MinimalRebuild="true" | 223 | StringPooling="true" |
| 205 | BasicRuntimeChecks="0" | 224 | BasicRuntimeChecks="0" |
| 206 | RuntimeLibrary="3" | 225 | RuntimeLibrary="0" |
| 207 | BufferSecurityCheck="false" | 226 | BufferSecurityCheck="false" |
| 227 | EnableFunctionLevelLinking="true" | ||
| 208 | UsePrecompiledHeader="0" | 228 | UsePrecompiledHeader="0" |
| 209 | AssemblerOutput="4" | ||
| 210 | AssemblerListingLocation="$(IntDir)\" | 229 | AssemblerListingLocation="$(IntDir)\" |
| 211 | WarningLevel="3" | 230 | WarningLevel="3" |
| 212 | Detect64BitPortabilityProblems="true" | 231 | Detect64BitPortabilityProblems="true" |
| @@ -223,13 +242,18 @@ | |||
| 223 | /> | 242 | /> |
| 224 | <Tool | 243 | <Tool |
| 225 | Name="VCLinkerTool" | 244 | Name="VCLinkerTool" |
| 245 | AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj" | ||
| 226 | OutputFile="$(OutDir)/testzlib.exe" | 246 | OutputFile="$(OutDir)/testzlib.exe" |
| 227 | LinkIncremental="2" | 247 | LinkIncremental="1" |
| 228 | GenerateManifest="false" | 248 | GenerateManifest="false" |
| 229 | GenerateDebugInformation="true" | 249 | GenerateDebugInformation="true" |
| 230 | ProgramDatabaseFile="$(OutDir)/testzlib.pdb" | ||
| 231 | SubSystem="1" | 250 | SubSystem="1" |
| 232 | TargetMachine="5" | 251 | OptimizeReferences="2" |
| 252 | EnableCOMDATFolding="2" | ||
| 253 | OptimizeForWindows98="1" | ||
| 254 | RandomizedBaseAddress="1" | ||
| 255 | DataExecutionPrevention="0" | ||
| 256 | TargetMachine="1" | ||
| 233 | /> | 257 | /> |
| 234 | <Tool | 258 | <Tool |
| 235 | Name="VCALinkTool" | 259 | Name="VCALinkTool" |
| @@ -250,19 +274,14 @@ | |||
| 250 | Name="VCAppVerifierTool" | 274 | Name="VCAppVerifierTool" |
| 251 | /> | 275 | /> |
| 252 | <Tool | 276 | <Tool |
| 253 | Name="VCWebDeploymentTool" | ||
| 254 | /> | ||
| 255 | <Tool | ||
| 256 | Name="VCPostBuildEventTool" | 277 | Name="VCPostBuildEventTool" |
| 257 | /> | 278 | /> |
| 258 | </Configuration> | 279 | </Configuration> |
| 259 | <Configuration | 280 | <Configuration |
| 260 | Name="ReleaseWithoutAsm|Win32" | 281 | Name="Debug|x64" |
| 261 | OutputDirectory="x86\TestZlib$(ConfigurationName)" | 282 | OutputDirectory="x64\TestZlib$(ConfigurationName)" |
| 262 | IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp" | 283 | IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp" |
| 263 | ConfigurationType="1" | 284 | ConfigurationType="1" |
| 264 | CharacterSet="2" | ||
| 265 | WholeProgramOptimization="1" | ||
| 266 | > | 285 | > |
| 267 | <Tool | 286 | <Tool |
| 268 | Name="VCPreBuildEventTool" | 287 | Name="VCPreBuildEventTool" |
| @@ -281,21 +300,12 @@ | |||
| 281 | /> | 300 | /> |
| 282 | <Tool | 301 | <Tool |
| 283 | Name="VCCLCompilerTool" | 302 | Name="VCCLCompilerTool" |
| 284 | Optimization="2" | ||
| 285 | InlineFunctionExpansion="1" | ||
| 286 | OmitFramePointers="true" | ||
| 287 | AdditionalIncludeDirectories="..\..\.." | 303 | AdditionalIncludeDirectories="..\..\.." |
| 288 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" | 304 | PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" |
| 289 | StringPooling="true" | ||
| 290 | BasicRuntimeChecks="0" | 305 | BasicRuntimeChecks="0" |
| 291 | RuntimeLibrary="0" | 306 | RuntimeLibrary="3" |
| 292 | BufferSecurityCheck="false" | 307 | BufferSecurityCheck="false" |
| 293 | EnableFunctionLevelLinking="true" | ||
| 294 | UsePrecompiledHeader="0" | ||
| 295 | AssemblerListingLocation="$(IntDir)\" | 308 | AssemblerListingLocation="$(IntDir)\" |
| 296 | WarningLevel="3" | ||
| 297 | Detect64BitPortabilityProblems="true" | ||
| 298 | DebugInformationFormat="3" | ||
| 299 | /> | 309 | /> |
| 300 | <Tool | 310 | <Tool |
| 301 | Name="VCManagedResourceCompilerTool" | 311 | Name="VCManagedResourceCompilerTool" |
| @@ -308,15 +318,8 @@ | |||
| 308 | /> | 318 | /> |
| 309 | <Tool | 319 | <Tool |
| 310 | Name="VCLinkerTool" | 320 | Name="VCLinkerTool" |
| 311 | OutputFile="$(OutDir)/testzlib.exe" | 321 | AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj" |
| 312 | LinkIncremental="1" | ||
| 313 | GenerateManifest="false" | 322 | GenerateManifest="false" |
| 314 | GenerateDebugInformation="true" | ||
| 315 | SubSystem="1" | ||
| 316 | OptimizeReferences="2" | ||
| 317 | EnableCOMDATFolding="2" | ||
| 318 | OptimizeForWindows98="1" | ||
| 319 | TargetMachine="1" | ||
| 320 | /> | 323 | /> |
| 321 | <Tool | 324 | <Tool |
| 322 | Name="VCALinkTool" | 325 | Name="VCALinkTool" |
| @@ -344,11 +347,11 @@ | |||
| 344 | /> | 347 | /> |
| 345 | </Configuration> | 348 | </Configuration> |
| 346 | <Configuration | 349 | <Configuration |
| 347 | Name="ReleaseWithoutAsm|x64" | 350 | Name="Debug|Itanium" |
| 348 | OutputDirectory="x64\TestZlib$(ConfigurationName)" | 351 | OutputDirectory="ia64\TestZlib$(ConfigurationName)" |
| 349 | IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp" | 352 | IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp" |
| 350 | ConfigurationType="1" | 353 | ConfigurationType="1" |
| 351 | WholeProgramOptimization="1" | 354 | CharacterSet="2" |
| 352 | > | 355 | > |
| 353 | <Tool | 356 | <Tool |
| 354 | Name="VCPreBuildEventTool" | 357 | Name="VCPreBuildEventTool" |
| @@ -364,15 +367,23 @@ | |||
| 364 | /> | 367 | /> |
| 365 | <Tool | 368 | <Tool |
| 366 | Name="VCMIDLTool" | 369 | Name="VCMIDLTool" |
| 370 | TargetEnvironment="2" | ||
| 367 | /> | 371 | /> |
| 368 | <Tool | 372 | <Tool |
| 369 | Name="VCCLCompilerTool" | 373 | Name="VCCLCompilerTool" |
| 374 | Optimization="0" | ||
| 370 | AdditionalIncludeDirectories="..\..\.." | 375 | AdditionalIncludeDirectories="..\..\.." |
| 371 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" | 376 | PreprocessorDefinitions="ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" |
| 377 | MinimalRebuild="true" | ||
| 372 | BasicRuntimeChecks="0" | 378 | BasicRuntimeChecks="0" |
| 373 | RuntimeLibrary="2" | 379 | RuntimeLibrary="3" |
| 374 | BufferSecurityCheck="false" | 380 | BufferSecurityCheck="false" |
| 381 | UsePrecompiledHeader="0" | ||
| 382 | AssemblerOutput="4" | ||
| 375 | AssemblerListingLocation="$(IntDir)\" | 383 | AssemblerListingLocation="$(IntDir)\" |
| 384 | WarningLevel="3" | ||
| 385 | Detect64BitPortabilityProblems="true" | ||
| 386 | DebugInformationFormat="3" | ||
| 376 | /> | 387 | /> |
| 377 | <Tool | 388 | <Tool |
| 378 | Name="VCManagedResourceCompilerTool" | 389 | Name="VCManagedResourceCompilerTool" |
| @@ -385,8 +396,13 @@ | |||
| 385 | /> | 396 | /> |
| 386 | <Tool | 397 | <Tool |
| 387 | Name="VCLinkerTool" | 398 | Name="VCLinkerTool" |
| 388 | AdditionalDependencies="" | 399 | OutputFile="$(OutDir)/testzlib.exe" |
| 400 | LinkIncremental="2" | ||
| 389 | GenerateManifest="false" | 401 | GenerateManifest="false" |
| 402 | GenerateDebugInformation="true" | ||
| 403 | ProgramDatabaseFile="$(OutDir)/testzlib.pdb" | ||
| 404 | SubSystem="1" | ||
| 405 | TargetMachine="5" | ||
| 390 | /> | 406 | /> |
| 391 | <Tool | 407 | <Tool |
| 392 | Name="VCALinkTool" | 408 | Name="VCALinkTool" |
| @@ -414,11 +430,10 @@ | |||
| 414 | /> | 430 | /> |
| 415 | </Configuration> | 431 | </Configuration> |
| 416 | <Configuration | 432 | <Configuration |
| 417 | Name="ReleaseWithoutAsm|Itanium" | 433 | Name="ReleaseWithoutAsm|x64" |
| 418 | OutputDirectory="ia64\TestZlib$(ConfigurationName)" | 434 | OutputDirectory="x64\TestZlib$(ConfigurationName)" |
| 419 | IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp" | 435 | IntermediateDirectory="x64\TestZlib$(ConfigurationName)\Tmp" |
| 420 | ConfigurationType="1" | 436 | ConfigurationType="1" |
| 421 | CharacterSet="2" | ||
| 422 | WholeProgramOptimization="1" | 437 | WholeProgramOptimization="1" |
| 423 | > | 438 | > |
| 424 | <Tool | 439 | <Tool |
| @@ -435,25 +450,15 @@ | |||
| 435 | /> | 450 | /> |
| 436 | <Tool | 451 | <Tool |
| 437 | Name="VCMIDLTool" | 452 | Name="VCMIDLTool" |
| 438 | TargetEnvironment="2" | ||
| 439 | /> | 453 | /> |
| 440 | <Tool | 454 | <Tool |
| 441 | Name="VCCLCompilerTool" | 455 | Name="VCCLCompilerTool" |
| 442 | Optimization="2" | ||
| 443 | InlineFunctionExpansion="1" | ||
| 444 | OmitFramePointers="true" | ||
| 445 | AdditionalIncludeDirectories="..\..\.." | 456 | AdditionalIncludeDirectories="..\..\.." |
| 446 | PreprocessorDefinitions="ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" | 457 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" |
| 447 | StringPooling="true" | ||
| 448 | BasicRuntimeChecks="0" | 458 | BasicRuntimeChecks="0" |
| 449 | RuntimeLibrary="2" | 459 | RuntimeLibrary="2" |
| 450 | BufferSecurityCheck="false" | 460 | BufferSecurityCheck="false" |
| 451 | EnableFunctionLevelLinking="true" | ||
| 452 | UsePrecompiledHeader="0" | ||
| 453 | AssemblerListingLocation="$(IntDir)\" | 461 | AssemblerListingLocation="$(IntDir)\" |
| 454 | WarningLevel="3" | ||
| 455 | Detect64BitPortabilityProblems="true" | ||
| 456 | DebugInformationFormat="3" | ||
| 457 | /> | 462 | /> |
| 458 | <Tool | 463 | <Tool |
| 459 | Name="VCManagedResourceCompilerTool" | 464 | Name="VCManagedResourceCompilerTool" |
| @@ -466,15 +471,8 @@ | |||
| 466 | /> | 471 | /> |
| 467 | <Tool | 472 | <Tool |
| 468 | Name="VCLinkerTool" | 473 | Name="VCLinkerTool" |
| 469 | OutputFile="$(OutDir)/testzlib.exe" | 474 | AdditionalDependencies="" |
| 470 | LinkIncremental="1" | ||
| 471 | GenerateManifest="false" | 475 | GenerateManifest="false" |
| 472 | GenerateDebugInformation="true" | ||
| 473 | SubSystem="1" | ||
| 474 | OptimizeReferences="2" | ||
| 475 | EnableCOMDATFolding="2" | ||
| 476 | OptimizeForWindows98="1" | ||
| 477 | TargetMachine="5" | ||
| 478 | /> | 476 | /> |
| 479 | <Tool | 477 | <Tool |
| 480 | Name="VCALinkTool" | 478 | Name="VCALinkTool" |
| @@ -502,9 +500,9 @@ | |||
| 502 | /> | 500 | /> |
| 503 | </Configuration> | 501 | </Configuration> |
| 504 | <Configuration | 502 | <Configuration |
| 505 | Name="Release|Win32" | 503 | Name="ReleaseWithoutAsm|Itanium" |
| 506 | OutputDirectory="x86\TestZlib$(ConfigurationName)" | 504 | OutputDirectory="ia64\TestZlib$(ConfigurationName)" |
| 507 | IntermediateDirectory="x86\TestZlib$(ConfigurationName)\Tmp" | 505 | IntermediateDirectory="ia64\TestZlib$(ConfigurationName)\Tmp" |
| 508 | ConfigurationType="1" | 506 | ConfigurationType="1" |
| 509 | CharacterSet="2" | 507 | CharacterSet="2" |
| 510 | WholeProgramOptimization="1" | 508 | WholeProgramOptimization="1" |
| @@ -523,6 +521,7 @@ | |||
| 523 | /> | 521 | /> |
| 524 | <Tool | 522 | <Tool |
| 525 | Name="VCMIDLTool" | 523 | Name="VCMIDLTool" |
| 524 | TargetEnvironment="2" | ||
| 526 | /> | 525 | /> |
| 527 | <Tool | 526 | <Tool |
| 528 | Name="VCCLCompilerTool" | 527 | Name="VCCLCompilerTool" |
| @@ -530,10 +529,10 @@ | |||
| 530 | InlineFunctionExpansion="1" | 529 | InlineFunctionExpansion="1" |
| 531 | OmitFramePointers="true" | 530 | OmitFramePointers="true" |
| 532 | AdditionalIncludeDirectories="..\..\.." | 531 | AdditionalIncludeDirectories="..\..\.." |
| 533 | PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" | 532 | PreprocessorDefinitions="ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" |
| 534 | StringPooling="true" | 533 | StringPooling="true" |
| 535 | BasicRuntimeChecks="0" | 534 | BasicRuntimeChecks="0" |
| 536 | RuntimeLibrary="0" | 535 | RuntimeLibrary="2" |
| 537 | BufferSecurityCheck="false" | 536 | BufferSecurityCheck="false" |
| 538 | EnableFunctionLevelLinking="true" | 537 | EnableFunctionLevelLinking="true" |
| 539 | UsePrecompiledHeader="0" | 538 | UsePrecompiledHeader="0" |
| @@ -553,7 +552,6 @@ | |||
| 553 | /> | 552 | /> |
| 554 | <Tool | 553 | <Tool |
| 555 | Name="VCLinkerTool" | 554 | Name="VCLinkerTool" |
| 556 | AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj" | ||
| 557 | OutputFile="$(OutDir)/testzlib.exe" | 555 | OutputFile="$(OutDir)/testzlib.exe" |
| 558 | LinkIncremental="1" | 556 | LinkIncremental="1" |
| 559 | GenerateManifest="false" | 557 | GenerateManifest="false" |
| @@ -562,7 +560,7 @@ | |||
| 562 | OptimizeReferences="2" | 560 | OptimizeReferences="2" |
| 563 | EnableCOMDATFolding="2" | 561 | EnableCOMDATFolding="2" |
| 564 | OptimizeForWindows98="1" | 562 | OptimizeForWindows98="1" |
| 565 | TargetMachine="1" | 563 | TargetMachine="5" |
| 566 | /> | 564 | /> |
| 567 | <Tool | 565 | <Tool |
| 568 | Name="VCALinkTool" | 566 | Name="VCALinkTool" |
| @@ -614,7 +612,7 @@ | |||
| 614 | <Tool | 612 | <Tool |
| 615 | Name="VCCLCompilerTool" | 613 | Name="VCCLCompilerTool" |
| 616 | AdditionalIncludeDirectories="..\..\.." | 614 | AdditionalIncludeDirectories="..\..\.." |
| 617 | PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" | 615 | PreprocessorDefinitions="ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" |
| 618 | BasicRuntimeChecks="0" | 616 | BasicRuntimeChecks="0" |
| 619 | RuntimeLibrary="2" | 617 | RuntimeLibrary="2" |
| 620 | BufferSecurityCheck="false" | 618 | BufferSecurityCheck="false" |
| @@ -689,7 +687,7 @@ | |||
| 689 | InlineFunctionExpansion="1" | 687 | InlineFunctionExpansion="1" |
| 690 | OmitFramePointers="true" | 688 | OmitFramePointers="true" |
| 691 | AdditionalIncludeDirectories="..\..\.." | 689 | AdditionalIncludeDirectories="..\..\.." |
| 692 | PreprocessorDefinitions="ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" | 690 | PreprocessorDefinitions="ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" |
| 693 | StringPooling="true" | 691 | StringPooling="true" |
| 694 | BasicRuntimeChecks="0" | 692 | BasicRuntimeChecks="0" |
| 695 | RuntimeLibrary="2" | 693 | RuntimeLibrary="2" |
| @@ -863,7 +861,7 @@ | |||
| 863 | /> | 861 | /> |
| 864 | </FileConfiguration> | 862 | </FileConfiguration> |
| 865 | <FileConfiguration | 863 | <FileConfiguration |
| 866 | Name="Debug|Itanium" | 864 | Name="ReleaseWithoutAsm|Win32" |
| 867 | ExcludedFromBuild="true" | 865 | ExcludedFromBuild="true" |
| 868 | > | 866 | > |
| 869 | <Tool | 867 | <Tool |
| @@ -871,7 +869,7 @@ | |||
| 871 | /> | 869 | /> |
| 872 | </FileConfiguration> | 870 | </FileConfiguration> |
| 873 | <FileConfiguration | 871 | <FileConfiguration |
| 874 | Name="ReleaseWithoutAsm|Win32" | 872 | Name="Release|Win32" |
| 875 | ExcludedFromBuild="true" | 873 | ExcludedFromBuild="true" |
| 876 | > | 874 | > |
| 877 | <Tool | 875 | <Tool |
| @@ -879,7 +877,7 @@ | |||
| 879 | /> | 877 | /> |
| 880 | </FileConfiguration> | 878 | </FileConfiguration> |
| 881 | <FileConfiguration | 879 | <FileConfiguration |
| 882 | Name="ReleaseWithoutAsm|Itanium" | 880 | Name="Debug|Itanium" |
| 883 | ExcludedFromBuild="true" | 881 | ExcludedFromBuild="true" |
| 884 | > | 882 | > |
| 885 | <Tool | 883 | <Tool |
| @@ -887,7 +885,7 @@ | |||
| 887 | /> | 885 | /> |
| 888 | </FileConfiguration> | 886 | </FileConfiguration> |
| 889 | <FileConfiguration | 887 | <FileConfiguration |
| 890 | Name="Release|Win32" | 888 | Name="ReleaseWithoutAsm|Itanium" |
| 891 | ExcludedFromBuild="true" | 889 | ExcludedFromBuild="true" |
| 892 | > | 890 | > |
| 893 | <Tool | 891 | <Tool |
diff --git a/contrib/vstudio/vc8/testzlibdll.vcproj b/contrib/vstudio/vc9/testzlibdll.vcproj index f38ab5e..b1ddde0 100644 --- a/contrib/vstudio/vc8/testzlibdll.vcproj +++ b/contrib/vstudio/vc9/testzlibdll.vcproj | |||
| @@ -1,11 +1,11 @@ | |||
| 1 | <?xml version="1.0" encoding="Windows-1252"?> | 1 | <?xml version="1.0" encoding="Windows-1252"?> |
| 2 | <VisualStudioProject | 2 | <VisualStudioProject |
| 3 | ProjectType="Visual C++" | 3 | ProjectType="Visual C++" |
| 4 | Version="8,00" | 4 | Version="9.00" |
| 5 | Name="TestZlibDll" | 5 | Name="TestZlibDll" |
| 6 | ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694366A}" | 6 | ProjectGUID="{C52F9E7B-498A-42BE-8DB4-85A15694366A}" |
| 7 | Keyword="Win32Proj" | 7 | Keyword="Win32Proj" |
| 8 | SignManifests="true" | 8 | TargetFrameworkVersion="131072" |
| 9 | > | 9 | > |
| 10 | <Platforms> | 10 | <Platforms> |
| 11 | <Platform | 11 | <Platform |
| @@ -77,6 +77,8 @@ | |||
| 77 | GenerateDebugInformation="true" | 77 | GenerateDebugInformation="true" |
| 78 | ProgramDatabaseFile="$(OutDir)/testzlib.pdb" | 78 | ProgramDatabaseFile="$(OutDir)/testzlib.pdb" |
| 79 | SubSystem="1" | 79 | SubSystem="1" |
| 80 | RandomizedBaseAddress="1" | ||
| 81 | DataExecutionPrevention="0" | ||
| 80 | TargetMachine="1" | 82 | TargetMachine="1" |
| 81 | /> | 83 | /> |
| 82 | <Tool | 84 | <Tool |
| @@ -98,16 +100,13 @@ | |||
| 98 | Name="VCAppVerifierTool" | 100 | Name="VCAppVerifierTool" |
| 99 | /> | 101 | /> |
| 100 | <Tool | 102 | <Tool |
| 101 | Name="VCWebDeploymentTool" | ||
| 102 | /> | ||
| 103 | <Tool | ||
| 104 | Name="VCPostBuildEventTool" | 103 | Name="VCPostBuildEventTool" |
| 105 | /> | 104 | /> |
| 106 | </Configuration> | 105 | </Configuration> |
| 107 | <Configuration | 106 | <Configuration |
| 108 | Name="Debug|x64" | 107 | Name="Release|Win32" |
| 109 | OutputDirectory="x64\TestZlibDll$(ConfigurationName)" | 108 | OutputDirectory="x86\TestZlibDll$(ConfigurationName)" |
| 110 | IntermediateDirectory="x64\TestZlibDll$(ConfigurationName)\Tmp" | 109 | IntermediateDirectory="x86\TestZlibDll$(ConfigurationName)\Tmp" |
| 111 | ConfigurationType="1" | 110 | ConfigurationType="1" |
| 112 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 111 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
| 113 | CharacterSet="2" | 112 | CharacterSet="2" |
| @@ -126,17 +125,19 @@ | |||
| 126 | /> | 125 | /> |
| 127 | <Tool | 126 | <Tool |
| 128 | Name="VCMIDLTool" | 127 | Name="VCMIDLTool" |
| 129 | TargetEnvironment="3" | ||
| 130 | /> | 128 | /> |
| 131 | <Tool | 129 | <Tool |
| 132 | Name="VCCLCompilerTool" | 130 | Name="VCCLCompilerTool" |
| 133 | Optimization="0" | 131 | Optimization="2" |
| 132 | InlineFunctionExpansion="1" | ||
| 133 | OmitFramePointers="true" | ||
| 134 | AdditionalIncludeDirectories="..\..\..;..\..\minizip" | 134 | AdditionalIncludeDirectories="..\..\..;..\..\minizip" |
| 135 | PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64" | 135 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE" |
| 136 | MinimalRebuild="true" | 136 | StringPooling="true" |
| 137 | BasicRuntimeChecks="0" | 137 | BasicRuntimeChecks="0" |
| 138 | RuntimeLibrary="3" | 138 | RuntimeLibrary="0" |
| 139 | BufferSecurityCheck="false" | 139 | BufferSecurityCheck="false" |
| 140 | EnableFunctionLevelLinking="true" | ||
| 140 | UsePrecompiledHeader="0" | 141 | UsePrecompiledHeader="0" |
| 141 | AssemblerListingLocation="$(IntDir)\" | 142 | AssemblerListingLocation="$(IntDir)\" |
| 142 | WarningLevel="3" | 143 | WarningLevel="3" |
| @@ -154,14 +155,18 @@ | |||
| 154 | /> | 155 | /> |
| 155 | <Tool | 156 | <Tool |
| 156 | Name="VCLinkerTool" | 157 | Name="VCLinkerTool" |
| 157 | AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib" | 158 | AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib" |
| 158 | OutputFile="$(OutDir)/testzlib.exe" | 159 | OutputFile="$(OutDir)/testzlib.exe" |
| 159 | LinkIncremental="2" | 160 | LinkIncremental="1" |
| 160 | GenerateManifest="false" | 161 | GenerateManifest="false" |
| 161 | GenerateDebugInformation="true" | 162 | GenerateDebugInformation="true" |
| 162 | ProgramDatabaseFile="$(OutDir)/testzlib.pdb" | ||
| 163 | SubSystem="1" | 163 | SubSystem="1" |
| 164 | TargetMachine="17" | 164 | OptimizeReferences="2" |
| 165 | EnableCOMDATFolding="2" | ||
| 166 | OptimizeForWindows98="1" | ||
| 167 | RandomizedBaseAddress="1" | ||
| 168 | DataExecutionPrevention="0" | ||
| 169 | TargetMachine="1" | ||
| 165 | /> | 170 | /> |
| 166 | <Tool | 171 | <Tool |
| 167 | Name="VCALinkTool" | 172 | Name="VCALinkTool" |
| @@ -182,16 +187,13 @@ | |||
| 182 | Name="VCAppVerifierTool" | 187 | Name="VCAppVerifierTool" |
| 183 | /> | 188 | /> |
| 184 | <Tool | 189 | <Tool |
| 185 | Name="VCWebDeploymentTool" | ||
| 186 | /> | ||
| 187 | <Tool | ||
| 188 | Name="VCPostBuildEventTool" | 190 | Name="VCPostBuildEventTool" |
| 189 | /> | 191 | /> |
| 190 | </Configuration> | 192 | </Configuration> |
| 191 | <Configuration | 193 | <Configuration |
| 192 | Name="Debug|Itanium" | 194 | Name="Debug|x64" |
| 193 | OutputDirectory="ia64\TestZlibDll$(ConfigurationName)" | 195 | OutputDirectory="x64\TestZlibDll$(ConfigurationName)" |
| 194 | IntermediateDirectory="ia64\TestZlibDll$(ConfigurationName)\Tmp" | 196 | IntermediateDirectory="x64\TestZlibDll$(ConfigurationName)\Tmp" |
| 195 | ConfigurationType="1" | 197 | ConfigurationType="1" |
| 196 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 198 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
| 197 | CharacterSet="2" | 199 | CharacterSet="2" |
| @@ -210,7 +212,7 @@ | |||
| 210 | /> | 212 | /> |
| 211 | <Tool | 213 | <Tool |
| 212 | Name="VCMIDLTool" | 214 | Name="VCMIDLTool" |
| 213 | TargetEnvironment="2" | 215 | TargetEnvironment="3" |
| 214 | /> | 216 | /> |
| 215 | <Tool | 217 | <Tool |
| 216 | Name="VCCLCompilerTool" | 218 | Name="VCCLCompilerTool" |
| @@ -238,14 +240,14 @@ | |||
| 238 | /> | 240 | /> |
| 239 | <Tool | 241 | <Tool |
| 240 | Name="VCLinkerTool" | 242 | Name="VCLinkerTool" |
| 241 | AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib" | 243 | AdditionalDependencies="x64\ZlibDllDebug\zlibwapi.lib" |
| 242 | OutputFile="$(OutDir)/testzlib.exe" | 244 | OutputFile="$(OutDir)/testzlib.exe" |
| 243 | LinkIncremental="2" | 245 | LinkIncremental="2" |
| 244 | GenerateManifest="false" | 246 | GenerateManifest="false" |
| 245 | GenerateDebugInformation="true" | 247 | GenerateDebugInformation="true" |
| 246 | ProgramDatabaseFile="$(OutDir)/testzlib.pdb" | 248 | ProgramDatabaseFile="$(OutDir)/testzlib.pdb" |
| 247 | SubSystem="1" | 249 | SubSystem="1" |
| 248 | TargetMachine="5" | 250 | TargetMachine="17" |
| 249 | /> | 251 | /> |
| 250 | <Tool | 252 | <Tool |
| 251 | Name="VCALinkTool" | 253 | Name="VCALinkTool" |
| @@ -273,9 +275,9 @@ | |||
| 273 | /> | 275 | /> |
| 274 | </Configuration> | 276 | </Configuration> |
| 275 | <Configuration | 277 | <Configuration |
| 276 | Name="Release|Win32" | 278 | Name="Debug|Itanium" |
| 277 | OutputDirectory="x86\TestZlibDll$(ConfigurationName)" | 279 | OutputDirectory="ia64\TestZlibDll$(ConfigurationName)" |
| 278 | IntermediateDirectory="x86\TestZlibDll$(ConfigurationName)\Tmp" | 280 | IntermediateDirectory="ia64\TestZlibDll$(ConfigurationName)\Tmp" |
| 279 | ConfigurationType="1" | 281 | ConfigurationType="1" |
| 280 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 282 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
| 281 | CharacterSet="2" | 283 | CharacterSet="2" |
| @@ -294,19 +296,17 @@ | |||
| 294 | /> | 296 | /> |
| 295 | <Tool | 297 | <Tool |
| 296 | Name="VCMIDLTool" | 298 | Name="VCMIDLTool" |
| 299 | TargetEnvironment="2" | ||
| 297 | /> | 300 | /> |
| 298 | <Tool | 301 | <Tool |
| 299 | Name="VCCLCompilerTool" | 302 | Name="VCCLCompilerTool" |
| 300 | Optimization="2" | 303 | Optimization="0" |
| 301 | InlineFunctionExpansion="1" | ||
| 302 | OmitFramePointers="true" | ||
| 303 | AdditionalIncludeDirectories="..\..\..;..\..\minizip" | 304 | AdditionalIncludeDirectories="..\..\..;..\..\minizip" |
| 304 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE" | 305 | PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64" |
| 305 | StringPooling="true" | 306 | MinimalRebuild="true" |
| 306 | BasicRuntimeChecks="0" | 307 | BasicRuntimeChecks="0" |
| 307 | RuntimeLibrary="0" | 308 | RuntimeLibrary="3" |
| 308 | BufferSecurityCheck="false" | 309 | BufferSecurityCheck="false" |
| 309 | EnableFunctionLevelLinking="true" | ||
| 310 | UsePrecompiledHeader="0" | 310 | UsePrecompiledHeader="0" |
| 311 | AssemblerListingLocation="$(IntDir)\" | 311 | AssemblerListingLocation="$(IntDir)\" |
| 312 | WarningLevel="3" | 312 | WarningLevel="3" |
| @@ -324,16 +324,14 @@ | |||
| 324 | /> | 324 | /> |
| 325 | <Tool | 325 | <Tool |
| 326 | Name="VCLinkerTool" | 326 | Name="VCLinkerTool" |
| 327 | AdditionalDependencies="x86\ZlibDllRelease\zlibwapi.lib" | 327 | AdditionalDependencies="ia64\ZlibDllDebug\zlibwapi.lib" |
| 328 | OutputFile="$(OutDir)/testzlib.exe" | 328 | OutputFile="$(OutDir)/testzlib.exe" |
| 329 | LinkIncremental="1" | 329 | LinkIncremental="2" |
| 330 | GenerateManifest="false" | 330 | GenerateManifest="false" |
| 331 | GenerateDebugInformation="true" | 331 | GenerateDebugInformation="true" |
| 332 | ProgramDatabaseFile="$(OutDir)/testzlib.pdb" | ||
| 332 | SubSystem="1" | 333 | SubSystem="1" |
| 333 | OptimizeReferences="2" | 334 | TargetMachine="5" |
| 334 | EnableCOMDATFolding="2" | ||
| 335 | OptimizeForWindows98="1" | ||
| 336 | TargetMachine="1" | ||
| 337 | /> | 335 | /> |
| 338 | <Tool | 336 | <Tool |
| 339 | Name="VCALinkTool" | 337 | Name="VCALinkTool" |
diff --git a/contrib/vstudio/vc7/zlib.rc b/contrib/vstudio/vc9/zlib.rc index 266fb83..72cb8b4 100644 --- a/contrib/vstudio/vc7/zlib.rc +++ b/contrib/vstudio/vc9/zlib.rc | |||
| @@ -2,8 +2,8 @@ | |||
| 2 | 2 | ||
| 3 | #define IDR_VERSION1 1 | 3 | #define IDR_VERSION1 1 |
| 4 | IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE | 4 | IDR_VERSION1 VERSIONINFO MOVEABLE IMPURE LOADONCALL DISCARDABLE |
| 5 | FILEVERSION 1,2,3,8 | 5 | FILEVERSION 1,2,3,0 |
| 6 | PRODUCTVERSION 1,2,3,8 | 6 | PRODUCTVERSION 1,2,3,0 |
| 7 | FILEFLAGSMASK VS_FFI_FILEFLAGSMASK | 7 | FILEFLAGSMASK VS_FFI_FILEFLAGSMASK |
| 8 | FILEFLAGS 0 | 8 | FILEFLAGS 0 |
| 9 | FILEOS VOS_DOS_WINDOWS32 | 9 | FILEOS VOS_DOS_WINDOWS32 |
| @@ -17,12 +17,12 @@ BEGIN | |||
| 17 | 17 | ||
| 18 | BEGIN | 18 | BEGIN |
| 19 | VALUE "FileDescription", "zlib data compression library\0" | 19 | VALUE "FileDescription", "zlib data compression library\0" |
| 20 | VALUE "FileVersion", "1.2.3.8\0" | 20 | VALUE "FileVersion", "1.2.3.0\0" |
| 21 | VALUE "InternalName", "zlib\0" | 21 | VALUE "InternalName", "zlib\0" |
| 22 | VALUE "OriginalFilename", "zlib.dll\0" | 22 | VALUE "OriginalFilename", "zlib.dll\0" |
| 23 | VALUE "ProductName", "ZLib.DLL\0" | 23 | VALUE "ProductName", "ZLib.DLL\0" |
| 24 | VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" | 24 | VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0" |
| 25 | VALUE "LegalCopyright", "(C) 1995-2010 Jean-loup Gailly & Mark Adler\0" | 25 | VALUE "LegalCopyright", "(C) 1995-2003 Jean-loup Gailly & Mark Adler\0" |
| 26 | END | 26 | END |
| 27 | END | 27 | END |
| 28 | BLOCK "VarFileInfo" | 28 | BLOCK "VarFileInfo" |
diff --git a/contrib/vstudio/vc8/zlibstat.vcproj b/contrib/vstudio/vc9/zlibstat.vcproj index 51a4073..ff9813a 100644 --- a/contrib/vstudio/vc8/zlibstat.vcproj +++ b/contrib/vstudio/vc9/zlibstat.vcproj | |||
| @@ -1,9 +1,10 @@ | |||
| 1 | <?xml version="1.0" encoding="Windows-1252"?> | 1 | <?xml version="1.0" encoding="Windows-1252"?> |
| 2 | <VisualStudioProject | 2 | <VisualStudioProject |
| 3 | ProjectType="Visual C++" | 3 | ProjectType="Visual C++" |
| 4 | Version="8,00" | 4 | Version="9.00" |
| 5 | Name="zlibstat" | 5 | Name="zlibstat" |
| 6 | ProjectGUID="{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}" | 6 | ProjectGUID="{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}" |
| 7 | TargetFrameworkVersion="131072" | ||
| 7 | > | 8 | > |
| 8 | <Platforms> | 9 | <Platforms> |
| 9 | <Platform | 10 | <Platform |
| @@ -47,7 +48,7 @@ | |||
| 47 | Name="VCCLCompilerTool" | 48 | Name="VCCLCompilerTool" |
| 48 | Optimization="0" | 49 | Optimization="0" |
| 49 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 50 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
| 50 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" | 51 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" |
| 51 | ExceptionHandling="0" | 52 | ExceptionHandling="0" |
| 52 | RuntimeLibrary="1" | 53 | RuntimeLibrary="1" |
| 53 | BufferSecurityCheck="false" | 54 | BufferSecurityCheck="false" |
| @@ -93,9 +94,9 @@ | |||
| 93 | /> | 94 | /> |
| 94 | </Configuration> | 95 | </Configuration> |
| 95 | <Configuration | 96 | <Configuration |
| 96 | Name="Debug|x64" | 97 | Name="Release|Win32" |
| 97 | OutputDirectory="x64\ZlibStat$(ConfigurationName)" | 98 | OutputDirectory="x86\ZlibStat$(ConfigurationName)" |
| 98 | IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp" | 99 | IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp" |
| 99 | ConfigurationType="4" | 100 | ConfigurationType="4" |
| 100 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 101 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
| 101 | UseOfMFC="0" | 102 | UseOfMFC="0" |
| @@ -115,24 +116,23 @@ | |||
| 115 | /> | 116 | /> |
| 116 | <Tool | 117 | <Tool |
| 117 | Name="VCMIDLTool" | 118 | Name="VCMIDLTool" |
| 118 | TargetEnvironment="3" | ||
| 119 | /> | 119 | /> |
| 120 | <Tool | 120 | <Tool |
| 121 | Name="VCCLCompilerTool" | 121 | Name="VCCLCompilerTool" |
| 122 | Optimization="0" | 122 | InlineFunctionExpansion="1" |
| 123 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 123 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
| 124 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" | 124 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF" |
| 125 | StringPooling="true" | ||
| 125 | ExceptionHandling="0" | 126 | ExceptionHandling="0" |
| 126 | RuntimeLibrary="3" | 127 | RuntimeLibrary="0" |
| 127 | BufferSecurityCheck="false" | 128 | BufferSecurityCheck="false" |
| 129 | EnableFunctionLevelLinking="true" | ||
| 128 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" | 130 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" |
| 129 | AssemblerListingLocation="$(IntDir)\" | 131 | AssemblerListingLocation="$(IntDir)\" |
| 130 | ObjectFile="$(IntDir)\" | 132 | ObjectFile="$(IntDir)\" |
| 131 | ProgramDataBaseFileName="$(OutDir)\" | 133 | ProgramDataBaseFileName="$(OutDir)\" |
| 132 | WarningLevel="3" | 134 | WarningLevel="3" |
| 133 | SuppressStartupBanner="true" | 135 | SuppressStartupBanner="true" |
| 134 | Detect64BitPortabilityProblems="true" | ||
| 135 | DebugInformationFormat="1" | ||
| 136 | /> | 136 | /> |
| 137 | <Tool | 137 | <Tool |
| 138 | Name="VCManagedResourceCompilerTool" | 138 | Name="VCManagedResourceCompilerTool" |
| @@ -146,7 +146,8 @@ | |||
| 146 | /> | 146 | /> |
| 147 | <Tool | 147 | <Tool |
| 148 | Name="VCLibrarianTool" | 148 | Name="VCLibrarianTool" |
| 149 | AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB" | 149 | AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB" |
| 150 | AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj " | ||
| 150 | OutputFile="$(OutDir)\zlibstat.lib" | 151 | OutputFile="$(OutDir)\zlibstat.lib" |
| 151 | SuppressStartupBanner="true" | 152 | SuppressStartupBanner="true" |
| 152 | /> | 153 | /> |
| @@ -167,9 +168,9 @@ | |||
| 167 | /> | 168 | /> |
| 168 | </Configuration> | 169 | </Configuration> |
| 169 | <Configuration | 170 | <Configuration |
| 170 | Name="Debug|Itanium" | 171 | Name="ReleaseWithoutAsm|Win32" |
| 171 | OutputDirectory="ia64\ZlibStat$(ConfigurationName)" | 172 | OutputDirectory="x86\ZlibStat$(ConfigurationName)" |
| 172 | IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp" | 173 | IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp" |
| 173 | ConfigurationType="4" | 174 | ConfigurationType="4" |
| 174 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 175 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
| 175 | UseOfMFC="0" | 176 | UseOfMFC="0" |
| @@ -189,24 +190,23 @@ | |||
| 189 | /> | 190 | /> |
| 190 | <Tool | 191 | <Tool |
| 191 | Name="VCMIDLTool" | 192 | Name="VCMIDLTool" |
| 192 | TargetEnvironment="2" | ||
| 193 | /> | 193 | /> |
| 194 | <Tool | 194 | <Tool |
| 195 | Name="VCCLCompilerTool" | 195 | Name="VCCLCompilerTool" |
| 196 | Optimization="0" | 196 | InlineFunctionExpansion="1" |
| 197 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 197 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
| 198 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" | 198 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS" |
| 199 | StringPooling="true" | ||
| 199 | ExceptionHandling="0" | 200 | ExceptionHandling="0" |
| 200 | RuntimeLibrary="3" | 201 | RuntimeLibrary="0" |
| 201 | BufferSecurityCheck="false" | 202 | BufferSecurityCheck="false" |
| 203 | EnableFunctionLevelLinking="true" | ||
| 202 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" | 204 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" |
| 203 | AssemblerListingLocation="$(IntDir)\" | 205 | AssemblerListingLocation="$(IntDir)\" |
| 204 | ObjectFile="$(IntDir)\" | 206 | ObjectFile="$(IntDir)\" |
| 205 | ProgramDataBaseFileName="$(OutDir)\" | 207 | ProgramDataBaseFileName="$(OutDir)\" |
| 206 | WarningLevel="3" | 208 | WarningLevel="3" |
| 207 | SuppressStartupBanner="true" | 209 | SuppressStartupBanner="true" |
| 208 | Detect64BitPortabilityProblems="true" | ||
| 209 | DebugInformationFormat="1" | ||
| 210 | /> | 210 | /> |
| 211 | <Tool | 211 | <Tool |
| 212 | Name="VCManagedResourceCompilerTool" | 212 | Name="VCManagedResourceCompilerTool" |
| @@ -220,7 +220,7 @@ | |||
| 220 | /> | 220 | /> |
| 221 | <Tool | 221 | <Tool |
| 222 | Name="VCLibrarianTool" | 222 | Name="VCLibrarianTool" |
| 223 | AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB" | 223 | AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB" |
| 224 | OutputFile="$(OutDir)\zlibstat.lib" | 224 | OutputFile="$(OutDir)\zlibstat.lib" |
| 225 | SuppressStartupBanner="true" | 225 | SuppressStartupBanner="true" |
| 226 | /> | 226 | /> |
| @@ -241,9 +241,9 @@ | |||
| 241 | /> | 241 | /> |
| 242 | </Configuration> | 242 | </Configuration> |
| 243 | <Configuration | 243 | <Configuration |
| 244 | Name="Release|Win32" | 244 | Name="Debug|x64" |
| 245 | OutputDirectory="x86\ZlibStat$(ConfigurationName)" | 245 | OutputDirectory="x64\ZlibStat$(ConfigurationName)" |
| 246 | IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp" | 246 | IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp" |
| 247 | ConfigurationType="4" | 247 | ConfigurationType="4" |
| 248 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 248 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
| 249 | UseOfMFC="0" | 249 | UseOfMFC="0" |
| @@ -263,23 +263,24 @@ | |||
| 263 | /> | 263 | /> |
| 264 | <Tool | 264 | <Tool |
| 265 | Name="VCMIDLTool" | 265 | Name="VCMIDLTool" |
| 266 | TargetEnvironment="3" | ||
| 266 | /> | 267 | /> |
| 267 | <Tool | 268 | <Tool |
| 268 | Name="VCCLCompilerTool" | 269 | Name="VCCLCompilerTool" |
| 269 | InlineFunctionExpansion="1" | 270 | Optimization="0" |
| 270 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 271 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
| 271 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ASMV;ASMINF" | 272 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" |
| 272 | StringPooling="true" | ||
| 273 | ExceptionHandling="0" | 273 | ExceptionHandling="0" |
| 274 | RuntimeLibrary="0" | 274 | RuntimeLibrary="3" |
| 275 | BufferSecurityCheck="false" | 275 | BufferSecurityCheck="false" |
| 276 | EnableFunctionLevelLinking="true" | ||
| 277 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" | 276 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" |
| 278 | AssemblerListingLocation="$(IntDir)\" | 277 | AssemblerListingLocation="$(IntDir)\" |
| 279 | ObjectFile="$(IntDir)\" | 278 | ObjectFile="$(IntDir)\" |
| 280 | ProgramDataBaseFileName="$(OutDir)\" | 279 | ProgramDataBaseFileName="$(OutDir)\" |
| 281 | WarningLevel="3" | 280 | WarningLevel="3" |
| 282 | SuppressStartupBanner="true" | 281 | SuppressStartupBanner="true" |
| 282 | Detect64BitPortabilityProblems="true" | ||
| 283 | DebugInformationFormat="1" | ||
| 283 | /> | 284 | /> |
| 284 | <Tool | 285 | <Tool |
| 285 | Name="VCManagedResourceCompilerTool" | 286 | Name="VCManagedResourceCompilerTool" |
| @@ -293,8 +294,7 @@ | |||
| 293 | /> | 294 | /> |
| 294 | <Tool | 295 | <Tool |
| 295 | Name="VCLibrarianTool" | 296 | Name="VCLibrarianTool" |
| 296 | AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB" | 297 | AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB" |
| 297 | AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj " | ||
| 298 | OutputFile="$(OutDir)\zlibstat.lib" | 298 | OutputFile="$(OutDir)\zlibstat.lib" |
| 299 | SuppressStartupBanner="true" | 299 | SuppressStartupBanner="true" |
| 300 | /> | 300 | /> |
| @@ -315,9 +315,9 @@ | |||
| 315 | /> | 315 | /> |
| 316 | </Configuration> | 316 | </Configuration> |
| 317 | <Configuration | 317 | <Configuration |
| 318 | Name="Release|x64" | 318 | Name="Debug|Itanium" |
| 319 | OutputDirectory="x64\ZlibStat$(ConfigurationName)" | 319 | OutputDirectory="ia64\ZlibStat$(ConfigurationName)" |
| 320 | IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp" | 320 | IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp" |
| 321 | ConfigurationType="4" | 321 | ConfigurationType="4" |
| 322 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 322 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
| 323 | UseOfMFC="0" | 323 | UseOfMFC="0" |
| @@ -337,24 +337,24 @@ | |||
| 337 | /> | 337 | /> |
| 338 | <Tool | 338 | <Tool |
| 339 | Name="VCMIDLTool" | 339 | Name="VCMIDLTool" |
| 340 | TargetEnvironment="3" | 340 | TargetEnvironment="2" |
| 341 | /> | 341 | /> |
| 342 | <Tool | 342 | <Tool |
| 343 | Name="VCCLCompilerTool" | 343 | Name="VCCLCompilerTool" |
| 344 | InlineFunctionExpansion="1" | 344 | Optimization="0" |
| 345 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 345 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
| 346 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ASMV;ASMINF;WIN64" | 346 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" |
| 347 | StringPooling="true" | ||
| 348 | ExceptionHandling="0" | 347 | ExceptionHandling="0" |
| 349 | RuntimeLibrary="2" | 348 | RuntimeLibrary="3" |
| 350 | BufferSecurityCheck="false" | 349 | BufferSecurityCheck="false" |
| 351 | EnableFunctionLevelLinking="true" | ||
| 352 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" | 350 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" |
| 353 | AssemblerListingLocation="$(IntDir)\" | 351 | AssemblerListingLocation="$(IntDir)\" |
| 354 | ObjectFile="$(IntDir)\" | 352 | ObjectFile="$(IntDir)\" |
| 355 | ProgramDataBaseFileName="$(OutDir)\" | 353 | ProgramDataBaseFileName="$(OutDir)\" |
| 356 | WarningLevel="3" | 354 | WarningLevel="3" |
| 357 | SuppressStartupBanner="true" | 355 | SuppressStartupBanner="true" |
| 356 | Detect64BitPortabilityProblems="true" | ||
| 357 | DebugInformationFormat="1" | ||
| 358 | /> | 358 | /> |
| 359 | <Tool | 359 | <Tool |
| 360 | Name="VCManagedResourceCompilerTool" | 360 | Name="VCManagedResourceCompilerTool" |
| @@ -368,8 +368,7 @@ | |||
| 368 | /> | 368 | /> |
| 369 | <Tool | 369 | <Tool |
| 370 | Name="VCLibrarianTool" | 370 | Name="VCLibrarianTool" |
| 371 | AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB" | 371 | AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB" |
| 372 | AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj " | ||
| 373 | OutputFile="$(OutDir)\zlibstat.lib" | 372 | OutputFile="$(OutDir)\zlibstat.lib" |
| 374 | SuppressStartupBanner="true" | 373 | SuppressStartupBanner="true" |
| 375 | /> | 374 | /> |
| @@ -390,9 +389,9 @@ | |||
| 390 | /> | 389 | /> |
| 391 | </Configuration> | 390 | </Configuration> |
| 392 | <Configuration | 391 | <Configuration |
| 393 | Name="Release|Itanium" | 392 | Name="Release|x64" |
| 394 | OutputDirectory="ia64\ZlibStat$(ConfigurationName)" | 393 | OutputDirectory="x64\ZlibStat$(ConfigurationName)" |
| 395 | IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp" | 394 | IntermediateDirectory="x64\ZlibStat$(ConfigurationName)\Tmp" |
| 396 | ConfigurationType="4" | 395 | ConfigurationType="4" |
| 397 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 396 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
| 398 | UseOfMFC="0" | 397 | UseOfMFC="0" |
| @@ -412,13 +411,13 @@ | |||
| 412 | /> | 411 | /> |
| 413 | <Tool | 412 | <Tool |
| 414 | Name="VCMIDLTool" | 413 | Name="VCMIDLTool" |
| 415 | TargetEnvironment="2" | 414 | TargetEnvironment="3" |
| 416 | /> | 415 | /> |
| 417 | <Tool | 416 | <Tool |
| 418 | Name="VCCLCompilerTool" | 417 | Name="VCCLCompilerTool" |
| 419 | InlineFunctionExpansion="1" | 418 | InlineFunctionExpansion="1" |
| 420 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 419 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
| 421 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" | 420 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64" |
| 422 | StringPooling="true" | 421 | StringPooling="true" |
| 423 | ExceptionHandling="0" | 422 | ExceptionHandling="0" |
| 424 | RuntimeLibrary="2" | 423 | RuntimeLibrary="2" |
| @@ -443,7 +442,8 @@ | |||
| 443 | /> | 442 | /> |
| 444 | <Tool | 443 | <Tool |
| 445 | Name="VCLibrarianTool" | 444 | Name="VCLibrarianTool" |
| 446 | AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB" | 445 | AdditionalOptions="/MACHINE:AMD64 /NODEFAULTLIB" |
| 446 | AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj " | ||
| 447 | OutputFile="$(OutDir)\zlibstat.lib" | 447 | OutputFile="$(OutDir)\zlibstat.lib" |
| 448 | SuppressStartupBanner="true" | 448 | SuppressStartupBanner="true" |
| 449 | /> | 449 | /> |
| @@ -464,9 +464,9 @@ | |||
| 464 | /> | 464 | /> |
| 465 | </Configuration> | 465 | </Configuration> |
| 466 | <Configuration | 466 | <Configuration |
| 467 | Name="ReleaseWithoutAsm|Win32" | 467 | Name="Release|Itanium" |
| 468 | OutputDirectory="x86\ZlibStat$(ConfigurationName)" | 468 | OutputDirectory="ia64\ZlibStat$(ConfigurationName)" |
| 469 | IntermediateDirectory="x86\ZlibStat$(ConfigurationName)\Tmp" | 469 | IntermediateDirectory="ia64\ZlibStat$(ConfigurationName)\Tmp" |
| 470 | ConfigurationType="4" | 470 | ConfigurationType="4" |
| 471 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 471 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
| 472 | UseOfMFC="0" | 472 | UseOfMFC="0" |
| @@ -486,15 +486,16 @@ | |||
| 486 | /> | 486 | /> |
| 487 | <Tool | 487 | <Tool |
| 488 | Name="VCMIDLTool" | 488 | Name="VCMIDLTool" |
| 489 | TargetEnvironment="2" | ||
| 489 | /> | 490 | /> |
| 490 | <Tool | 491 | <Tool |
| 491 | Name="VCCLCompilerTool" | 492 | Name="VCCLCompilerTool" |
| 492 | InlineFunctionExpansion="1" | 493 | InlineFunctionExpansion="1" |
| 493 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 494 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
| 494 | PreprocessorDefinitions="WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE" | 495 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" |
| 495 | StringPooling="true" | 496 | StringPooling="true" |
| 496 | ExceptionHandling="0" | 497 | ExceptionHandling="0" |
| 497 | RuntimeLibrary="0" | 498 | RuntimeLibrary="2" |
| 498 | BufferSecurityCheck="false" | 499 | BufferSecurityCheck="false" |
| 499 | EnableFunctionLevelLinking="true" | 500 | EnableFunctionLevelLinking="true" |
| 500 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" | 501 | PrecompiledHeaderFile="$(IntDir)/zlibstat.pch" |
| @@ -516,7 +517,7 @@ | |||
| 516 | /> | 517 | /> |
| 517 | <Tool | 518 | <Tool |
| 518 | Name="VCLibrarianTool" | 519 | Name="VCLibrarianTool" |
| 519 | AdditionalOptions="/MACHINE:X86 /NODEFAULTLIB" | 520 | AdditionalOptions="/MACHINE:IA64 /NODEFAULTLIB" |
| 520 | OutputFile="$(OutDir)\zlibstat.lib" | 521 | OutputFile="$(OutDir)\zlibstat.lib" |
| 521 | SuppressStartupBanner="true" | 522 | SuppressStartupBanner="true" |
| 522 | /> | 523 | /> |
| @@ -565,7 +566,7 @@ | |||
| 565 | Name="VCCLCompilerTool" | 566 | Name="VCCLCompilerTool" |
| 566 | InlineFunctionExpansion="1" | 567 | InlineFunctionExpansion="1" |
| 567 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 568 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
| 568 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" | 569 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" |
| 569 | StringPooling="true" | 570 | StringPooling="true" |
| 570 | ExceptionHandling="0" | 571 | ExceptionHandling="0" |
| 571 | RuntimeLibrary="2" | 572 | RuntimeLibrary="2" |
| @@ -639,7 +640,7 @@ | |||
| 639 | Name="VCCLCompilerTool" | 640 | Name="VCCLCompilerTool" |
| 640 | InlineFunctionExpansion="1" | 641 | InlineFunctionExpansion="1" |
| 641 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 642 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
| 642 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;WIN64" | 643 | PreprocessorDefinitions="ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64" |
| 643 | StringPooling="true" | 644 | StringPooling="true" |
| 644 | ExceptionHandling="0" | 645 | ExceptionHandling="0" |
| 645 | RuntimeLibrary="2" | 646 | RuntimeLibrary="2" |
| @@ -760,19 +761,24 @@ | |||
| 760 | </FileConfiguration> | 761 | </FileConfiguration> |
| 761 | </File> | 762 | </File> |
| 762 | <File | 763 | <File |
| 763 | RelativePath="..\..\..\gzclose.c"> | 764 | RelativePath="..\..\..\gzclose.c" |
| 765 | > | ||
| 764 | </File> | 766 | </File> |
| 765 | <File | 767 | <File |
| 766 | RelativePath="..\..\..\gzio.c"> | 768 | RelativePath="..\..\..\gzio.c" |
| 769 | > | ||
| 767 | </File> | 770 | </File> |
| 768 | <File | 771 | <File |
| 769 | RelativePath="..\..\..\gzlib.c"> | 772 | RelativePath="..\..\..\gzlib.c" |
| 773 | > | ||
| 770 | </File> | 774 | </File> |
| 771 | <File | 775 | <File |
| 772 | RelativePath="..\..\..\gzread.c"> | 776 | RelativePath="..\..\..\gzread.c" |
| 777 | > | ||
| 773 | </File> | 778 | </File> |
| 774 | <File | 779 | <File |
| 775 | RelativePath="..\..\..\gzwrite.c"> | 780 | RelativePath="..\..\..\gzwrite.c" |
| 781 | > | ||
| 776 | </File> | 782 | </File> |
| 777 | <File | 783 | <File |
| 778 | RelativePath="..\..\..\infback.c" | 784 | RelativePath="..\..\..\infback.c" |
| @@ -790,7 +796,7 @@ | |||
| 790 | /> | 796 | /> |
| 791 | </FileConfiguration> | 797 | </FileConfiguration> |
| 792 | <FileConfiguration | 798 | <FileConfiguration |
| 793 | Name="Debug|Itanium" | 799 | Name="Release|Win32" |
| 794 | ExcludedFromBuild="true" | 800 | ExcludedFromBuild="true" |
| 795 | > | 801 | > |
| 796 | <Tool | 802 | <Tool |
| @@ -798,7 +804,7 @@ | |||
| 798 | /> | 804 | /> |
| 799 | </FileConfiguration> | 805 | </FileConfiguration> |
| 800 | <FileConfiguration | 806 | <FileConfiguration |
| 801 | Name="Release|Win32" | 807 | Name="ReleaseWithoutAsm|Win32" |
| 802 | ExcludedFromBuild="true" | 808 | ExcludedFromBuild="true" |
| 803 | > | 809 | > |
| 804 | <Tool | 810 | <Tool |
| @@ -806,7 +812,7 @@ | |||
| 806 | /> | 812 | /> |
| 807 | </FileConfiguration> | 813 | </FileConfiguration> |
| 808 | <FileConfiguration | 814 | <FileConfiguration |
| 809 | Name="Release|Itanium" | 815 | Name="Debug|Itanium" |
| 810 | ExcludedFromBuild="true" | 816 | ExcludedFromBuild="true" |
| 811 | > | 817 | > |
| 812 | <Tool | 818 | <Tool |
| @@ -814,7 +820,7 @@ | |||
| 814 | /> | 820 | /> |
| 815 | </FileConfiguration> | 821 | </FileConfiguration> |
| 816 | <FileConfiguration | 822 | <FileConfiguration |
| 817 | Name="ReleaseWithoutAsm|Win32" | 823 | Name="Release|Itanium" |
| 818 | ExcludedFromBuild="true" | 824 | ExcludedFromBuild="true" |
| 819 | > | 825 | > |
| 820 | <Tool | 826 | <Tool |
diff --git a/contrib/contrib/vstudio/vc8/zlibvc.def b/contrib/vstudio/vc9/zlibvc.def index de70122..0b6a9e9 100644 --- a/contrib/contrib/vstudio/vc8/zlibvc.def +++ b/contrib/vstudio/vc9/zlibvc.def | |||
| @@ -93,3 +93,22 @@ EXPORTS | |||
| 93 | fill_win32_filefunc64 @111 | 93 | fill_win32_filefunc64 @111 |
| 94 | fill_win32_filefunc64A @112 | 94 | fill_win32_filefunc64A @112 |
| 95 | fill_win32_filefunc64W @113 | 95 | fill_win32_filefunc64W @113 |
| 96 | |||
| 97 | ; quick hack by hkuno@microhouse.co.jp | ||
| 98 | unzOpen64 @120 | ||
| 99 | unzOpen2_64 @121 | ||
| 100 | unzGetGlobalInfo64 @122 | ||
| 101 | unzGetCurrentFileInfo64 @124 | ||
| 102 | unzGetCurrentFileZStreamPos64 @125 | ||
| 103 | unztell64 @126 | ||
| 104 | unzGetFilePos64 @127 | ||
| 105 | unzGoToFilePos64 @128 | ||
| 106 | |||
| 107 | zipOpen64 @130 | ||
| 108 | zipOpen2_64 @131 | ||
| 109 | zipOpenNewFileInZip64 @132 | ||
| 110 | zipOpenNewFileInZip2_64 @133 | ||
| 111 | zipOpenNewFileInZip3_64 @134 | ||
| 112 | zipOpenNewFileInZip4_64 @135 | ||
| 113 | zipCloseFileInZipRaw64 @136 | ||
| 114 | ; end hack | ||
diff --git a/contrib/vstudio/vc8/zlibvc.sln b/contrib/vstudio/vc9/zlibvc.sln index a815a55..c7f1b0b 100644 --- a/contrib/vstudio/vc8/zlibvc.sln +++ b/contrib/vstudio/vc9/zlibvc.sln | |||
| @@ -1,6 +1,6 @@ | |||
| 1 |  | 1 |  |
| 2 | Microsoft Visual Studio Solution File, Format Version 9.00 | 2 | Microsoft Visual Studio Solution File, Format Version 10.00 |
| 3 | # Visual Studio 2005 | 3 | # Visual Studio 2008 |
| 4 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}" | 4 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}" |
| 5 | EndProject | 5 | EndProject |
| 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}" | 6 | Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}" |
diff --git a/contrib/contrib/vstudio/vc8/zlibvc.vcproj b/contrib/vstudio/vc9/zlibvc.vcproj index 91e966d..ee86786 100644 --- a/contrib/contrib/vstudio/vc8/zlibvc.vcproj +++ b/contrib/vstudio/vc9/zlibvc.vcproj | |||
| @@ -1,9 +1,10 @@ | |||
| 1 | <?xml version="1.0" encoding="Windows-1252"?> | 1 | <?xml version="1.0" encoding="Windows-1252"?> |
| 2 | <VisualStudioProject | 2 | <VisualStudioProject |
| 3 | ProjectType="Visual C++" | 3 | ProjectType="Visual C++" |
| 4 | Version="8,00" | 4 | Version="9.00" |
| 5 | Name="zlibvc" | 5 | Name="zlibvc" |
| 6 | ProjectGUID="{8FD826F8-3739-44E6-8CC8-997122E53B8D}" | 6 | ProjectGUID="{8FD826F8-3739-44E6-8CC8-997122E53B8D}" |
| 7 | TargetFrameworkVersion="131072" | ||
| 7 | > | 8 | > |
| 8 | <Platforms> | 9 | <Platforms> |
| 9 | <Platform | 10 | <Platform |
| @@ -52,7 +53,7 @@ | |||
| 52 | Name="VCCLCompilerTool" | 53 | Name="VCCLCompilerTool" |
| 53 | Optimization="0" | 54 | Optimization="0" |
| 54 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 55 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
| 55 | PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI;NO_snprintf,ASMV,ASMINF" | 56 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF" |
| 56 | ExceptionHandling="0" | 57 | ExceptionHandling="0" |
| 57 | RuntimeLibrary="1" | 58 | RuntimeLibrary="1" |
| 58 | BufferSecurityCheck="false" | 59 | BufferSecurityCheck="false" |
| @@ -90,6 +91,8 @@ | |||
| 90 | GenerateMapFile="true" | 91 | GenerateMapFile="true" |
| 91 | MapFileName="$(OutDir)/zlibwapi.map" | 92 | MapFileName="$(OutDir)/zlibwapi.map" |
| 92 | SubSystem="2" | 93 | SubSystem="2" |
| 94 | RandomizedBaseAddress="1" | ||
| 95 | DataExecutionPrevention="0" | ||
| 93 | ImportLibrary="$(OutDir)/zlibwapi.lib" | 96 | ImportLibrary="$(OutDir)/zlibwapi.lib" |
| 94 | /> | 97 | /> |
| 95 | <Tool | 98 | <Tool |
| @@ -111,20 +114,18 @@ | |||
| 111 | Name="VCAppVerifierTool" | 114 | Name="VCAppVerifierTool" |
| 112 | /> | 115 | /> |
| 113 | <Tool | 116 | <Tool |
| 114 | Name="VCWebDeploymentTool" | ||
| 115 | /> | ||
| 116 | <Tool | ||
| 117 | Name="VCPostBuildEventTool" | 117 | Name="VCPostBuildEventTool" |
| 118 | /> | 118 | /> |
| 119 | </Configuration> | 119 | </Configuration> |
| 120 | <Configuration | 120 | <Configuration |
| 121 | Name="Debug|x64" | 121 | Name="ReleaseWithoutAsm|Win32" |
| 122 | OutputDirectory="x64\ZlibDll$(ConfigurationName)" | 122 | OutputDirectory="x86\ZlibDll$(ConfigurationName)" |
| 123 | IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp" | 123 | IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp" |
| 124 | ConfigurationType="2" | 124 | ConfigurationType="2" |
| 125 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 125 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
| 126 | UseOfMFC="0" | 126 | UseOfMFC="0" |
| 127 | ATLMinimizesCRunTimeLibraryUsage="false" | 127 | ATLMinimizesCRunTimeLibraryUsage="false" |
| 128 | WholeProgramOptimization="1" | ||
| 128 | > | 129 | > |
| 129 | <Tool | 130 | <Tool |
| 130 | Name="VCPreBuildEventTool" | 131 | Name="VCPreBuildEventTool" |
| @@ -140,35 +141,37 @@ | |||
| 140 | /> | 141 | /> |
| 141 | <Tool | 142 | <Tool |
| 142 | Name="VCMIDLTool" | 143 | Name="VCMIDLTool" |
| 143 | PreprocessorDefinitions="_DEBUG" | 144 | PreprocessorDefinitions="NDEBUG" |
| 144 | MkTypLibCompatible="true" | 145 | MkTypLibCompatible="true" |
| 145 | SuppressStartupBanner="true" | 146 | SuppressStartupBanner="true" |
| 146 | TargetEnvironment="3" | 147 | TargetEnvironment="1" |
| 147 | TypeLibraryName="$(OutDir)/zlibvc.tlb" | 148 | TypeLibraryName="$(OutDir)/zlibvc.tlb" |
| 148 | /> | 149 | /> |
| 149 | <Tool | 150 | <Tool |
| 150 | Name="VCCLCompilerTool" | 151 | Name="VCCLCompilerTool" |
| 151 | Optimization="0" | 152 | InlineFunctionExpansion="1" |
| 152 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 153 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
| 153 | PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI;NO_snprintf,ASMV,ASMINF;WIN64" | 154 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI" |
| 155 | StringPooling="true" | ||
| 154 | ExceptionHandling="0" | 156 | ExceptionHandling="0" |
| 155 | RuntimeLibrary="3" | 157 | RuntimeLibrary="2" |
| 156 | BufferSecurityCheck="false" | 158 | BufferSecurityCheck="false" |
| 159 | EnableFunctionLevelLinking="true" | ||
| 157 | PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" | 160 | PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" |
| 161 | AssemblerOutput="2" | ||
| 158 | AssemblerListingLocation="$(IntDir)\" | 162 | AssemblerListingLocation="$(IntDir)\" |
| 159 | ObjectFile="$(IntDir)\" | 163 | ObjectFile="$(IntDir)\" |
| 160 | ProgramDataBaseFileName="$(OutDir)\" | 164 | ProgramDataBaseFileName="$(OutDir)\" |
| 161 | BrowseInformation="0" | 165 | BrowseInformation="0" |
| 162 | WarningLevel="3" | 166 | WarningLevel="3" |
| 163 | SuppressStartupBanner="true" | 167 | SuppressStartupBanner="true" |
| 164 | DebugInformationFormat="3" | ||
| 165 | /> | 168 | /> |
| 166 | <Tool | 169 | <Tool |
| 167 | Name="VCManagedResourceCompilerTool" | 170 | Name="VCManagedResourceCompilerTool" |
| 168 | /> | 171 | /> |
| 169 | <Tool | 172 | <Tool |
| 170 | Name="VCResourceCompilerTool" | 173 | Name="VCResourceCompilerTool" |
| 171 | PreprocessorDefinitions="_DEBUG" | 174 | PreprocessorDefinitions="NDEBUG" |
| 172 | Culture="1036" | 175 | Culture="1036" |
| 173 | /> | 176 | /> |
| 174 | <Tool | 177 | <Tool |
| @@ -176,19 +179,21 @@ | |||
| 176 | /> | 179 | /> |
| 177 | <Tool | 180 | <Tool |
| 178 | Name="VCLinkerTool" | 181 | Name="VCLinkerTool" |
| 179 | AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj " | 182 | AdditionalOptions="/MACHINE:I386" |
| 180 | OutputFile="$(OutDir)\zlibwapi.dll" | 183 | OutputFile="$(OutDir)\zlibwapi.dll" |
| 181 | LinkIncremental="2" | 184 | LinkIncremental="1" |
| 182 | SuppressStartupBanner="true" | 185 | SuppressStartupBanner="true" |
| 183 | GenerateManifest="false" | 186 | GenerateManifest="false" |
| 187 | IgnoreAllDefaultLibraries="false" | ||
| 184 | ModuleDefinitionFile=".\zlibvc.def" | 188 | ModuleDefinitionFile=".\zlibvc.def" |
| 185 | GenerateDebugInformation="true" | ||
| 186 | ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" | 189 | ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" |
| 187 | GenerateMapFile="true" | 190 | GenerateMapFile="true" |
| 188 | MapFileName="$(OutDir)/zlibwapi.map" | 191 | MapFileName="$(OutDir)/zlibwapi.map" |
| 189 | SubSystem="2" | 192 | SubSystem="2" |
| 193 | OptimizeForWindows98="1" | ||
| 194 | RandomizedBaseAddress="1" | ||
| 195 | DataExecutionPrevention="0" | ||
| 190 | ImportLibrary="$(OutDir)/zlibwapi.lib" | 196 | ImportLibrary="$(OutDir)/zlibwapi.lib" |
| 191 | TargetMachine="17" | ||
| 192 | /> | 197 | /> |
| 193 | <Tool | 198 | <Tool |
| 194 | Name="VCALinkTool" | 199 | Name="VCALinkTool" |
| @@ -209,20 +214,18 @@ | |||
| 209 | Name="VCAppVerifierTool" | 214 | Name="VCAppVerifierTool" |
| 210 | /> | 215 | /> |
| 211 | <Tool | 216 | <Tool |
| 212 | Name="VCWebDeploymentTool" | ||
| 213 | /> | ||
| 214 | <Tool | ||
| 215 | Name="VCPostBuildEventTool" | 217 | Name="VCPostBuildEventTool" |
| 216 | /> | 218 | /> |
| 217 | </Configuration> | 219 | </Configuration> |
| 218 | <Configuration | 220 | <Configuration |
| 219 | Name="Debug|Itanium" | 221 | Name="Release|Win32" |
| 220 | OutputDirectory="ia64\ZlibDll$(ConfigurationName)" | 222 | OutputDirectory="x86\ZlibDll$(ConfigurationName)" |
| 221 | IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp" | 223 | IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp" |
| 222 | ConfigurationType="2" | 224 | ConfigurationType="2" |
| 223 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 225 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
| 224 | UseOfMFC="0" | 226 | UseOfMFC="0" |
| 225 | ATLMinimizesCRunTimeLibraryUsage="false" | 227 | ATLMinimizesCRunTimeLibraryUsage="false" |
| 228 | WholeProgramOptimization="1" | ||
| 226 | > | 229 | > |
| 227 | <Tool | 230 | <Tool |
| 228 | Name="VCPreBuildEventTool" | 231 | Name="VCPreBuildEventTool" |
| @@ -238,35 +241,37 @@ | |||
| 238 | /> | 241 | /> |
| 239 | <Tool | 242 | <Tool |
| 240 | Name="VCMIDLTool" | 243 | Name="VCMIDLTool" |
| 241 | PreprocessorDefinitions="_DEBUG" | 244 | PreprocessorDefinitions="NDEBUG" |
| 242 | MkTypLibCompatible="true" | 245 | MkTypLibCompatible="true" |
| 243 | SuppressStartupBanner="true" | 246 | SuppressStartupBanner="true" |
| 244 | TargetEnvironment="2" | 247 | TargetEnvironment="1" |
| 245 | TypeLibraryName="$(OutDir)/zlibvc.tlb" | 248 | TypeLibraryName="$(OutDir)/zlibvc.tlb" |
| 246 | /> | 249 | /> |
| 247 | <Tool | 250 | <Tool |
| 248 | Name="VCCLCompilerTool" | 251 | Name="VCCLCompilerTool" |
| 249 | Optimization="0" | 252 | InlineFunctionExpansion="1" |
| 250 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 253 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
| 251 | PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NO_snprintf;WIN64" | 254 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF" |
| 255 | StringPooling="true" | ||
| 252 | ExceptionHandling="0" | 256 | ExceptionHandling="0" |
| 253 | RuntimeLibrary="3" | 257 | RuntimeLibrary="2" |
| 254 | BufferSecurityCheck="false" | 258 | BufferSecurityCheck="false" |
| 259 | EnableFunctionLevelLinking="true" | ||
| 255 | PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" | 260 | PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" |
| 261 | AssemblerOutput="2" | ||
| 256 | AssemblerListingLocation="$(IntDir)\" | 262 | AssemblerListingLocation="$(IntDir)\" |
| 257 | ObjectFile="$(IntDir)\" | 263 | ObjectFile="$(IntDir)\" |
| 258 | ProgramDataBaseFileName="$(OutDir)\" | 264 | ProgramDataBaseFileName="$(OutDir)\" |
| 259 | BrowseInformation="0" | 265 | BrowseInformation="0" |
| 260 | WarningLevel="3" | 266 | WarningLevel="3" |
| 261 | SuppressStartupBanner="true" | 267 | SuppressStartupBanner="true" |
| 262 | DebugInformationFormat="3" | ||
| 263 | /> | 268 | /> |
| 264 | <Tool | 269 | <Tool |
| 265 | Name="VCManagedResourceCompilerTool" | 270 | Name="VCManagedResourceCompilerTool" |
| 266 | /> | 271 | /> |
| 267 | <Tool | 272 | <Tool |
| 268 | Name="VCResourceCompilerTool" | 273 | Name="VCResourceCompilerTool" |
| 269 | PreprocessorDefinitions="_DEBUG" | 274 | PreprocessorDefinitions="NDEBUG" |
| 270 | Culture="1036" | 275 | Culture="1036" |
| 271 | /> | 276 | /> |
| 272 | <Tool | 277 | <Tool |
| @@ -274,18 +279,22 @@ | |||
| 274 | /> | 279 | /> |
| 275 | <Tool | 280 | <Tool |
| 276 | Name="VCLinkerTool" | 281 | Name="VCLinkerTool" |
| 282 | AdditionalOptions="/MACHINE:I386" | ||
| 283 | AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj " | ||
| 277 | OutputFile="$(OutDir)\zlibwapi.dll" | 284 | OutputFile="$(OutDir)\zlibwapi.dll" |
| 278 | LinkIncremental="2" | 285 | LinkIncremental="1" |
| 279 | SuppressStartupBanner="true" | 286 | SuppressStartupBanner="true" |
| 280 | GenerateManifest="false" | 287 | GenerateManifest="false" |
| 288 | IgnoreAllDefaultLibraries="false" | ||
| 281 | ModuleDefinitionFile=".\zlibvc.def" | 289 | ModuleDefinitionFile=".\zlibvc.def" |
| 282 | GenerateDebugInformation="true" | ||
| 283 | ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" | 290 | ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" |
| 284 | GenerateMapFile="true" | 291 | GenerateMapFile="true" |
| 285 | MapFileName="$(OutDir)/zlibwapi.map" | 292 | MapFileName="$(OutDir)/zlibwapi.map" |
| 286 | SubSystem="2" | 293 | SubSystem="2" |
| 294 | OptimizeForWindows98="1" | ||
| 295 | RandomizedBaseAddress="1" | ||
| 296 | DataExecutionPrevention="0" | ||
| 287 | ImportLibrary="$(OutDir)/zlibwapi.lib" | 297 | ImportLibrary="$(OutDir)/zlibwapi.lib" |
| 288 | TargetMachine="5" | ||
| 289 | /> | 298 | /> |
| 290 | <Tool | 299 | <Tool |
| 291 | Name="VCALinkTool" | 300 | Name="VCALinkTool" |
| @@ -306,21 +315,17 @@ | |||
| 306 | Name="VCAppVerifierTool" | 315 | Name="VCAppVerifierTool" |
| 307 | /> | 316 | /> |
| 308 | <Tool | 317 | <Tool |
| 309 | Name="VCWebDeploymentTool" | ||
| 310 | /> | ||
| 311 | <Tool | ||
| 312 | Name="VCPostBuildEventTool" | 318 | Name="VCPostBuildEventTool" |
| 313 | /> | 319 | /> |
| 314 | </Configuration> | 320 | </Configuration> |
| 315 | <Configuration | 321 | <Configuration |
| 316 | Name="ReleaseWithoutAsm|Win32" | 322 | Name="Debug|x64" |
| 317 | OutputDirectory="x86\ZlibDll$(ConfigurationName)" | 323 | OutputDirectory="x64\ZlibDll$(ConfigurationName)" |
| 318 | IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp" | 324 | IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp" |
| 319 | ConfigurationType="2" | 325 | ConfigurationType="2" |
| 320 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 326 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
| 321 | UseOfMFC="0" | 327 | UseOfMFC="0" |
| 322 | ATLMinimizesCRunTimeLibraryUsage="false" | 328 | ATLMinimizesCRunTimeLibraryUsage="false" |
| 323 | WholeProgramOptimization="1" | ||
| 324 | > | 329 | > |
| 325 | <Tool | 330 | <Tool |
| 326 | Name="VCPreBuildEventTool" | 331 | Name="VCPreBuildEventTool" |
| @@ -336,37 +341,35 @@ | |||
| 336 | /> | 341 | /> |
| 337 | <Tool | 342 | <Tool |
| 338 | Name="VCMIDLTool" | 343 | Name="VCMIDLTool" |
| 339 | PreprocessorDefinitions="NDEBUG" | 344 | PreprocessorDefinitions="_DEBUG" |
| 340 | MkTypLibCompatible="true" | 345 | MkTypLibCompatible="true" |
| 341 | SuppressStartupBanner="true" | 346 | SuppressStartupBanner="true" |
| 342 | TargetEnvironment="1" | 347 | TargetEnvironment="3" |
| 343 | TypeLibraryName="$(OutDir)/zlibvc.tlb" | 348 | TypeLibraryName="$(OutDir)/zlibvc.tlb" |
| 344 | /> | 349 | /> |
| 345 | <Tool | 350 | <Tool |
| 346 | Name="VCCLCompilerTool" | 351 | Name="VCCLCompilerTool" |
| 347 | InlineFunctionExpansion="1" | 352 | Optimization="0" |
| 348 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 353 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
| 349 | PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI;NO_snprintf" | 354 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64" |
| 350 | StringPooling="true" | ||
| 351 | ExceptionHandling="0" | 355 | ExceptionHandling="0" |
| 352 | RuntimeLibrary="2" | 356 | RuntimeLibrary="3" |
| 353 | BufferSecurityCheck="false" | 357 | BufferSecurityCheck="false" |
| 354 | EnableFunctionLevelLinking="true" | ||
| 355 | PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" | 358 | PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" |
| 356 | AssemblerOutput="2" | ||
| 357 | AssemblerListingLocation="$(IntDir)\" | 359 | AssemblerListingLocation="$(IntDir)\" |
| 358 | ObjectFile="$(IntDir)\" | 360 | ObjectFile="$(IntDir)\" |
| 359 | ProgramDataBaseFileName="$(OutDir)\" | 361 | ProgramDataBaseFileName="$(OutDir)\" |
| 360 | BrowseInformation="0" | 362 | BrowseInformation="0" |
| 361 | WarningLevel="3" | 363 | WarningLevel="3" |
| 362 | SuppressStartupBanner="true" | 364 | SuppressStartupBanner="true" |
| 365 | DebugInformationFormat="3" | ||
| 363 | /> | 366 | /> |
| 364 | <Tool | 367 | <Tool |
| 365 | Name="VCManagedResourceCompilerTool" | 368 | Name="VCManagedResourceCompilerTool" |
| 366 | /> | 369 | /> |
| 367 | <Tool | 370 | <Tool |
| 368 | Name="VCResourceCompilerTool" | 371 | Name="VCResourceCompilerTool" |
| 369 | PreprocessorDefinitions="NDEBUG" | 372 | PreprocessorDefinitions="_DEBUG" |
| 370 | Culture="1036" | 373 | Culture="1036" |
| 371 | /> | 374 | /> |
| 372 | <Tool | 375 | <Tool |
| @@ -374,19 +377,19 @@ | |||
| 374 | /> | 377 | /> |
| 375 | <Tool | 378 | <Tool |
| 376 | Name="VCLinkerTool" | 379 | Name="VCLinkerTool" |
| 377 | AdditionalOptions="/MACHINE:I386" | 380 | AdditionalDependencies="..\..\masmx64\gvmat64.obj ..\..\masmx64\inffasx64.obj " |
| 378 | OutputFile="$(OutDir)\zlibwapi.dll" | 381 | OutputFile="$(OutDir)\zlibwapi.dll" |
| 379 | LinkIncremental="1" | 382 | LinkIncremental="2" |
| 380 | SuppressStartupBanner="true" | 383 | SuppressStartupBanner="true" |
| 381 | GenerateManifest="false" | 384 | GenerateManifest="false" |
| 382 | IgnoreAllDefaultLibraries="false" | ||
| 383 | ModuleDefinitionFile=".\zlibvc.def" | 385 | ModuleDefinitionFile=".\zlibvc.def" |
| 386 | GenerateDebugInformation="true" | ||
| 384 | ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" | 387 | ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" |
| 385 | GenerateMapFile="true" | 388 | GenerateMapFile="true" |
| 386 | MapFileName="$(OutDir)/zlibwapi.map" | 389 | MapFileName="$(OutDir)/zlibwapi.map" |
| 387 | SubSystem="2" | 390 | SubSystem="2" |
| 388 | OptimizeForWindows98="1" | ||
| 389 | ImportLibrary="$(OutDir)/zlibwapi.lib" | 391 | ImportLibrary="$(OutDir)/zlibwapi.lib" |
| 392 | TargetMachine="17" | ||
| 390 | /> | 393 | /> |
| 391 | <Tool | 394 | <Tool |
| 392 | Name="VCALinkTool" | 395 | Name="VCALinkTool" |
| @@ -414,14 +417,13 @@ | |||
| 414 | /> | 417 | /> |
| 415 | </Configuration> | 418 | </Configuration> |
| 416 | <Configuration | 419 | <Configuration |
| 417 | Name="ReleaseWithoutAsm|x64" | 420 | Name="Debug|Itanium" |
| 418 | OutputDirectory="x64\ZlibDll$(ConfigurationName)" | 421 | OutputDirectory="ia64\ZlibDll$(ConfigurationName)" |
| 419 | IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp" | 422 | IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp" |
| 420 | ConfigurationType="2" | 423 | ConfigurationType="2" |
| 421 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 424 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
| 422 | UseOfMFC="0" | 425 | UseOfMFC="0" |
| 423 | ATLMinimizesCRunTimeLibraryUsage="false" | 426 | ATLMinimizesCRunTimeLibraryUsage="false" |
| 424 | WholeProgramOptimization="1" | ||
| 425 | > | 427 | > |
| 426 | <Tool | 428 | <Tool |
| 427 | Name="VCPreBuildEventTool" | 429 | Name="VCPreBuildEventTool" |
| @@ -437,37 +439,35 @@ | |||
| 437 | /> | 439 | /> |
| 438 | <Tool | 440 | <Tool |
| 439 | Name="VCMIDLTool" | 441 | Name="VCMIDLTool" |
| 440 | PreprocessorDefinitions="NDEBUG" | 442 | PreprocessorDefinitions="_DEBUG" |
| 441 | MkTypLibCompatible="true" | 443 | MkTypLibCompatible="true" |
| 442 | SuppressStartupBanner="true" | 444 | SuppressStartupBanner="true" |
| 443 | TargetEnvironment="3" | 445 | TargetEnvironment="2" |
| 444 | TypeLibraryName="$(OutDir)/zlibvc.tlb" | 446 | TypeLibraryName="$(OutDir)/zlibvc.tlb" |
| 445 | /> | 447 | /> |
| 446 | <Tool | 448 | <Tool |
| 447 | Name="VCCLCompilerTool" | 449 | Name="VCCLCompilerTool" |
| 448 | InlineFunctionExpansion="1" | 450 | Optimization="0" |
| 449 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 451 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
| 450 | PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI;NO_snprintf;WIN64" | 452 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64" |
| 451 | StringPooling="true" | ||
| 452 | ExceptionHandling="0" | 453 | ExceptionHandling="0" |
| 453 | RuntimeLibrary="2" | 454 | RuntimeLibrary="3" |
| 454 | BufferSecurityCheck="false" | 455 | BufferSecurityCheck="false" |
| 455 | EnableFunctionLevelLinking="true" | ||
| 456 | PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" | 456 | PrecompiledHeaderFile="$(IntDir)/zlibvc.pch" |
| 457 | AssemblerOutput="2" | ||
| 458 | AssemblerListingLocation="$(IntDir)\" | 457 | AssemblerListingLocation="$(IntDir)\" |
| 459 | ObjectFile="$(IntDir)\" | 458 | ObjectFile="$(IntDir)\" |
| 460 | ProgramDataBaseFileName="$(OutDir)\" | 459 | ProgramDataBaseFileName="$(OutDir)\" |
| 461 | BrowseInformation="0" | 460 | BrowseInformation="0" |
| 462 | WarningLevel="3" | 461 | WarningLevel="3" |
| 463 | SuppressStartupBanner="true" | 462 | SuppressStartupBanner="true" |
| 463 | DebugInformationFormat="3" | ||
| 464 | /> | 464 | /> |
| 465 | <Tool | 465 | <Tool |
| 466 | Name="VCManagedResourceCompilerTool" | 466 | Name="VCManagedResourceCompilerTool" |
| 467 | /> | 467 | /> |
| 468 | <Tool | 468 | <Tool |
| 469 | Name="VCResourceCompilerTool" | 469 | Name="VCResourceCompilerTool" |
| 470 | PreprocessorDefinitions="NDEBUG" | 470 | PreprocessorDefinitions="_DEBUG" |
| 471 | Culture="1036" | 471 | Culture="1036" |
| 472 | /> | 472 | /> |
| 473 | <Tool | 473 | <Tool |
| @@ -476,18 +476,17 @@ | |||
| 476 | <Tool | 476 | <Tool |
| 477 | Name="VCLinkerTool" | 477 | Name="VCLinkerTool" |
| 478 | OutputFile="$(OutDir)\zlibwapi.dll" | 478 | OutputFile="$(OutDir)\zlibwapi.dll" |
| 479 | LinkIncremental="1" | 479 | LinkIncremental="2" |
| 480 | SuppressStartupBanner="true" | 480 | SuppressStartupBanner="true" |
| 481 | GenerateManifest="false" | 481 | GenerateManifest="false" |
| 482 | IgnoreAllDefaultLibraries="false" | ||
| 483 | ModuleDefinitionFile=".\zlibvc.def" | 482 | ModuleDefinitionFile=".\zlibvc.def" |
| 483 | GenerateDebugInformation="true" | ||
| 484 | ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" | 484 | ProgramDatabaseFile="$(OutDir)/zlibwapi.pdb" |
| 485 | GenerateMapFile="true" | 485 | GenerateMapFile="true" |
| 486 | MapFileName="$(OutDir)/zlibwapi.map" | 486 | MapFileName="$(OutDir)/zlibwapi.map" |
| 487 | SubSystem="2" | 487 | SubSystem="2" |
| 488 | OptimizeForWindows98="1" | ||
| 489 | ImportLibrary="$(OutDir)/zlibwapi.lib" | 488 | ImportLibrary="$(OutDir)/zlibwapi.lib" |
| 490 | TargetMachine="17" | 489 | TargetMachine="5" |
| 491 | /> | 490 | /> |
| 492 | <Tool | 491 | <Tool |
| 493 | Name="VCALinkTool" | 492 | Name="VCALinkTool" |
| @@ -515,9 +514,9 @@ | |||
| 515 | /> | 514 | /> |
| 516 | </Configuration> | 515 | </Configuration> |
| 517 | <Configuration | 516 | <Configuration |
| 518 | Name="ReleaseWithoutAsm|Itanium" | 517 | Name="ReleaseWithoutAsm|x64" |
| 519 | OutputDirectory="ia64\ZlibDll$(ConfigurationName)" | 518 | OutputDirectory="x64\ZlibDll$(ConfigurationName)" |
| 520 | IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp" | 519 | IntermediateDirectory="x64\ZlibDll$(ConfigurationName)\Tmp" |
| 521 | ConfigurationType="2" | 520 | ConfigurationType="2" |
| 522 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 521 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
| 523 | UseOfMFC="0" | 522 | UseOfMFC="0" |
| @@ -541,14 +540,14 @@ | |||
| 541 | PreprocessorDefinitions="NDEBUG" | 540 | PreprocessorDefinitions="NDEBUG" |
| 542 | MkTypLibCompatible="true" | 541 | MkTypLibCompatible="true" |
| 543 | SuppressStartupBanner="true" | 542 | SuppressStartupBanner="true" |
| 544 | TargetEnvironment="2" | 543 | TargetEnvironment="3" |
| 545 | TypeLibraryName="$(OutDir)/zlibvc.tlb" | 544 | TypeLibraryName="$(OutDir)/zlibvc.tlb" |
| 546 | /> | 545 | /> |
| 547 | <Tool | 546 | <Tool |
| 548 | Name="VCCLCompilerTool" | 547 | Name="VCCLCompilerTool" |
| 549 | InlineFunctionExpansion="1" | 548 | InlineFunctionExpansion="1" |
| 550 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 549 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
| 551 | PreprocessorDefinitions="WIN32,_CRT_SECURE_NO_DEPRECATE,ZLIB_WINAPI;NO_snprintf;WIN64" | 550 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64" |
| 552 | StringPooling="true" | 551 | StringPooling="true" |
| 553 | ExceptionHandling="0" | 552 | ExceptionHandling="0" |
| 554 | RuntimeLibrary="2" | 553 | RuntimeLibrary="2" |
| @@ -588,7 +587,7 @@ | |||
| 588 | SubSystem="2" | 587 | SubSystem="2" |
| 589 | OptimizeForWindows98="1" | 588 | OptimizeForWindows98="1" |
| 590 | ImportLibrary="$(OutDir)/zlibwapi.lib" | 589 | ImportLibrary="$(OutDir)/zlibwapi.lib" |
| 591 | TargetMachine="5" | 590 | TargetMachine="17" |
| 592 | /> | 591 | /> |
| 593 | <Tool | 592 | <Tool |
| 594 | Name="VCALinkTool" | 593 | Name="VCALinkTool" |
| @@ -616,9 +615,9 @@ | |||
| 616 | /> | 615 | /> |
| 617 | </Configuration> | 616 | </Configuration> |
| 618 | <Configuration | 617 | <Configuration |
| 619 | Name="Release|Win32" | 618 | Name="ReleaseWithoutAsm|Itanium" |
| 620 | OutputDirectory="x86\ZlibDll$(ConfigurationName)" | 619 | OutputDirectory="ia64\ZlibDll$(ConfigurationName)" |
| 621 | IntermediateDirectory="x86\ZlibDll$(ConfigurationName)\Tmp" | 620 | IntermediateDirectory="ia64\ZlibDll$(ConfigurationName)\Tmp" |
| 622 | ConfigurationType="2" | 621 | ConfigurationType="2" |
| 623 | InheritedPropertySheets="UpgradeFromVC70.vsprops" | 622 | InheritedPropertySheets="UpgradeFromVC70.vsprops" |
| 624 | UseOfMFC="0" | 623 | UseOfMFC="0" |
| @@ -642,14 +641,14 @@ | |||
| 642 | PreprocessorDefinitions="NDEBUG" | 641 | PreprocessorDefinitions="NDEBUG" |
| 643 | MkTypLibCompatible="true" | 642 | MkTypLibCompatible="true" |
| 644 | SuppressStartupBanner="true" | 643 | SuppressStartupBanner="true" |
| 645 | TargetEnvironment="1" | 644 | TargetEnvironment="2" |
| 646 | TypeLibraryName="$(OutDir)/zlibvc.tlb" | 645 | TypeLibraryName="$(OutDir)/zlibvc.tlb" |
| 647 | /> | 646 | /> |
| 648 | <Tool | 647 | <Tool |
| 649 | Name="VCCLCompilerTool" | 648 | Name="VCCLCompilerTool" |
| 650 | InlineFunctionExpansion="1" | 649 | InlineFunctionExpansion="1" |
| 651 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 650 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
| 652 | PreprocessorDefinitions="WIN32;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NO_snprintf;ASMV;ASMINF" | 651 | PreprocessorDefinitions="WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64" |
| 653 | StringPooling="true" | 652 | StringPooling="true" |
| 654 | ExceptionHandling="0" | 653 | ExceptionHandling="0" |
| 655 | RuntimeLibrary="2" | 654 | RuntimeLibrary="2" |
| @@ -677,8 +676,6 @@ | |||
| 677 | /> | 676 | /> |
| 678 | <Tool | 677 | <Tool |
| 679 | Name="VCLinkerTool" | 678 | Name="VCLinkerTool" |
| 680 | AdditionalOptions="/MACHINE:I386" | ||
| 681 | AdditionalDependencies="..\..\masmx86\gvmat32.obj ..\..\masmx86\inffas32.obj " | ||
| 682 | OutputFile="$(OutDir)\zlibwapi.dll" | 679 | OutputFile="$(OutDir)\zlibwapi.dll" |
| 683 | LinkIncremental="1" | 680 | LinkIncremental="1" |
| 684 | SuppressStartupBanner="true" | 681 | SuppressStartupBanner="true" |
| @@ -691,6 +688,7 @@ | |||
| 691 | SubSystem="2" | 688 | SubSystem="2" |
| 692 | OptimizeForWindows98="1" | 689 | OptimizeForWindows98="1" |
| 693 | ImportLibrary="$(OutDir)/zlibwapi.lib" | 690 | ImportLibrary="$(OutDir)/zlibwapi.lib" |
| 691 | TargetMachine="5" | ||
| 694 | /> | 692 | /> |
| 695 | <Tool | 693 | <Tool |
| 696 | Name="VCALinkTool" | 694 | Name="VCALinkTool" |
| @@ -751,7 +749,7 @@ | |||
| 751 | Name="VCCLCompilerTool" | 749 | Name="VCCLCompilerTool" |
| 752 | InlineFunctionExpansion="1" | 750 | InlineFunctionExpansion="1" |
| 753 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 751 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
| 754 | PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NO_snprintf;ASMV;ASMINF;WIN64" | 752 | PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64" |
| 755 | StringPooling="true" | 753 | StringPooling="true" |
| 756 | ExceptionHandling="0" | 754 | ExceptionHandling="0" |
| 757 | RuntimeLibrary="2" | 755 | RuntimeLibrary="2" |
| @@ -853,7 +851,7 @@ | |||
| 853 | Name="VCCLCompilerTool" | 851 | Name="VCCLCompilerTool" |
| 854 | InlineFunctionExpansion="1" | 852 | InlineFunctionExpansion="1" |
| 855 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" | 853 | AdditionalIncludeDirectories="..\..\..;..\..\masmx86" |
| 856 | PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NO_snprintf;WIN64" | 854 | PreprocessorDefinitions="_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64" |
| 857 | StringPooling="true" | 855 | StringPooling="true" |
| 858 | ExceptionHandling="0" | 856 | ExceptionHandling="0" |
| 859 | RuntimeLibrary="2" | 857 | RuntimeLibrary="2" |
| @@ -948,7 +946,7 @@ | |||
| 948 | RelativePath="..\..\masmx86\gvmat32c.c" | 946 | RelativePath="..\..\masmx86\gvmat32c.c" |
| 949 | > | 947 | > |
| 950 | <FileConfiguration | 948 | <FileConfiguration |
| 951 | Name="Debug|x64" | 949 | Name="ReleaseWithoutAsm|Win32" |
| 952 | ExcludedFromBuild="true" | 950 | ExcludedFromBuild="true" |
| 953 | > | 951 | > |
| 954 | <Tool | 952 | <Tool |
| @@ -956,7 +954,7 @@ | |||
| 956 | /> | 954 | /> |
| 957 | </FileConfiguration> | 955 | </FileConfiguration> |
| 958 | <FileConfiguration | 956 | <FileConfiguration |
| 959 | Name="Debug|Itanium" | 957 | Name="Debug|x64" |
| 960 | ExcludedFromBuild="true" | 958 | ExcludedFromBuild="true" |
| 961 | > | 959 | > |
| 962 | <Tool | 960 | <Tool |
| @@ -964,7 +962,7 @@ | |||
| 964 | /> | 962 | /> |
| 965 | </FileConfiguration> | 963 | </FileConfiguration> |
| 966 | <FileConfiguration | 964 | <FileConfiguration |
| 967 | Name="ReleaseWithoutAsm|Win32" | 965 | Name="Debug|Itanium" |
| 968 | ExcludedFromBuild="true" | 966 | ExcludedFromBuild="true" |
| 969 | > | 967 | > |
| 970 | <Tool | 968 | <Tool |
| @@ -1005,19 +1003,24 @@ | |||
| 1005 | </FileConfiguration> | 1003 | </FileConfiguration> |
| 1006 | </File> | 1004 | </File> |
| 1007 | <File | 1005 | <File |
| 1008 | RelativePath="..\..\..\gzclose.c"> | 1006 | RelativePath="..\..\..\gzclose.c" |
| 1007 | > | ||
| 1009 | </File> | 1008 | </File> |
| 1010 | <File | 1009 | <File |
| 1011 | RelativePath="..\..\..\gzio.c"> | 1010 | RelativePath="..\..\..\gzio.c" |
| 1011 | > | ||
| 1012 | </File> | 1012 | </File> |
| 1013 | <File | 1013 | <File |
| 1014 | RelativePath="..\..\..\gzlib.c"> | 1014 | RelativePath="..\..\..\gzlib.c" |
| 1015 | > | ||
| 1015 | </File> | 1016 | </File> |
| 1016 | <File | 1017 | <File |
| 1017 | RelativePath="..\..\..\gzread.c"> | 1018 | RelativePath="..\..\..\gzread.c" |
| 1019 | > | ||
| 1018 | </File> | 1020 | </File> |
| 1019 | <File | 1021 | <File |
| 1020 | RelativePath="..\..\..\gzwrite.c"> | 1022 | RelativePath="..\..\..\gzwrite.c" |
| 1023 | > | ||
| 1021 | </File> | 1024 | </File> |
| 1022 | <File | 1025 | <File |
| 1023 | RelativePath="..\..\..\infback.c" | 1026 | RelativePath="..\..\..\infback.c" |
| @@ -1035,7 +1038,7 @@ | |||
| 1035 | /> | 1038 | /> |
| 1036 | </FileConfiguration> | 1039 | </FileConfiguration> |
| 1037 | <FileConfiguration | 1040 | <FileConfiguration |
| 1038 | Name="Debug|Itanium" | 1041 | Name="ReleaseWithoutAsm|Win32" |
| 1039 | ExcludedFromBuild="true" | 1042 | ExcludedFromBuild="true" |
| 1040 | > | 1043 | > |
| 1041 | <Tool | 1044 | <Tool |
| @@ -1043,7 +1046,7 @@ | |||
| 1043 | /> | 1046 | /> |
| 1044 | </FileConfiguration> | 1047 | </FileConfiguration> |
| 1045 | <FileConfiguration | 1048 | <FileConfiguration |
| 1046 | Name="ReleaseWithoutAsm|Win32" | 1049 | Name="Release|Win32" |
| 1047 | ExcludedFromBuild="true" | 1050 | ExcludedFromBuild="true" |
| 1048 | > | 1051 | > |
| 1049 | <Tool | 1052 | <Tool |
| @@ -1051,7 +1054,7 @@ | |||
| 1051 | /> | 1054 | /> |
| 1052 | </FileConfiguration> | 1055 | </FileConfiguration> |
| 1053 | <FileConfiguration | 1056 | <FileConfiguration |
| 1054 | Name="ReleaseWithoutAsm|Itanium" | 1057 | Name="Debug|Itanium" |
| 1055 | ExcludedFromBuild="true" | 1058 | ExcludedFromBuild="true" |
| 1056 | > | 1059 | > |
| 1057 | <Tool | 1060 | <Tool |
| @@ -1059,7 +1062,7 @@ | |||
| 1059 | /> | 1062 | /> |
| 1060 | </FileConfiguration> | 1063 | </FileConfiguration> |
| 1061 | <FileConfiguration | 1064 | <FileConfiguration |
| 1062 | Name="Release|Win32" | 1065 | Name="ReleaseWithoutAsm|Itanium" |
| 1063 | ExcludedFromBuild="true" | 1066 | ExcludedFromBuild="true" |
| 1064 | > | 1067 | > |
| 1065 | <Tool | 1068 | <Tool |
| @@ -52,7 +52,7 @@ | |||
| 52 | #include "deflate.h" | 52 | #include "deflate.h" |
| 53 | 53 | ||
| 54 | const char deflate_copyright[] = | 54 | const char deflate_copyright[] = |
| 55 | " deflate 1.2.3.8 Copyright 1995-2010 Jean-loup Gailly and Mark Adler "; | 55 | " deflate 1.2.3.9 Copyright 1995-2010 Jean-loup Gailly and Mark Adler "; |
| 56 | /* | 56 | /* |
| 57 | If you use the zlib library in a product, an acknowledgment is welcome | 57 | If you use the zlib library in a product, an acknowledgment is welcome |
| 58 | in the documentation of your product. If for some reason you cannot | 58 | in the documentation of your product. If for some reason you cannot |
| @@ -3,8 +3,6 @@ | |||
| 3 | * For conditions of distribution and use, see copyright notice in zlib.h | 3 | * For conditions of distribution and use, see copyright notice in zlib.h |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #ifndef OLD_GZIO | ||
| 7 | |||
| 8 | #include "gzguts.h" | 6 | #include "gzguts.h" |
| 9 | 7 | ||
| 10 | /* gzclose() is in a separate file so that it is linked in only if it is used. | 8 | /* gzclose() is in a separate file so that it is linked in only if it is used. |
| @@ -25,5 +23,3 @@ int ZEXPORT gzclose(file) | |||
| 25 | return gzclose_r(file); | 23 | return gzclose_r(file); |
| 26 | #endif | 24 | #endif |
| 27 | } | 25 | } |
| 28 | |||
| 29 | #endif /* !OLD_GZIO */ | ||
| @@ -1,1196 +0,0 @@ | |||
| 1 | /* gzio.c -- IO on .gz files | ||
| 2 | * Copyright (C) 1995-2010 Jean-loup Gailly. | ||
| 3 | * For conditions of distribution and use, see copyright notice in zlib.h | ||
| 4 | * | ||
| 5 | * Compile this file with -DNO_GZCOMPRESS to avoid the compression code. | ||
| 6 | */ | ||
| 7 | |||
| 8 | /* @(#) $Id$ */ | ||
| 9 | |||
| 10 | #ifdef OLD_GZIO | ||
| 11 | |||
| 12 | #ifdef _LARGEFILE64_SOURCE | ||
| 13 | # ifndef _LARGEFILE_SOURCE | ||
| 14 | # define _LARGEFILE_SOURCE | ||
| 15 | # endif | ||
| 16 | # ifdef _FILE_OFFSET_BITS | ||
| 17 | # undef _FILE_OFFSET_BITS | ||
| 18 | # endif | ||
| 19 | #endif | ||
| 20 | |||
| 21 | #include "zutil.h" | ||
| 22 | #include <stdio.h> | ||
| 23 | |||
| 24 | #ifdef NO_DEFLATE /* for compatibility with old definition */ | ||
| 25 | # define NO_GZCOMPRESS | ||
| 26 | #endif | ||
| 27 | |||
| 28 | #ifndef NO_DUMMY_DECL | ||
| 29 | struct internal_state {int dummy;}; /* for buggy compilers */ | ||
| 30 | #endif | ||
| 31 | |||
| 32 | #ifndef Z_BUFSIZE | ||
| 33 | # ifdef MAXSEG_64K | ||
| 34 | # define Z_BUFSIZE 4096 /* minimize memory usage for 16-bit DOS */ | ||
| 35 | # else | ||
| 36 | # define Z_BUFSIZE 16384 | ||
| 37 | # endif | ||
| 38 | #endif | ||
| 39 | #ifndef Z_PRINTF_BUFSIZE | ||
| 40 | # define Z_PRINTF_BUFSIZE 4096 | ||
| 41 | #endif | ||
| 42 | |||
| 43 | #if defined UNDER_CE && defined NO_ERRNO_H | ||
| 44 | # include <windows.h> | ||
| 45 | |||
| 46 | /* Map the Windows error number in ERROR to a locale-dependent error | ||
| 47 | message string and return a pointer to it. Typically, the values | ||
| 48 | for ERROR come from GetLastError. | ||
| 49 | |||
| 50 | The string pointed to shall not be modified by the application, | ||
| 51 | but may be overwritten by a subsequent call to strwinerror | ||
| 52 | |||
| 53 | The strwinerror function does not change the current setting | ||
| 54 | of GetLastError. */ | ||
| 55 | |||
| 56 | local char *strwinerror (error) | ||
| 57 | DWORD error; | ||
| 58 | { | ||
| 59 | static char buf[1024]; | ||
| 60 | |||
| 61 | wchar_t *msgbuf; | ||
| 62 | DWORD lasterr = GetLastError(); | ||
| 63 | DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | ||
| 64 | | FORMAT_MESSAGE_ALLOCATE_BUFFER, | ||
| 65 | NULL, | ||
| 66 | error, | ||
| 67 | 0, /* Default language */ | ||
| 68 | (LPVOID)&msgbuf, | ||
| 69 | 0, | ||
| 70 | NULL); | ||
| 71 | if (chars != 0) { | ||
| 72 | /* If there is an \r\n appended, zap it. */ | ||
| 73 | if (chars >= 2 | ||
| 74 | && msgbuf[chars - 2] == '\r' && msgbuf[chars - 1] == '\n') { | ||
| 75 | chars -= 2; | ||
| 76 | msgbuf[chars] = 0; | ||
| 77 | } | ||
| 78 | |||
| 79 | if (chars > sizeof (buf) - 1) { | ||
| 80 | chars = sizeof (buf) - 1; | ||
| 81 | msgbuf[chars] = 0; | ||
| 82 | } | ||
| 83 | |||
| 84 | wcstombs(buf, msgbuf, chars + 1); | ||
| 85 | LocalFree(msgbuf); | ||
| 86 | } | ||
| 87 | else { | ||
| 88 | sprintf(buf, "unknown win32 error (%ld)", error); | ||
| 89 | } | ||
| 90 | |||
| 91 | SetLastError(lasterr); | ||
| 92 | return buf; | ||
| 93 | } | ||
| 94 | |||
| 95 | #endif /* UNDER_CE && NO_ERRNO_H */ | ||
| 96 | |||
| 97 | #ifdef __MVS__ | ||
| 98 | #pragma map (fdopen , "\174\174FDOPEN") | ||
| 99 | FILE *fdopen(int, const char *); | ||
| 100 | #endif | ||
| 101 | |||
| 102 | #ifndef STDC | ||
| 103 | extern voidp malloc OF((uInt size)); | ||
| 104 | extern void free OF((voidpf ptr)); | ||
| 105 | #endif | ||
| 106 | |||
| 107 | #ifdef NO_FSEEKO | ||
| 108 | # define FSEEK fseek | ||
| 109 | # define FTELL ftell | ||
| 110 | #else | ||
| 111 | # define FSEEK fseeko | ||
| 112 | # define FTELL ftello | ||
| 113 | #endif | ||
| 114 | |||
| 115 | #define ALLOC(size) malloc(size) | ||
| 116 | #define TRYFREE(p) {if (p) free(p);} | ||
| 117 | |||
| 118 | static int const gz_magic[2] = {0x1f, 0x8b}; /* gzip magic header */ | ||
| 119 | |||
| 120 | /* gzip flag byte */ | ||
| 121 | #define ASCII_FLAG 0x01 /* bit 0 set: file probably ascii text */ | ||
| 122 | #define HEAD_CRC 0x02 /* bit 1 set: header CRC present */ | ||
| 123 | #define EXTRA_FIELD 0x04 /* bit 2 set: extra field present */ | ||
| 124 | #define ORIG_NAME 0x08 /* bit 3 set: original file name present */ | ||
| 125 | #define COMMENT 0x10 /* bit 4 set: file comment present */ | ||
| 126 | #define RESERVED 0xE0 /* bits 5..7: reserved */ | ||
| 127 | |||
| 128 | typedef struct gz_stream { | ||
| 129 | z_stream stream; | ||
| 130 | int z_err; /* error code for last stream operation */ | ||
| 131 | int z_eof; /* set if end of input file */ | ||
| 132 | FILE *file; /* .gz file */ | ||
| 133 | Byte *inbuf; /* input buffer */ | ||
| 134 | Byte *outbuf; /* output buffer */ | ||
| 135 | uLong crc; /* crc32 of uncompressed data */ | ||
| 136 | char *msg; /* error message */ | ||
| 137 | char *path; /* path name for debugging only */ | ||
| 138 | int transparent; /* 1 if input file is not a .gz file */ | ||
| 139 | char mode; /* 'w' or 'r' */ | ||
| 140 | z_off64_t start; /* start of compressed data in file */ | ||
| 141 | z_off64_t in; /* bytes into deflate or inflate */ | ||
| 142 | z_off64_t out; /* bytes out of deflate or inflate */ | ||
| 143 | int back; /* one character push-back */ | ||
| 144 | int last; /* true if push-back is last character */ | ||
| 145 | } gz_stream; | ||
| 146 | |||
| 147 | |||
| 148 | local gzFile gz_open OF((const char *, const char *, int, int)); | ||
| 149 | local z_off64_t gz_seek OF((gzFile, z_off64_t, int, int)); | ||
| 150 | local int do_flush OF((gzFile, int)); | ||
| 151 | local int get_byte OF((gz_stream *)); | ||
| 152 | local void check_header OF((gz_stream *)); | ||
| 153 | local int destroy OF((gz_stream *)); | ||
| 154 | local void putLong OF((FILE *, uLong)); | ||
| 155 | local uLong getLong OF((gz_stream *)); | ||
| 156 | |||
| 157 | /* =========================================================================== | ||
| 158 | Opens a gzip (.gz) file for reading or writing. The mode parameter | ||
| 159 | is as in fopen ("rb" or "wb"). The file is given either by file descriptor | ||
| 160 | or path name (if fd == -1). | ||
| 161 | gz_open returns NULL if the file could not be opened or if there was | ||
| 162 | insufficient memory to allocate the (de)compression state; errno | ||
| 163 | can be checked to distinguish the two cases (if errno is zero, the | ||
| 164 | zlib error is Z_MEM_ERROR). | ||
| 165 | */ | ||
| 166 | local gzFile gz_open (path, mode, fd, use64) | ||
| 167 | const char *path; | ||
| 168 | const char *mode; | ||
| 169 | int fd; | ||
| 170 | int use64; | ||
| 171 | { | ||
| 172 | int err; | ||
| 173 | int level = Z_DEFAULT_COMPRESSION; /* compression level */ | ||
| 174 | int strategy = Z_DEFAULT_STRATEGY; /* compression strategy */ | ||
| 175 | char *p = (char*)mode; | ||
| 176 | gz_stream *s; | ||
| 177 | char fmode[80]; /* copy of mode, without the compression level */ | ||
| 178 | char *m = fmode; | ||
| 179 | |||
| 180 | if (!path || !mode) return Z_NULL; | ||
| 181 | |||
| 182 | s = (gz_stream *)ALLOC(sizeof(gz_stream)); | ||
| 183 | if (!s) return Z_NULL; | ||
| 184 | |||
| 185 | s->stream.zalloc = (alloc_func)0; | ||
| 186 | s->stream.zfree = (free_func)0; | ||
| 187 | s->stream.opaque = (voidpf)0; | ||
| 188 | s->stream.next_in = s->inbuf = Z_NULL; | ||
| 189 | s->stream.next_out = s->outbuf = Z_NULL; | ||
| 190 | s->stream.avail_in = s->stream.avail_out = 0; | ||
| 191 | s->stream.state = Z_NULL; | ||
| 192 | s->file = NULL; | ||
| 193 | s->z_err = Z_OK; | ||
| 194 | s->z_eof = 0; | ||
| 195 | s->in = 0; | ||
| 196 | s->out = 0; | ||
| 197 | s->back = EOF; | ||
| 198 | s->crc = crc32(0L, Z_NULL, 0); | ||
| 199 | s->msg = NULL; | ||
| 200 | s->transparent = 0; | ||
| 201 | |||
| 202 | s->path = (char*)ALLOC(strlen(path)+1); | ||
| 203 | if (s->path == NULL) { | ||
| 204 | return destroy(s), (gzFile)Z_NULL; | ||
| 205 | } | ||
| 206 | strcpy(s->path, path); /* do this early for debugging */ | ||
| 207 | |||
| 208 | s->mode = '\0'; | ||
| 209 | do { | ||
| 210 | if (*p == 'r') s->mode = 'r'; | ||
| 211 | if (*p == 'w' || *p == 'a') s->mode = 'w'; | ||
| 212 | if (*p >= '0' && *p <= '9') { | ||
| 213 | level = *p - '0'; | ||
| 214 | } else if (*p == 'f') { | ||
| 215 | strategy = Z_FILTERED; | ||
| 216 | } else if (*p == 'h') { | ||
| 217 | strategy = Z_HUFFMAN_ONLY; | ||
| 218 | } else if (*p == 'R') { | ||
| 219 | strategy = Z_RLE; | ||
| 220 | } else { | ||
| 221 | *m++ = *p; /* copy the mode */ | ||
| 222 | } | ||
| 223 | } while (*p++ && m != fmode + sizeof(fmode)); | ||
| 224 | if (s->mode == '\0') return destroy(s), (gzFile)Z_NULL; | ||
| 225 | |||
| 226 | if (s->mode == 'w') { | ||
| 227 | #ifdef NO_GZCOMPRESS | ||
| 228 | err = Z_STREAM_ERROR; | ||
| 229 | #else | ||
| 230 | err = deflateInit2(&(s->stream), level, | ||
| 231 | Z_DEFLATED, -MAX_WBITS, DEF_MEM_LEVEL, strategy); | ||
| 232 | /* windowBits is passed < 0 to suppress zlib header */ | ||
| 233 | |||
| 234 | s->stream.next_out = s->outbuf = (Byte*)ALLOC(Z_BUFSIZE); | ||
| 235 | #endif | ||
| 236 | if (err != Z_OK || s->outbuf == Z_NULL) { | ||
| 237 | return destroy(s), (gzFile)Z_NULL; | ||
| 238 | } | ||
| 239 | } else { | ||
| 240 | s->stream.next_in = s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); | ||
| 241 | |||
| 242 | err = inflateInit2(&(s->stream), -MAX_WBITS); | ||
| 243 | /* windowBits is passed < 0 to tell that there is no zlib header */ | ||
| 244 | if (err != Z_OK || s->inbuf == Z_NULL) { | ||
| 245 | return destroy(s), (gzFile)Z_NULL; | ||
| 246 | } | ||
| 247 | } | ||
| 248 | s->stream.avail_out = Z_BUFSIZE; | ||
| 249 | |||
| 250 | zseterrno(0); | ||
| 251 | s->file = fd == -1 ? | ||
| 252 | (use64 ? F_OPEN64(path, fmode) : F_OPEN(path, fmode)) : | ||
| 253 | (FILE*)fdopen(fd, fmode); | ||
| 254 | |||
| 255 | if (s->file == NULL) { | ||
| 256 | return destroy(s), (gzFile)Z_NULL; | ||
| 257 | } | ||
| 258 | if (s->mode == 'w') { | ||
| 259 | /* Write a very simple .gz header: | ||
| 260 | */ | ||
| 261 | fprintf(s->file, "%c%c%c%c%c%c%c%c%c%c", gz_magic[0], gz_magic[1], | ||
| 262 | Z_DEFLATED, 0 /*flags*/, 0,0,0,0 /*time*/, level == 9 ? 2 : | ||
| 263 | (strategy >= Z_HUFFMAN_ONLY || | ||
| 264 | (level != Z_DEFAULT_COMPRESSION && level < 2) ? | ||
| 265 | 4 : 0) /*xflags*/, OS_CODE); | ||
| 266 | s->start = 10L; | ||
| 267 | /* We use 10L instead of ftell(s->file) to because ftell causes an | ||
| 268 | * fflush on some systems. This version of the library doesn't use | ||
| 269 | * start anyway in write mode, so this initialization is not | ||
| 270 | * necessary. | ||
| 271 | */ | ||
| 272 | } else { | ||
| 273 | check_header(s); /* skip the .gz header */ | ||
| 274 | s->start = FTELL(s->file) - s->stream.avail_in; | ||
| 275 | } | ||
| 276 | |||
| 277 | return (gzFile)s; | ||
| 278 | } | ||
| 279 | |||
| 280 | /* =========================================================================== | ||
| 281 | Opens a gzip (.gz) file for reading or writing. | ||
| 282 | */ | ||
| 283 | gzFile ZEXPORT gzopen (path, mode) | ||
| 284 | const char *path; | ||
| 285 | const char *mode; | ||
| 286 | { | ||
| 287 | return gz_open (path, mode, -1, 0); | ||
| 288 | } | ||
| 289 | |||
| 290 | /* =========================================================================== | ||
| 291 | Opens a gzip (.gz) file for reading or writing for 64-bit offsets | ||
| 292 | */ | ||
| 293 | gzFile ZEXPORT gzopen64 (path, mode) | ||
| 294 | const char *path; | ||
| 295 | const char *mode; | ||
| 296 | { | ||
| 297 | return gz_open (path, mode, -1, 1); | ||
| 298 | } | ||
| 299 | |||
| 300 | /* =========================================================================== | ||
| 301 | Associate a gzFile with the file descriptor fd. fd is not dup'ed here | ||
| 302 | to mimic the behavio(u)r of fdopen. | ||
| 303 | */ | ||
| 304 | gzFile ZEXPORT gzdopen (fd, mode) | ||
| 305 | int fd; | ||
| 306 | const char *mode; | ||
| 307 | { | ||
| 308 | char name[46]; /* allow for up to 128-bit integers */ | ||
| 309 | |||
| 310 | if (fd == -1) return (gzFile)Z_NULL; | ||
| 311 | sprintf(name, "<fd:%d>", fd); /* for debugging */ | ||
| 312 | |||
| 313 | return gz_open (name, mode, fd, 0); | ||
| 314 | } | ||
| 315 | |||
| 316 | /* =========================================================================== | ||
| 317 | * Update the compression level and strategy | ||
| 318 | */ | ||
| 319 | int ZEXPORT gzsetparams (file, level, strategy) | ||
| 320 | gzFile file; | ||
| 321 | int level; | ||
| 322 | int strategy; | ||
| 323 | { | ||
| 324 | gz_stream *s = (gz_stream*)file; | ||
| 325 | |||
| 326 | if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR; | ||
| 327 | |||
| 328 | /* Make room to allow flushing */ | ||
| 329 | if (s->stream.avail_out == 0) { | ||
| 330 | |||
| 331 | s->stream.next_out = s->outbuf; | ||
| 332 | if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) { | ||
| 333 | s->z_err = Z_ERRNO; | ||
| 334 | } | ||
| 335 | s->stream.avail_out = Z_BUFSIZE; | ||
| 336 | } | ||
| 337 | |||
| 338 | return deflateParams (&(s->stream), level, strategy); | ||
| 339 | } | ||
| 340 | |||
| 341 | /* =========================================================================== | ||
| 342 | Read a byte from a gz_stream; update next_in and avail_in. Return EOF | ||
| 343 | for end of file. | ||
| 344 | IN assertion: the stream s has been successfully opened for reading. | ||
| 345 | */ | ||
| 346 | local int get_byte(s) | ||
| 347 | gz_stream *s; | ||
| 348 | { | ||
| 349 | if (s->z_eof) return EOF; | ||
| 350 | if (s->stream.avail_in == 0) { | ||
| 351 | zseterrno(0); | ||
| 352 | s->stream.avail_in = (uInt)fread(s->inbuf, 1, Z_BUFSIZE, s->file); | ||
| 353 | if (s->stream.avail_in == 0) { | ||
| 354 | s->z_eof = 1; | ||
| 355 | if (ferror(s->file)) s->z_err = Z_ERRNO; | ||
| 356 | return EOF; | ||
| 357 | } | ||
| 358 | s->stream.next_in = s->inbuf; | ||
| 359 | } | ||
| 360 | s->stream.avail_in--; | ||
| 361 | return *(s->stream.next_in)++; | ||
| 362 | } | ||
| 363 | |||
| 364 | /* =========================================================================== | ||
| 365 | Check the gzip header of a gz_stream opened for reading. Set the stream | ||
| 366 | mode to transparent if the gzip magic header is not present; set s->err | ||
| 367 | to Z_DATA_ERROR if the magic header is present but the rest of the header | ||
| 368 | is incorrect. | ||
| 369 | IN assertion: the stream s has already been created successfully; | ||
| 370 | s->stream.avail_in is zero for the first time, but may be non-zero | ||
| 371 | for concatenated .gz files. | ||
| 372 | */ | ||
| 373 | local void check_header(s) | ||
| 374 | gz_stream *s; | ||
| 375 | { | ||
| 376 | int method; /* method byte */ | ||
| 377 | int flags; /* flags byte */ | ||
| 378 | uInt len; | ||
| 379 | int c; | ||
| 380 | |||
| 381 | /* Assure two bytes in the buffer so we can peek ahead -- handle case | ||
| 382 | where first byte of header is at the end of the buffer after the last | ||
| 383 | gzip segment */ | ||
| 384 | len = s->stream.avail_in; | ||
| 385 | if (len < 2) { | ||
| 386 | if (len) s->inbuf[0] = s->stream.next_in[0]; | ||
| 387 | zseterrno(0); | ||
| 388 | len = (uInt)fread(s->inbuf + len, 1, Z_BUFSIZE >> len, s->file); | ||
| 389 | if (len == 0) s->z_eof = 1; | ||
| 390 | if (len == 0 && ferror(s->file)) s->z_err = Z_ERRNO; | ||
| 391 | s->stream.avail_in += len; | ||
| 392 | s->stream.next_in = s->inbuf; | ||
| 393 | if (s->stream.avail_in < 2) { | ||
| 394 | s->transparent = s->stream.avail_in; | ||
| 395 | return; | ||
| 396 | } | ||
| 397 | } | ||
| 398 | |||
| 399 | /* Peek ahead to check the gzip magic header */ | ||
| 400 | if (s->stream.next_in[0] != gz_magic[0] || | ||
| 401 | s->stream.next_in[1] != gz_magic[1]) { | ||
| 402 | s->transparent = 1; | ||
| 403 | return; | ||
| 404 | } | ||
| 405 | s->stream.avail_in -= 2; | ||
| 406 | s->stream.next_in += 2; | ||
| 407 | |||
| 408 | /* Check the rest of the gzip header */ | ||
| 409 | method = get_byte(s); | ||
| 410 | flags = get_byte(s); | ||
| 411 | if (method != Z_DEFLATED || (flags & RESERVED) != 0) { | ||
| 412 | s->z_err = Z_DATA_ERROR; | ||
| 413 | return; | ||
| 414 | } | ||
| 415 | |||
| 416 | /* Discard time, xflags and OS code: */ | ||
| 417 | for (len = 0; len < 6; len++) (void)get_byte(s); | ||
| 418 | |||
| 419 | if ((flags & EXTRA_FIELD) != 0) { /* skip the extra field */ | ||
| 420 | len = (uInt)get_byte(s); | ||
| 421 | len += ((uInt)get_byte(s))<<8; | ||
| 422 | /* len is garbage if EOF but the loop below will quit anyway */ | ||
| 423 | while (len-- != 0 && get_byte(s) != EOF) ; | ||
| 424 | } | ||
| 425 | if ((flags & ORIG_NAME) != 0) { /* skip the original file name */ | ||
| 426 | while ((c = get_byte(s)) != 0 && c != EOF) ; | ||
| 427 | } | ||
| 428 | if ((flags & COMMENT) != 0) { /* skip the .gz file comment */ | ||
| 429 | while ((c = get_byte(s)) != 0 && c != EOF) ; | ||
| 430 | } | ||
| 431 | if ((flags & HEAD_CRC) != 0) { /* skip the header crc */ | ||
| 432 | for (len = 0; len < 2; len++) (void)get_byte(s); | ||
| 433 | } | ||
| 434 | s->z_err = s->z_eof ? Z_DATA_ERROR : Z_OK; | ||
| 435 | } | ||
| 436 | |||
| 437 | /* =========================================================================== | ||
| 438 | * Cleanup then free the given gz_stream. Return a zlib error code. | ||
| 439 | Try freeing in the reverse order of allocations. | ||
| 440 | */ | ||
| 441 | local int destroy (s) | ||
| 442 | gz_stream *s; | ||
| 443 | { | ||
| 444 | int err = Z_OK; | ||
| 445 | |||
| 446 | if (!s) return Z_STREAM_ERROR; | ||
| 447 | |||
| 448 | TRYFREE(s->msg); | ||
| 449 | |||
| 450 | if (s->stream.state != NULL) { | ||
| 451 | if (s->mode == 'w') { | ||
| 452 | #ifdef NO_GZCOMPRESS | ||
| 453 | err = Z_STREAM_ERROR; | ||
| 454 | #else | ||
| 455 | err = deflateEnd(&(s->stream)); | ||
| 456 | #endif | ||
| 457 | } else if (s->mode == 'r') { | ||
| 458 | err = inflateEnd(&(s->stream)); | ||
| 459 | } | ||
| 460 | } | ||
| 461 | if (s->file != NULL && fclose(s->file)) { | ||
| 462 | #ifdef ESPIPE | ||
| 463 | if (zerrno() != ESPIPE) /* fclose is broken for pipes in HP/UX */ | ||
| 464 | #endif | ||
| 465 | err = Z_ERRNO; | ||
| 466 | } | ||
| 467 | if (s->z_err < 0) err = s->z_err; | ||
| 468 | |||
| 469 | TRYFREE(s->inbuf); | ||
| 470 | TRYFREE(s->outbuf); | ||
| 471 | TRYFREE(s->path); | ||
| 472 | TRYFREE(s); | ||
| 473 | return err; | ||
| 474 | } | ||
| 475 | |||
| 476 | /* =========================================================================== | ||
| 477 | Reads the given number of uncompressed bytes from the compressed file. | ||
| 478 | gzread returns the number of bytes actually read (0 for end of file). | ||
| 479 | */ | ||
| 480 | int ZEXPORT gzread (file, buf, len) | ||
| 481 | gzFile file; | ||
| 482 | voidp buf; | ||
| 483 | unsigned len; | ||
| 484 | { | ||
| 485 | gz_stream *s = (gz_stream*)file; | ||
| 486 | Bytef *start = (Bytef*)buf; /* starting point for crc computation */ | ||
| 487 | Byte *next_out; /* == stream.next_out but not forced far (for MSDOS) */ | ||
| 488 | |||
| 489 | if (s == NULL || s->mode != 'r') return Z_STREAM_ERROR; | ||
| 490 | |||
| 491 | if (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO) return -1; | ||
| 492 | if (s->z_err == Z_STREAM_END) return 0; /* EOF */ | ||
| 493 | |||
| 494 | next_out = (Byte*)buf; | ||
| 495 | s->stream.next_out = (Bytef*)buf; | ||
| 496 | s->stream.avail_out = len; | ||
| 497 | |||
| 498 | if (s->stream.avail_out && s->back != EOF) { | ||
| 499 | *next_out++ = s->back; | ||
| 500 | s->stream.next_out++; | ||
| 501 | s->stream.avail_out--; | ||
| 502 | s->back = EOF; | ||
| 503 | s->out++; | ||
| 504 | start++; | ||
| 505 | if (s->last) { | ||
| 506 | s->z_err = Z_STREAM_END; | ||
| 507 | return 1; | ||
| 508 | } | ||
| 509 | } | ||
| 510 | |||
| 511 | while (s->stream.avail_out != 0) { | ||
| 512 | |||
| 513 | if (s->transparent) { | ||
| 514 | /* Copy first the lookahead bytes: */ | ||
| 515 | uInt n = s->stream.avail_in; | ||
| 516 | if (n > s->stream.avail_out) n = s->stream.avail_out; | ||
| 517 | if (n > 0) { | ||
| 518 | zmemcpy(s->stream.next_out, s->stream.next_in, n); | ||
| 519 | next_out += n; | ||
| 520 | s->stream.next_out = next_out; | ||
| 521 | s->stream.next_in += n; | ||
| 522 | s->stream.avail_out -= n; | ||
| 523 | s->stream.avail_in -= n; | ||
| 524 | } | ||
| 525 | if (s->stream.avail_out > 0 && !feof(s->file)) { | ||
| 526 | s->stream.avail_out -= | ||
| 527 | (uInt)fread(next_out, 1, s->stream.avail_out, s->file); | ||
| 528 | } | ||
| 529 | len -= s->stream.avail_out; | ||
| 530 | s->in += len; | ||
| 531 | s->out += len; | ||
| 532 | if (len == 0 && feof(s->file)) s->z_eof = 1; | ||
| 533 | return (int)len; | ||
| 534 | } | ||
| 535 | if (s->stream.avail_in == 0 && !s->z_eof) { | ||
| 536 | |||
| 537 | zseterrno(0); | ||
| 538 | s->stream.avail_in = (uInt)fread(s->inbuf, 1, Z_BUFSIZE, s->file); | ||
| 539 | if (s->stream.avail_in == 0) { | ||
| 540 | s->z_eof = 1; | ||
| 541 | if (ferror(s->file)) { | ||
| 542 | s->z_err = Z_ERRNO; | ||
| 543 | break; | ||
| 544 | } | ||
| 545 | } | ||
| 546 | s->stream.next_in = s->inbuf; | ||
| 547 | } | ||
| 548 | s->in += s->stream.avail_in; | ||
| 549 | s->out += s->stream.avail_out; | ||
| 550 | s->z_err = inflate(&(s->stream), Z_NO_FLUSH); | ||
| 551 | s->in -= s->stream.avail_in; | ||
| 552 | s->out -= s->stream.avail_out; | ||
| 553 | |||
| 554 | if (s->z_err == Z_STREAM_END) { | ||
| 555 | /* Check CRC and original size */ | ||
| 556 | s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start)); | ||
| 557 | start = s->stream.next_out; | ||
| 558 | |||
| 559 | if (getLong(s) != s->crc) { | ||
| 560 | s->z_err = Z_DATA_ERROR; | ||
| 561 | } else { | ||
| 562 | (void)getLong(s); | ||
| 563 | /* The uncompressed length returned by above getlong() may be | ||
| 564 | * different from s->out in case of concatenated .gz files. | ||
| 565 | * Check for such files: | ||
| 566 | */ | ||
| 567 | check_header(s); | ||
| 568 | if (s->z_err == Z_OK) { | ||
| 569 | inflateReset(&(s->stream)); | ||
| 570 | s->crc = crc32(0L, Z_NULL, 0); | ||
| 571 | } | ||
| 572 | } | ||
| 573 | } | ||
| 574 | if (s->z_err != Z_OK || s->z_eof) break; | ||
| 575 | } | ||
| 576 | s->crc = crc32(s->crc, start, (uInt)(s->stream.next_out - start)); | ||
| 577 | |||
| 578 | if (len == s->stream.avail_out && | ||
| 579 | (s->z_err == Z_DATA_ERROR || s->z_err == Z_ERRNO)) | ||
| 580 | return -1; | ||
| 581 | return (int)(len - s->stream.avail_out); | ||
| 582 | } | ||
| 583 | |||
| 584 | |||
| 585 | /* =========================================================================== | ||
| 586 | Reads one byte from the compressed file. gzgetc returns this byte | ||
| 587 | or -1 in case of end of file or error. | ||
| 588 | */ | ||
| 589 | int ZEXPORT gzgetc(file) | ||
| 590 | gzFile file; | ||
| 591 | { | ||
| 592 | unsigned char c; | ||
| 593 | |||
| 594 | return gzread(file, &c, 1) == 1 ? c : -1; | ||
| 595 | } | ||
| 596 | |||
| 597 | |||
| 598 | /* =========================================================================== | ||
| 599 | Push one byte back onto the stream. | ||
| 600 | */ | ||
| 601 | int ZEXPORT gzungetc(c, file) | ||
| 602 | int c; | ||
| 603 | gzFile file; | ||
| 604 | { | ||
| 605 | gz_stream *s = (gz_stream*)file; | ||
| 606 | |||
| 607 | if (s == NULL || s->mode != 'r' || c == EOF || s->back != EOF) return EOF; | ||
| 608 | s->back = c; | ||
| 609 | s->out--; | ||
| 610 | s->last = (s->z_err == Z_STREAM_END); | ||
| 611 | if (s->last) s->z_err = Z_OK; | ||
| 612 | s->z_eof = 0; | ||
| 613 | return c; | ||
| 614 | } | ||
| 615 | |||
| 616 | |||
| 617 | /* =========================================================================== | ||
| 618 | Reads bytes from the compressed file until len-1 characters are | ||
| 619 | read, or a newline character is read and transferred to buf, or an | ||
| 620 | end-of-file condition is encountered. The string is then terminated | ||
| 621 | with a null character. | ||
| 622 | gzgets returns buf, or Z_NULL in case of error. | ||
| 623 | |||
| 624 | The current implementation is not optimized at all. | ||
| 625 | */ | ||
| 626 | char * ZEXPORT gzgets(file, buf, len) | ||
| 627 | gzFile file; | ||
| 628 | char *buf; | ||
| 629 | int len; | ||
| 630 | { | ||
| 631 | char *b = buf; | ||
| 632 | if (buf == Z_NULL || len <= 0) return Z_NULL; | ||
| 633 | |||
| 634 | while (--len > 0 && gzread(file, buf, 1) == 1 && *buf++ != '\n') ; | ||
| 635 | *buf = '\0'; | ||
| 636 | return b == buf && len > 0 ? Z_NULL : b; | ||
| 637 | } | ||
| 638 | |||
| 639 | |||
| 640 | #ifndef NO_GZCOMPRESS | ||
| 641 | /* =========================================================================== | ||
| 642 | Writes the given number of uncompressed bytes into the compressed file. | ||
| 643 | gzwrite returns the number of bytes actually written (0 in case of error). | ||
| 644 | */ | ||
| 645 | int ZEXPORT gzwrite (file, buf, len) | ||
| 646 | gzFile file; | ||
| 647 | voidpc buf; | ||
| 648 | unsigned len; | ||
| 649 | { | ||
| 650 | gz_stream *s = (gz_stream*)file; | ||
| 651 | |||
| 652 | if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR; | ||
| 653 | |||
| 654 | s->stream.next_in = (Bytef*)buf; | ||
| 655 | s->stream.avail_in = len; | ||
| 656 | |||
| 657 | while (s->stream.avail_in != 0) { | ||
| 658 | |||
| 659 | if (s->stream.avail_out == 0) { | ||
| 660 | |||
| 661 | s->stream.next_out = s->outbuf; | ||
| 662 | if (fwrite(s->outbuf, 1, Z_BUFSIZE, s->file) != Z_BUFSIZE) { | ||
| 663 | s->z_err = Z_ERRNO; | ||
| 664 | break; | ||
| 665 | } | ||
| 666 | s->stream.avail_out = Z_BUFSIZE; | ||
| 667 | } | ||
| 668 | s->in += s->stream.avail_in; | ||
| 669 | s->out += s->stream.avail_out; | ||
| 670 | s->z_err = deflate(&(s->stream), Z_NO_FLUSH); | ||
| 671 | s->in -= s->stream.avail_in; | ||
| 672 | s->out -= s->stream.avail_out; | ||
| 673 | if (s->z_err != Z_OK) break; | ||
| 674 | } | ||
| 675 | s->crc = crc32(s->crc, (const Bytef *)buf, len); | ||
| 676 | |||
| 677 | return (int)(len - s->stream.avail_in); | ||
| 678 | } | ||
| 679 | |||
| 680 | |||
| 681 | /* =========================================================================== | ||
| 682 | Converts, formats, and writes the args to the compressed file under | ||
| 683 | control of the format string, as in fprintf. gzprintf returns the number of | ||
| 684 | uncompressed bytes actually written (0 in case of error). | ||
| 685 | */ | ||
| 686 | #ifdef STDC | ||
| 687 | #include <stdarg.h> | ||
| 688 | |||
| 689 | int ZEXPORTVA gzprintf (gzFile file, const char *format, /* args */ ...) | ||
| 690 | { | ||
| 691 | char buf[Z_PRINTF_BUFSIZE]; | ||
| 692 | va_list va; | ||
| 693 | int len; | ||
| 694 | |||
| 695 | buf[sizeof(buf) - 1] = 0; | ||
| 696 | va_start(va, format); | ||
| 697 | #ifdef NO_vsnprintf | ||
| 698 | # ifdef HAS_vsprintf_void | ||
| 699 | (void)vsprintf(buf, format, va); | ||
| 700 | va_end(va); | ||
| 701 | for (len = 0; len < sizeof(buf); len++) | ||
| 702 | if (buf[len] == 0) break; | ||
| 703 | # else | ||
| 704 | len = vsprintf(buf, format, va); | ||
| 705 | va_end(va); | ||
| 706 | # endif | ||
| 707 | #else | ||
| 708 | # ifdef HAS_vsnprintf_void | ||
| 709 | (void)vsnprintf(buf, sizeof(buf), format, va); | ||
| 710 | va_end(va); | ||
| 711 | len = strlen(buf); | ||
| 712 | # else | ||
| 713 | len = vsnprintf(buf, sizeof(buf), format, va); | ||
| 714 | va_end(va); | ||
| 715 | # endif | ||
| 716 | #endif | ||
| 717 | if (len <= 0 || len >= (int)sizeof(buf) || buf[sizeof(buf) - 1] != 0) | ||
| 718 | return 0; | ||
| 719 | return gzwrite(file, buf, (unsigned)len); | ||
| 720 | } | ||
| 721 | #else /* not ANSI C */ | ||
| 722 | |||
| 723 | int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, | ||
| 724 | a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) | ||
| 725 | gzFile file; | ||
| 726 | const char *format; | ||
| 727 | int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, | ||
| 728 | a11, a12, a13, a14, a15, a16, a17, a18, a19, a20; | ||
| 729 | { | ||
| 730 | char buf[Z_PRINTF_BUFSIZE]; | ||
| 731 | int len; | ||
| 732 | |||
| 733 | buf[sizeof(buf) - 1] = 0; | ||
| 734 | #ifdef NO_snprintf | ||
| 735 | # ifdef HAS_sprintf_void | ||
| 736 | sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8, | ||
| 737 | a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); | ||
| 738 | for (len = 0; len < sizeof(buf); len++) | ||
| 739 | if (buf[len] == 0) break; | ||
| 740 | # else | ||
| 741 | len = sprintf(buf, format, a1, a2, a3, a4, a5, a6, a7, a8, | ||
| 742 | a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); | ||
| 743 | # endif | ||
| 744 | #else | ||
| 745 | # ifdef HAS_snprintf_void | ||
| 746 | snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8, | ||
| 747 | a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); | ||
| 748 | len = strlen(buf); | ||
| 749 | # else | ||
| 750 | len = snprintf(buf, sizeof(buf), format, a1, a2, a3, a4, a5, a6, a7, a8, | ||
| 751 | a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); | ||
| 752 | # endif | ||
| 753 | #endif | ||
| 754 | if (len <= 0 || len >= sizeof(buf) || buf[sizeof(buf) - 1] != 0) | ||
| 755 | return 0; | ||
| 756 | return gzwrite(file, buf, len); | ||
| 757 | } | ||
| 758 | #endif | ||
| 759 | |||
| 760 | /* =========================================================================== | ||
| 761 | Writes c, converted to an unsigned char, into the compressed file. | ||
| 762 | gzputc returns the value that was written, or -1 in case of error. | ||
| 763 | */ | ||
| 764 | int ZEXPORT gzputc(file, c) | ||
| 765 | gzFile file; | ||
| 766 | int c; | ||
| 767 | { | ||
| 768 | unsigned char cc = (unsigned char) c; /* required for big endian systems */ | ||
| 769 | |||
| 770 | return gzwrite(file, &cc, 1) == 1 ? (int)cc : -1; | ||
| 771 | } | ||
| 772 | |||
| 773 | |||
| 774 | /* =========================================================================== | ||
| 775 | Writes the given null-terminated string to the compressed file, excluding | ||
| 776 | the terminating null character. | ||
| 777 | gzputs returns the number of characters written, or -1 in case of error. | ||
| 778 | */ | ||
| 779 | int ZEXPORT gzputs(file, s) | ||
| 780 | gzFile file; | ||
| 781 | const char *s; | ||
| 782 | { | ||
| 783 | return gzwrite(file, (char*)s, (unsigned)strlen(s)); | ||
| 784 | } | ||
| 785 | |||
| 786 | |||
| 787 | /* =========================================================================== | ||
| 788 | Flushes all pending output into the compressed file. The parameter | ||
| 789 | flush is as in the deflate() function. | ||
| 790 | */ | ||
| 791 | local int do_flush (file, flush) | ||
| 792 | gzFile file; | ||
| 793 | int flush; | ||
| 794 | { | ||
| 795 | uInt len; | ||
| 796 | int done = 0; | ||
| 797 | gz_stream *s = (gz_stream*)file; | ||
| 798 | |||
| 799 | if (s == NULL || s->mode != 'w') return Z_STREAM_ERROR; | ||
| 800 | |||
| 801 | s->stream.avail_in = 0; /* should be zero already anyway */ | ||
| 802 | |||
| 803 | for (;;) { | ||
| 804 | len = Z_BUFSIZE - s->stream.avail_out; | ||
| 805 | |||
| 806 | if (len != 0) { | ||
| 807 | if ((uInt)fwrite(s->outbuf, 1, len, s->file) != len) { | ||
| 808 | s->z_err = Z_ERRNO; | ||
| 809 | return Z_ERRNO; | ||
| 810 | } | ||
| 811 | s->stream.next_out = s->outbuf; | ||
| 812 | s->stream.avail_out = Z_BUFSIZE; | ||
| 813 | } | ||
| 814 | if (done) break; | ||
| 815 | s->out += s->stream.avail_out; | ||
| 816 | s->z_err = deflate(&(s->stream), flush); | ||
| 817 | s->out -= s->stream.avail_out; | ||
| 818 | |||
| 819 | /* Ignore the second of two consecutive flushes: */ | ||
| 820 | if (len == 0 && s->z_err == Z_BUF_ERROR) s->z_err = Z_OK; | ||
| 821 | |||
| 822 | /* deflate has finished flushing only when it hasn't used up | ||
| 823 | * all the available space in the output buffer: | ||
| 824 | */ | ||
| 825 | done = (s->stream.avail_out != 0 || s->z_err == Z_STREAM_END); | ||
| 826 | |||
| 827 | if (s->z_err != Z_OK && s->z_err != Z_STREAM_END) break; | ||
| 828 | } | ||
| 829 | return s->z_err == Z_STREAM_END ? Z_OK : s->z_err; | ||
| 830 | } | ||
| 831 | |||
| 832 | int ZEXPORT gzflush (file, flush) | ||
| 833 | gzFile file; | ||
| 834 | int flush; | ||
| 835 | { | ||
| 836 | gz_stream *s = (gz_stream*)file; | ||
| 837 | int err = do_flush (file, flush); | ||
| 838 | |||
| 839 | if (err) return err; | ||
| 840 | fflush(s->file); | ||
| 841 | return s->z_err == Z_STREAM_END ? Z_OK : s->z_err; | ||
| 842 | } | ||
| 843 | #endif /* NO_GZCOMPRESS */ | ||
| 844 | |||
| 845 | /* =========================================================================== | ||
| 846 | Sets the starting position for the next gzread or gzwrite on the given | ||
| 847 | compressed file. The offset represents a number of bytes in the | ||
| 848 | gzseek returns the resulting offset location as measured in bytes from | ||
| 849 | the beginning of the uncompressed stream, or -1 in case of error. | ||
| 850 | SEEK_END is not implemented, returns error. | ||
| 851 | In this version of the library, gzseek can be extremely slow. | ||
| 852 | */ | ||
| 853 | local z_off64_t gz_seek (file, offset, whence, use64) | ||
| 854 | gzFile file; | ||
| 855 | z_off64_t offset; | ||
| 856 | int whence; | ||
| 857 | int use64; | ||
| 858 | { | ||
| 859 | gz_stream *s = (gz_stream*)file; | ||
| 860 | |||
| 861 | if (s == NULL || whence == SEEK_END || | ||
| 862 | s->z_err == Z_ERRNO || s->z_err == Z_DATA_ERROR) { | ||
| 863 | return -1L; | ||
| 864 | } | ||
| 865 | |||
| 866 | if (s->mode == 'w') { | ||
| 867 | #ifdef NO_GZCOMPRESS | ||
| 868 | return -1L; | ||
| 869 | #else | ||
| 870 | if (whence == SEEK_SET) { | ||
| 871 | offset -= s->in; | ||
| 872 | } | ||
| 873 | if (offset < 0) return -1L; | ||
| 874 | |||
| 875 | /* At this point, offset is the number of zero bytes to write. */ | ||
| 876 | if (s->inbuf == Z_NULL) { | ||
| 877 | s->inbuf = (Byte*)ALLOC(Z_BUFSIZE); /* for seeking */ | ||
| 878 | if (s->inbuf == Z_NULL) return -1L; | ||
| 879 | zmemzero(s->inbuf, Z_BUFSIZE); | ||
| 880 | } | ||
| 881 | while (offset > 0) { | ||
| 882 | uInt size = Z_BUFSIZE; | ||
| 883 | if (offset < Z_BUFSIZE) size = (uInt)offset; | ||
| 884 | |||
| 885 | size = gzwrite(file, s->inbuf, size); | ||
| 886 | if (size == 0) return -1L; | ||
| 887 | |||
| 888 | offset -= size; | ||
| 889 | } | ||
| 890 | return s->in; | ||
| 891 | #endif | ||
| 892 | } | ||
| 893 | /* Rest of function is for reading only */ | ||
| 894 | |||
| 895 | /* compute absolute position */ | ||
| 896 | if (whence == SEEK_CUR) { | ||
| 897 | offset += s->out; | ||
| 898 | } | ||
| 899 | if (offset < 0) return -1L; | ||
| 900 | |||
| 901 | if (s->transparent) { | ||
| 902 | /* map to fseek */ | ||
| 903 | s->back = EOF; | ||
| 904 | s->stream.avail_in = 0; | ||
| 905 | s->stream.next_in = s->inbuf; | ||
| 906 | #ifdef _LARGEFILE64_SOURCE | ||
| 907 | if ((use64 ? fseeko64(s->file, offset, SEEK_SET) : | ||
| 908 | FSEEK(s->file, offset, SEEK_SET)) < 0) | ||
| 909 | return -1L; | ||
| 910 | #else | ||
| 911 | if (FSEEK(s->file, offset, SEEK_SET) < 0) return -1L; | ||
| 912 | #endif | ||
| 913 | |||
| 914 | s->in = s->out = offset; | ||
| 915 | return offset; | ||
| 916 | } | ||
| 917 | |||
| 918 | /* For a negative seek, rewind and use positive seek */ | ||
| 919 | if (offset >= s->out) { | ||
| 920 | offset -= s->out; | ||
| 921 | } else if (gzrewind(file) < 0) { | ||
| 922 | return -1L; | ||
| 923 | } | ||
| 924 | /* offset is now the number of bytes to skip. */ | ||
| 925 | |||
| 926 | if (offset != 0 && s->outbuf == Z_NULL) { | ||
| 927 | s->outbuf = (Byte*)ALLOC(Z_BUFSIZE); | ||
| 928 | if (s->outbuf == Z_NULL) return -1L; | ||
| 929 | } | ||
| 930 | if (offset && s->back != EOF) { | ||
| 931 | s->back = EOF; | ||
| 932 | s->out++; | ||
| 933 | offset--; | ||
| 934 | if (s->last) s->z_err = Z_STREAM_END; | ||
| 935 | } | ||
| 936 | while (offset > 0) { | ||
| 937 | int size = Z_BUFSIZE; | ||
| 938 | if (offset < Z_BUFSIZE) size = (int)offset; | ||
| 939 | |||
| 940 | size = gzread(file, s->outbuf, (uInt)size); | ||
| 941 | if (size <= 0) return -1L; | ||
| 942 | offset -= size; | ||
| 943 | } | ||
| 944 | return s->out; | ||
| 945 | } | ||
| 946 | |||
| 947 | /* =========================================================================== | ||
| 948 | Define external functions gzseek() and gzseek64() using local gz_seek(). | ||
| 949 | */ | ||
| 950 | z_off_t ZEXPORT gzseek (file, offset, whence) | ||
| 951 | gzFile file; | ||
| 952 | z_off_t offset; | ||
| 953 | int whence; | ||
| 954 | { | ||
| 955 | return (z_off_t)gz_seek(file, offset, whence, 0); | ||
| 956 | } | ||
| 957 | |||
| 958 | z_off64_t ZEXPORT gzseek64 (file, offset, whence) | ||
| 959 | gzFile file; | ||
| 960 | z_off64_t offset; | ||
| 961 | int whence; | ||
| 962 | { | ||
| 963 | #ifdef _LARGEFILE64_SOURCE | ||
| 964 | return gz_seek(file, offset, whence, 1); | ||
| 965 | #else | ||
| 966 | return gz_seek(file, offset, whence, 0); | ||
| 967 | #endif | ||
| 968 | } | ||
| 969 | |||
| 970 | /* =========================================================================== | ||
| 971 | Rewinds input file. | ||
| 972 | */ | ||
| 973 | int ZEXPORT gzrewind (file) | ||
| 974 | gzFile file; | ||
| 975 | { | ||
| 976 | gz_stream *s = (gz_stream*)file; | ||
| 977 | |||
| 978 | if (s == NULL || s->mode != 'r') return -1; | ||
| 979 | |||
| 980 | s->z_err = Z_OK; | ||
| 981 | s->z_eof = 0; | ||
| 982 | s->back = EOF; | ||
| 983 | s->stream.avail_in = 0; | ||
| 984 | s->stream.next_in = s->inbuf; | ||
| 985 | s->crc = crc32(0L, Z_NULL, 0); | ||
| 986 | if (!s->transparent) (void)inflateReset(&s->stream); | ||
| 987 | s->in = 0; | ||
| 988 | s->out = 0; | ||
| 989 | return FSEEK(s->file, s->start, SEEK_SET); | ||
| 990 | } | ||
| 991 | |||
| 992 | /* =========================================================================== | ||
| 993 | Returns the starting position for the next gzread or gzwrite on the | ||
| 994 | given compressed file. This position represents a number of bytes in the | ||
| 995 | uncompressed data stream. | ||
| 996 | */ | ||
| 997 | z_off_t ZEXPORT gztell (file) | ||
| 998 | gzFile file; | ||
| 999 | { | ||
| 1000 | return gzseek(file, 0L, SEEK_CUR); | ||
| 1001 | } | ||
| 1002 | |||
| 1003 | /* =========================================================================== | ||
| 1004 | 64-bit version | ||
| 1005 | */ | ||
| 1006 | z_off64_t ZEXPORT gztell64 (file) | ||
| 1007 | gzFile file; | ||
| 1008 | { | ||
| 1009 | return gzseek64(file, 0L, SEEK_CUR); | ||
| 1010 | } | ||
| 1011 | |||
| 1012 | /* =========================================================================== | ||
| 1013 | Returns 1 when EOF has previously been detected reading the given | ||
| 1014 | input stream, otherwise zero. | ||
| 1015 | */ | ||
| 1016 | int ZEXPORT gzeof (file) | ||
| 1017 | gzFile file; | ||
| 1018 | { | ||
| 1019 | gz_stream *s = (gz_stream*)file; | ||
| 1020 | |||
| 1021 | /* With concatenated compressed files that can have embedded | ||
| 1022 | * crc trailers, z_eof is no longer the only/best indicator of EOF | ||
| 1023 | * on a gz_stream. Handle end-of-stream error explicitly here. | ||
| 1024 | */ | ||
| 1025 | if (s == NULL || s->mode != 'r') return 0; | ||
| 1026 | if (s->z_eof) return 1; | ||
| 1027 | return s->z_err == Z_STREAM_END; | ||
| 1028 | } | ||
| 1029 | |||
| 1030 | /* =========================================================================== | ||
| 1031 | Returns 1 if reading and doing so transparently, otherwise zero. | ||
| 1032 | */ | ||
| 1033 | int ZEXPORT gzdirect (file) | ||
| 1034 | gzFile file; | ||
| 1035 | { | ||
| 1036 | gz_stream *s = (gz_stream*)file; | ||
| 1037 | |||
| 1038 | if (s == NULL || s->mode != 'r') return 0; | ||
| 1039 | return s->transparent; | ||
| 1040 | } | ||
| 1041 | |||
| 1042 | /* =========================================================================== | ||
| 1043 | Outputs a long in LSB order to the given file | ||
| 1044 | */ | ||
| 1045 | local void putLong (file, x) | ||
| 1046 | FILE *file; | ||
| 1047 | uLong x; | ||
| 1048 | { | ||
| 1049 | int n; | ||
| 1050 | for (n = 0; n < 4; n++) { | ||
| 1051 | fputc((int)(x & 0xff), file); | ||
| 1052 | x >>= 8; | ||
| 1053 | } | ||
| 1054 | } | ||
| 1055 | |||
| 1056 | /* =========================================================================== | ||
| 1057 | Reads a long in LSB order from the given gz_stream. Sets z_err in case | ||
| 1058 | of error. | ||
| 1059 | */ | ||
| 1060 | local uLong getLong (s) | ||
| 1061 | gz_stream *s; | ||
| 1062 | { | ||
| 1063 | uLong x = (uLong)get_byte(s); | ||
| 1064 | int c; | ||
| 1065 | |||
| 1066 | x += ((uLong)get_byte(s))<<8; | ||
| 1067 | x += ((uLong)get_byte(s))<<16; | ||
| 1068 | c = get_byte(s); | ||
| 1069 | if (c == EOF) s->z_err = Z_DATA_ERROR; | ||
| 1070 | x += ((uLong)c)<<24; | ||
| 1071 | return x; | ||
| 1072 | } | ||
| 1073 | |||
| 1074 | /* =========================================================================== | ||
| 1075 | Flushes all pending output if necessary, closes the compressed file | ||
| 1076 | and deallocates all the (de)compression state. | ||
| 1077 | */ | ||
| 1078 | int ZEXPORT gzclose (file) | ||
| 1079 | gzFile file; | ||
| 1080 | { | ||
| 1081 | gz_stream *s = (gz_stream*)file; | ||
| 1082 | |||
| 1083 | if (s == NULL) return Z_STREAM_ERROR; | ||
| 1084 | |||
| 1085 | if (s->mode == 'w') { | ||
| 1086 | #ifdef NO_GZCOMPRESS | ||
| 1087 | return Z_STREAM_ERROR; | ||
| 1088 | #else | ||
| 1089 | if (do_flush (file, Z_FINISH) != Z_OK) | ||
| 1090 | return destroy((gz_stream*)file); | ||
| 1091 | |||
| 1092 | putLong (s->file, s->crc); | ||
| 1093 | putLong (s->file, (uLong)(s->in & 0xffffffff)); | ||
| 1094 | #endif | ||
| 1095 | } | ||
| 1096 | return destroy((gz_stream*)file); | ||
| 1097 | } | ||
| 1098 | |||
| 1099 | #if defined UNDER_CE && defined NO_ERRNO_H | ||
| 1100 | # define zstrerror(errnum) strwinerror((DWORD)errnum) | ||
| 1101 | #else | ||
| 1102 | # if defined (STDC) | ||
| 1103 | # define zstrerror(errnum) strerror(errnum) | ||
| 1104 | # else | ||
| 1105 | # define zstrerror(errnum) "" | ||
| 1106 | # endif | ||
| 1107 | #endif | ||
| 1108 | |||
| 1109 | /* =========================================================================== | ||
| 1110 | Returns the error message for the last error which occurred on the | ||
| 1111 | given compressed file. errnum is set to zlib error number. If an | ||
| 1112 | error occurred in the file system and not in the compression library, | ||
| 1113 | errnum is set to Z_ERRNO and the application may consult errno | ||
| 1114 | to get the exact error code. | ||
| 1115 | */ | ||
| 1116 | const char * ZEXPORT gzerror (file, errnum) | ||
| 1117 | gzFile file; | ||
| 1118 | int *errnum; | ||
| 1119 | { | ||
| 1120 | char *m; | ||
| 1121 | gz_stream *s = (gz_stream*)file; | ||
| 1122 | |||
| 1123 | if (s == NULL) { | ||
| 1124 | *errnum = Z_STREAM_ERROR; | ||
| 1125 | return (const char*)ERR_MSG(Z_STREAM_ERROR); | ||
| 1126 | } | ||
| 1127 | *errnum = s->z_err; | ||
| 1128 | if (*errnum == Z_OK) return (const char*)""; | ||
| 1129 | |||
| 1130 | m = (char*)(*errnum == Z_ERRNO ? zstrerror(zerrno()) : s->stream.msg); | ||
| 1131 | |||
| 1132 | if (m == NULL || *m == '\0') m = (char*)ERR_MSG(s->z_err); | ||
| 1133 | |||
| 1134 | TRYFREE(s->msg); | ||
| 1135 | s->msg = (char*)ALLOC(strlen(s->path) + strlen(m) + 3); | ||
| 1136 | if (s->msg == Z_NULL) return (const char*)ERR_MSG(Z_MEM_ERROR); | ||
| 1137 | strcpy(s->msg, s->path); | ||
| 1138 | strcat(s->msg, ": "); | ||
| 1139 | strcat(s->msg, m); | ||
| 1140 | return (const char*)s->msg; | ||
| 1141 | } | ||
| 1142 | |||
| 1143 | /* =========================================================================== | ||
| 1144 | Clear the error and end-of-file flags, and do the same for the real file. | ||
| 1145 | */ | ||
| 1146 | void ZEXPORT gzclearerr (file) | ||
| 1147 | gzFile file; | ||
| 1148 | { | ||
| 1149 | gz_stream *s = (gz_stream*)file; | ||
| 1150 | |||
| 1151 | if (s == NULL) return; | ||
| 1152 | if (s->z_err != Z_STREAM_END) s->z_err = Z_OK; | ||
| 1153 | s->z_eof = 0; | ||
| 1154 | clearerr(s->file); | ||
| 1155 | } | ||
| 1156 | |||
| 1157 | /* new functions in gzlib, but only partially implemented here */ | ||
| 1158 | |||
| 1159 | int ZEXPORT gzbuffer (file, size) | ||
| 1160 | gzFile file; | ||
| 1161 | unsigned size; | ||
| 1162 | { | ||
| 1163 | return -1; | ||
| 1164 | } | ||
| 1165 | |||
| 1166 | z_off_t ZEXPORT gzoffset (file) | ||
| 1167 | gzFile file; | ||
| 1168 | { | ||
| 1169 | return -1; | ||
| 1170 | } | ||
| 1171 | |||
| 1172 | z_off64_t ZEXPORT gzoffset64 (file) | ||
| 1173 | gzFile file; | ||
| 1174 | { | ||
| 1175 | return -1; | ||
| 1176 | } | ||
| 1177 | |||
| 1178 | int ZEXPORT gzclose_r (file) | ||
| 1179 | gzFile file; | ||
| 1180 | { | ||
| 1181 | return gzclose(file); | ||
| 1182 | } | ||
| 1183 | |||
| 1184 | int ZEXPORT gzclose_w (file) | ||
| 1185 | gzFile file; | ||
| 1186 | { | ||
| 1187 | return gzclose(file); | ||
| 1188 | } | ||
| 1189 | |||
| 1190 | int gzio_old = 1; | ||
| 1191 | |||
| 1192 | #else /* !OLD_GZIO */ | ||
| 1193 | |||
| 1194 | int gzio_old = 0; | ||
| 1195 | |||
| 1196 | #endif /* OLD_GZIO */ | ||
| @@ -3,8 +3,6 @@ | |||
| 3 | * For conditions of distribution and use, see copyright notice in zlib.h | 3 | * For conditions of distribution and use, see copyright notice in zlib.h |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #ifndef OLD_GZIO | ||
| 7 | |||
| 8 | #include "gzguts.h" | 6 | #include "gzguts.h" |
| 9 | 7 | ||
| 10 | #ifdef _LARGEFILE64_SOURCE | 8 | #ifdef _LARGEFILE64_SOURCE |
| @@ -214,16 +212,15 @@ gzFile ZEXPORT gzdopen(fd, mode) | |||
| 214 | int fd; | 212 | int fd; |
| 215 | const char *mode; | 213 | const char *mode; |
| 216 | { | 214 | { |
| 217 | char path[46]; /* identifier for error messages */ | 215 | char *path; /* identifier for error messages */ |
| 216 | gzFile gz; | ||
| 218 | 217 | ||
| 219 | if (fd == -1) | 218 | if (fd == -1 || (path = malloc(7 + 3 * sizeof(int))) == NULL) |
| 220 | return NULL; | 219 | return NULL; |
| 221 | #ifdef NO_snprintf | 220 | sprintf(path, "<fd:%d>", fd); |
| 222 | sprintf(path, "<fd:%d>", fd); /* big enough for 128-bit integers */ | 221 | gz = gz_open(path, fd, mode); |
| 223 | #else | 222 | free(path); |
| 224 | snprintf(path, sizeof(path), "<fd:%d>", fd); | 223 | return gz; |
| 225 | #endif | ||
| 226 | return gz_open(path, fd, mode); | ||
| 227 | } | 224 | } |
| 228 | 225 | ||
| 229 | /* -- see zlib.h -- */ | 226 | /* -- see zlib.h -- */ |
| @@ -301,6 +298,9 @@ z_off64_t ZEXPORT gzseek64(file, offset, whence) | |||
| 301 | /* normalize offset to a SEEK_CUR specification */ | 298 | /* normalize offset to a SEEK_CUR specification */ |
| 302 | if (whence == SEEK_SET) | 299 | if (whence == SEEK_SET) |
| 303 | offset -= state->pos; | 300 | offset -= state->pos; |
| 301 | else if (state->seek) | ||
| 302 | offset += state->skip; | ||
| 303 | state->seek = 0; | ||
| 304 | 304 | ||
| 305 | /* if within raw area while reading, just go there */ | 305 | /* if within raw area while reading, just go there */ |
| 306 | if (state->mode == GZ_READ && state->how == COPY && | 306 | if (state->mode == GZ_READ && state->how == COPY && |
| @@ -532,5 +532,3 @@ unsigned ZEXPORT gz_intmax() | |||
| 532 | return q >> 1; | 532 | return q >> 1; |
| 533 | } | 533 | } |
| 534 | #endif | 534 | #endif |
| 535 | |||
| 536 | #endif /* !OLD_GZIO */ | ||
| @@ -3,8 +3,6 @@ | |||
| 3 | * For conditions of distribution and use, see copyright notice in zlib.h | 3 | * For conditions of distribution and use, see copyright notice in zlib.h |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #ifndef OLD_GZIO | ||
| 7 | |||
| 8 | #include "gzguts.h" | 6 | #include "gzguts.h" |
| 9 | 7 | ||
| 10 | /* Local functions */ | 8 | /* Local functions */ |
| @@ -547,8 +545,8 @@ char * ZEXPORT gzgets(file, buf, len) | |||
| 547 | unsigned char *eol; | 545 | unsigned char *eol; |
| 548 | gz_statep state; | 546 | gz_statep state; |
| 549 | 547 | ||
| 550 | /* get internal structure */ | 548 | /* check parameters and get internal structure */ |
| 551 | if (file == NULL) | 549 | if (file == NULL || buf == NULL || len < 1) |
| 552 | return NULL; | 550 | return NULL; |
| 553 | state = (gz_statep)file; | 551 | state = (gz_statep)file; |
| 554 | 552 | ||
| @@ -563,16 +561,12 @@ char * ZEXPORT gzgets(file, buf, len) | |||
| 563 | return NULL; | 561 | return NULL; |
| 564 | } | 562 | } |
| 565 | 563 | ||
| 566 | /* check for a dumb length */ | ||
| 567 | if (len < 2) | ||
| 568 | return NULL; | ||
| 569 | |||
| 570 | /* copy output bytes up to new line or len - 1, whichever comes first -- | 564 | /* copy output bytes up to new line or len - 1, whichever comes first -- |
| 571 | append a terminating zero to the string (we don't check for a zero in | 565 | append a terminating zero to the string (we don't check for a zero in |
| 572 | the contents, let the user worry about that) */ | 566 | the contents, let the user worry about that) */ |
| 573 | str = buf; | 567 | str = buf; |
| 574 | left = (unsigned)len - 1; | 568 | left = (unsigned)len - 1; |
| 575 | do { | 569 | if (left) do { |
| 576 | /* assure that something is in the output buffer */ | 570 | /* assure that something is in the output buffer */ |
| 577 | if (state->have == 0) { | 571 | if (state->have == 0) { |
| 578 | if (gz_make(state) == -1) | 572 | if (gz_make(state) == -1) |
| @@ -588,7 +582,7 @@ char * ZEXPORT gzgets(file, buf, len) | |||
| 588 | n = state->have > left ? left : state->have; | 582 | n = state->have > left ? left : state->have; |
| 589 | eol = memchr(state->next, '\n', n); | 583 | eol = memchr(state->next, '\n', n); |
| 590 | if (eol != NULL) | 584 | if (eol != NULL) |
| 591 | n = (eol - state->next) + 1; | 585 | n = (unsigned)(eol - state->next) + 1; |
| 592 | 586 | ||
| 593 | /* copy through end-of-line, or remainder if not found */ | 587 | /* copy through end-of-line, or remainder if not found */ |
| 594 | memcpy(buf, state->next, n); | 588 | memcpy(buf, state->next, n); |
| @@ -655,5 +649,3 @@ int ZEXPORT gzclose_r(file) | |||
| 655 | free(state); | 649 | free(state); |
| 656 | return ret ? Z_ERRNO : Z_OK; | 650 | return ret ? Z_ERRNO : Z_OK; |
| 657 | } | 651 | } |
| 658 | |||
| 659 | #endif /* !OLD_GZIO */ | ||
| @@ -3,8 +3,6 @@ | |||
| 3 | * For conditions of distribution and use, see copyright notice in zlib.h | 3 | * For conditions of distribution and use, see copyright notice in zlib.h |
| 4 | */ | 4 | */ |
| 5 | 5 | ||
| 6 | #ifndef OLD_GZIO | ||
| 7 | |||
| 8 | #include "gzguts.h" | 6 | #include "gzguts.h" |
| 9 | 7 | ||
| 10 | /* Local functions */ | 8 | /* Local functions */ |
| @@ -77,7 +75,7 @@ local int gz_comp(state, flush) | |||
| 77 | doing Z_FINISH then don't write until we get to Z_STREAM_END */ | 75 | doing Z_FINISH then don't write until we get to Z_STREAM_END */ |
| 78 | if (strm->avail_out == 0 || (flush != Z_NO_FLUSH && | 76 | if (strm->avail_out == 0 || (flush != Z_NO_FLUSH && |
| 79 | (flush != Z_FINISH || ret == Z_STREAM_END))) { | 77 | (flush != Z_FINISH || ret == Z_STREAM_END))) { |
| 80 | have = strm->next_out - state->next; | 78 | have = (unsigned)(strm->next_out - state->next); |
| 81 | if (have && ((got = write(state->fd, state->next, have)) < 0 || | 79 | if (have && ((got = write(state->fd, state->next, have)) < 0 || |
| 82 | (unsigned)got != have)) { | 80 | (unsigned)got != have)) { |
| 83 | gz_error(state, Z_ERRNO, zstrerror()); | 81 | gz_error(state, Z_ERRNO, zstrerror()); |
| @@ -271,7 +269,7 @@ int ZEXPORT gzputs(file, str) | |||
| 271 | unsigned len; | 269 | unsigned len; |
| 272 | 270 | ||
| 273 | /* write string */ | 271 | /* write string */ |
| 274 | len = strlen(str); | 272 | len = (unsigned)strlen(str); |
| 275 | ret = gzwrite(file, str, len); | 273 | ret = gzwrite(file, str, len); |
| 276 | return ret == 0 && len != 0 ? -1 : ret; | 274 | return ret == 0 && len != 0 ? -1 : ret; |
| 277 | } | 275 | } |
| @@ -530,5 +528,3 @@ int ZEXPORT gzclose_w(file) | |||
| 530 | free(state); | 528 | free(state); |
| 531 | return ret ? Z_ERRNO : Z_OK; | 529 | return ret ? Z_ERRNO : Z_OK; |
| 532 | } | 530 | } |
| 533 | |||
| 534 | #endif /* !OLD_GZIO */ | ||
| @@ -9,7 +9,7 @@ | |||
| 9 | #define MAXBITS 15 | 9 | #define MAXBITS 15 |
| 10 | 10 | ||
| 11 | const char inflate_copyright[] = | 11 | const char inflate_copyright[] = |
| 12 | " inflate 1.2.3.8 Copyright 1995-2010 Mark Adler "; | 12 | " inflate 1.2.3.9 Copyright 1995-2010 Mark Adler "; |
| 13 | /* | 13 | /* |
| 14 | If you use the zlib library in a product, an acknowledgment is welcome | 14 | If you use the zlib library in a product, an acknowledgment is welcome |
| 15 | in the documentation of your product. If for some reason you cannot | 15 | in the documentation of your product. If for some reason you cannot |
| @@ -62,7 +62,7 @@ unsigned short FAR *work; | |||
| 62 | 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; | 62 | 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; |
| 63 | static const unsigned short lext[31] = { /* Length codes 257..285 extra */ | 63 | static const unsigned short lext[31] = { /* Length codes 257..285 extra */ |
| 64 | 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, | 64 | 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, |
| 65 | 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 78, 75}; | 65 | 19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 193, 201}; |
| 66 | static const unsigned short dbase[32] = { /* Distance codes 0..29 base */ | 66 | static const unsigned short dbase[32] = { /* Distance codes 0..29 base */ |
| 67 | 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, | 67 | 1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, |
| 68 | 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, | 68 | 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, |
diff --git a/make_vms.com b/make_vms.com index c7c309e..f35a48f 100644 --- a/make_vms.com +++ b/make_vms.com | |||
| @@ -146,8 +146,6 @@ $ CALL MAKE deflate.OBJ "CC ''CCOPT' deflate" - | |||
| 146 | deflate.c deflate.h zutil.h zlib.h zconf.h | 146 | deflate.c deflate.h zutil.h zlib.h zconf.h |
| 147 | $ CALL MAKE gzclose.OBJ "CC ''CCOPT' gzclose" - | 147 | $ CALL MAKE gzclose.OBJ "CC ''CCOPT' gzclose" - |
| 148 | gzclose.c zutil.h zlib.h zconf.h | 148 | gzclose.c zutil.h zlib.h zconf.h |
| 149 | $ CALL MAKE gzio.OBJ "CC ''CCOPT' gzio" - | ||
| 150 | gzio.c zutil.h zlib.h zconf.h | ||
| 151 | $ CALL MAKE gzlib.OBJ "CC ''CCOPT' gzlib" - | 149 | $ CALL MAKE gzlib.OBJ "CC ''CCOPT' gzlib" - |
| 152 | gzlib.c zutil.h zlib.h zconf.h | 150 | gzlib.c zutil.h zlib.h zconf.h |
| 153 | $ CALL MAKE gzread.OBJ "CC ''CCOPT' gzread" - | 151 | $ CALL MAKE gzread.OBJ "CC ''CCOPT' gzread" - |
| @@ -396,7 +394,7 @@ $ deck | |||
| 396 | # written by Martin P.J. Zinser | 394 | # written by Martin P.J. Zinser |
| 397 | # <zinser@zinser.no-ip.info or zinser@sysdev.deutsche-boerse.com> | 395 | # <zinser@zinser.no-ip.info or zinser@sysdev.deutsche-boerse.com> |
| 398 | 396 | ||
| 399 | OBJS = adler32.obj, compress.obj, crc32.obj, gzclose.obj, gzio.obj, gzlib.obj\ | 397 | OBJS = adler32.obj, compress.obj, crc32.obj, gzclose.obj, gzlib.obj\ |
| 400 | gzread.obj, gzwrite.obj, uncompr.obj, infback.obj\ | 398 | gzread.obj, gzwrite.obj, uncompr.obj, infback.obj\ |
| 401 | deflate.obj, trees.obj, zutil.obj, inflate.obj, \ | 399 | deflate.obj, trees.obj, zutil.obj, inflate.obj, \ |
| 402 | inftrees.obj, inffast.obj | 400 | inftrees.obj, inffast.obj |
| @@ -430,7 +428,6 @@ crc32.obj : crc32.c zutil.h zlib.h zconf.h | |||
| 430 | deflate.obj : deflate.c deflate.h zutil.h zlib.h zconf.h | 428 | deflate.obj : deflate.c deflate.h zutil.h zlib.h zconf.h |
| 431 | example.obj : example.c zlib.h zconf.h | 429 | example.obj : example.c zlib.h zconf.h |
| 432 | gzclose.obj : gzclose.c zutil.h zlib.h zconf.h | 430 | gzclose.obj : gzclose.c zutil.h zlib.h zconf.h |
| 433 | gzio.obj : gzio.c zutil.h zlib.h zconf.h | ||
| 434 | gzlib.obj : gzlib.c zutil.h zlib.h zconf.h | 431 | gzlib.obj : gzlib.c zutil.h zlib.h zconf.h |
| 435 | gzread.obj : gzread.c zutil.h zlib.h zconf.h | 432 | gzread.obj : gzread.c zutil.h zlib.h zconf.h |
| 436 | gzwrite.obj : gzwrite.c zutil.h zlib.h zconf.h | 433 | gzwrite.obj : gzwrite.c zutil.h zlib.h zconf.h |
diff --git a/msdos/Makefile.bor b/msdos/Makefile.bor index 328f5a7..0c1b99c 100644 --- a/msdos/Makefile.bor +++ b/msdos/Makefile.bor | |||
| @@ -41,9 +41,9 @@ LDFLAGS=-m$(MODEL) -f- | |||
| 41 | # variables | 41 | # variables |
| 42 | ZLIB_LIB = zlib_$(MODEL).lib | 42 | ZLIB_LIB = zlib_$(MODEL).lib |
| 43 | 43 | ||
| 44 | OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzio.obj gzlib.obj gzread.obj | 44 | OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj |
| 45 | OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj | 45 | OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj |
| 46 | OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzio.obj+gzlib.obj+gzread.obj | 46 | OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj |
| 47 | OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj | 47 | OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj |
| 48 | 48 | ||
| 49 | 49 | ||
| @@ -63,8 +63,6 @@ deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h | |||
| 63 | 63 | ||
| 64 | gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h | 64 | gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h |
| 65 | 65 | ||
| 66 | gzio.obj: gzio.c zutil.h zlib.h zconf.h | ||
| 67 | |||
| 68 | gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h | 66 | gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h |
| 69 | 67 | ||
| 70 | gzread.obj: gzread.c zlib.h zconf.h gzguts.h | 68 | gzread.obj: gzread.c zlib.h zconf.h gzguts.h |
diff --git a/msdos/Makefile.dj2 b/msdos/Makefile.dj2 index 84fa1cf..29b0395 100644 --- a/msdos/Makefile.dj2 +++ b/msdos/Makefile.dj2 | |||
| @@ -51,7 +51,7 @@ AR=ar rcs | |||
| 51 | prefix=/usr/local | 51 | prefix=/usr/local |
| 52 | exec_prefix = $(prefix) | 52 | exec_prefix = $(prefix) |
| 53 | 53 | ||
| 54 | OBJS = adler32.o compress.o crc32.o gzclose.o gzio.o gzlib.o gzread.o gzwrite.o \ | 54 | OBJS = adler32.o compress.o crc32.o gzclose.o gzlib.o gzread.o gzwrite.o \ |
| 55 | uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o | 55 | uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o |
| 56 | 56 | ||
| 57 | OBJA = | 57 | OBJA = |
diff --git a/msdos/Makefile.emx b/msdos/Makefile.emx index 2d7b8b7..9c1b57a 100644 --- a/msdos/Makefile.emx +++ b/msdos/Makefile.emx | |||
| @@ -33,7 +33,7 @@ AR=ar rcs | |||
| 33 | prefix=/usr/local | 33 | prefix=/usr/local |
| 34 | exec_prefix = $(prefix) | 34 | exec_prefix = $(prefix) |
| 35 | 35 | ||
| 36 | OBJS = adler32.o compress.o crc32.o gzclose.o gzio.o gzlib.o gzread.o gzwrite.o \ | 36 | OBJS = adler32.o compress.o crc32.o gzclose.o gzlib.o gzread.o gzwrite.o \ |
| 37 | uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o | 37 | uncompr.o deflate.o trees.o zutil.o inflate.o infback.o inftrees.o inffast.o |
| 38 | 38 | ||
| 39 | TEST_OBJS = example.o minigzip.o | 39 | TEST_OBJS = example.o minigzip.o |
diff --git a/msdos/Makefile.msc b/msdos/Makefile.msc index c108d47..cd2816f 100644 --- a/msdos/Makefile.msc +++ b/msdos/Makefile.msc | |||
| @@ -37,7 +37,7 @@ LDFLAGS=/noi/e/st:0x1500/noe/farcall/packcode | |||
| 37 | # variables | 37 | # variables |
| 38 | ZLIB_LIB = zlib_$(MODEL).lib | 38 | ZLIB_LIB = zlib_$(MODEL).lib |
| 39 | 39 | ||
| 40 | OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzio.obj gzlib.obj gzread.obj | 40 | OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj |
| 41 | OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj | 41 | OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj |
| 42 | 42 | ||
| 43 | 43 | ||
| @@ -57,8 +57,6 @@ deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h | |||
| 57 | 57 | ||
| 58 | gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h | 58 | gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h |
| 59 | 59 | ||
| 60 | gzio.obj: gzio.c zutil.h zlib.h zconf.h | ||
| 61 | |||
| 62 | gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h | 60 | gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h |
| 63 | 61 | ||
| 64 | gzread.obj: gzread.c zlib.h zconf.h gzguts.h | 62 | gzread.obj: gzread.c zlib.h zconf.h gzguts.h |
diff --git a/msdos/Makefile.tc b/msdos/Makefile.tc index b14fd0b..bcd0d18 100644 --- a/msdos/Makefile.tc +++ b/msdos/Makefile.tc | |||
| @@ -26,9 +26,9 @@ LDFLAGS=-m$(MODEL) -f- | |||
| 26 | # variables | 26 | # variables |
| 27 | ZLIB_LIB = zlib_$(MODEL).lib | 27 | ZLIB_LIB = zlib_$(MODEL).lib |
| 28 | 28 | ||
| 29 | OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzio.obj gzlib.obj gzread.obj | 29 | OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj |
| 30 | OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj | 30 | OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj |
| 31 | OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzio.obj+gzlib.obj+gzread.obj | 31 | OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj |
| 32 | OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj | 32 | OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj |
| 33 | 33 | ||
| 34 | 34 | ||
| @@ -48,8 +48,6 @@ deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h | |||
| 48 | 48 | ||
| 49 | gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h | 49 | gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h |
| 50 | 50 | ||
| 51 | gzio.obj: gzio.c zutil.h zlib.h zconf.h | ||
| 52 | |||
| 53 | gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h | 51 | gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h |
| 54 | 52 | ||
| 55 | gzread.obj: gzread.c zlib.h zconf.h gzguts.h | 53 | gzread.obj: gzread.c zlib.h zconf.h gzguts.h |
diff --git a/as400/bndsrc b/old/as400/bndsrc index 9cf94bb..9cf94bb 100644 --- a/as400/bndsrc +++ b/old/as400/bndsrc | |||
diff --git a/as400/compile.clp b/old/as400/compile.clp index 8554951..8554951 100644 --- a/as400/compile.clp +++ b/old/as400/compile.clp | |||
diff --git a/as400/readme.txt b/old/as400/readme.txt index beae13f..beae13f 100644 --- a/as400/readme.txt +++ b/old/as400/readme.txt | |||
diff --git a/as400/zlib.inc b/old/as400/zlib.inc index b5e673b..a9a4f5c 100644 --- a/as400/zlib.inc +++ b/old/as400/zlib.inc | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | * ZLIB.INC - Interface to the general purpose compression library | 1 | * ZLIB.INC - Interface to the general purpose compression library |
| 2 | * | 2 | * |
| 3 | * ILE RPG400 version by Patrick Monnerat, DATASPHERE. | 3 | * ILE RPG400 version by Patrick Monnerat, DATASPHERE. |
| 4 | * Version 1.2.3.8 | 4 | * Version 1.2.3.9 |
| 5 | * | 5 | * |
| 6 | * | 6 | * |
| 7 | * WARNING: | 7 | * WARNING: |
| @@ -22,8 +22,8 @@ | |||
| 22 | * | 22 | * |
| 23 | * Versioning information. | 23 | * Versioning information. |
| 24 | * | 24 | * |
| 25 | D ZLIB_VERSION C '1.2.3.8' | 25 | D ZLIB_VERSION C '1.2.3.9' |
| 26 | D ZLIB_VERNUM C X'1238' | 26 | D ZLIB_VERNUM C X'1239' |
| 27 | * | 27 | * |
| 28 | * Other equates. | 28 | * Other equates. |
| 29 | * | 29 | * |
diff --git a/projects/visualc6/zlib.dsp b/projects/visualc6/zlib.dsp index d8b3dff..00f54ea 100644 --- a/projects/visualc6/zlib.dsp +++ b/projects/visualc6/zlib.dsp | |||
| @@ -302,10 +302,6 @@ SOURCE=..\..\gzclose.c | |||
| 302 | # End Source File | 302 | # End Source File |
| 303 | # Begin Source File | 303 | # Begin Source File |
| 304 | 304 | ||
| 305 | SOURCE=..\..\gzio.c | ||
| 306 | # End Source File | ||
| 307 | # Begin Source File | ||
| 308 | |||
| 309 | SOURCE=..\..\gzlib.c | 305 | SOURCE=..\..\gzlib.c |
| 310 | # End Source File | 306 | # End Source File |
| 311 | # Begin Source File | 307 | # Begin Source File |
diff --git a/qnx/package.qpg b/qnx/package.qpg index e805463..fea73cc 100644 --- a/qnx/package.qpg +++ b/qnx/package.qpg | |||
| @@ -25,10 +25,10 @@ | |||
| 25 | <QPG:Files> | 25 | <QPG:Files> |
| 26 | <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/> | 26 | <QPG:Add file="../zconf.h" install="/opt/include/" user="root:sys" permission="644"/> |
| 27 | <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/> | 27 | <QPG:Add file="../zlib.h" install="/opt/include/" user="root:sys" permission="644"/> |
| 28 | <QPG:Add file="../libz.so.1.2.3.8" install="/opt/lib/" user="root:bin" permission="644"/> | 28 | <QPG:Add file="../libz.so.1.2.3.9" install="/opt/lib/" user="root:bin" permission="644"/> |
| 29 | <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.3.8"/> | 29 | <QPG:Add file="libz.so" install="/opt/lib/" component="dev" filetype="symlink" linkto="libz.so.1.2.3.9"/> |
| 30 | <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.3.6"/> | 30 | <QPG:Add file="libz.so.1" install="/opt/lib/" filetype="symlink" linkto="libz.so.1.2.3.9"/> |
| 31 | <QPG:Add file="../libz.so.1.2.3.8" install="/opt/lib/" component="slib"/> | 31 | <QPG:Add file="../libz.so.1.2.3.9" install="/opt/lib/" component="slib"/> |
| 32 | </QPG:Files> | 32 | </QPG:Files> |
| 33 | 33 | ||
| 34 | <QPG:PackageFilter> | 34 | <QPG:PackageFilter> |
| @@ -63,7 +63,7 @@ | |||
| 63 | </QPM:ProductDescription> | 63 | </QPM:ProductDescription> |
| 64 | 64 | ||
| 65 | <QPM:ReleaseDescription> | 65 | <QPM:ReleaseDescription> |
| 66 | <QPM:ReleaseVersion>1.2.3.8</QPM:ReleaseVersion> | 66 | <QPM:ReleaseVersion>1.2.3.9</QPM:ReleaseVersion> |
| 67 | <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency> | 67 | <QPM:ReleaseUrgency>Medium</QPM:ReleaseUrgency> |
| 68 | <QPM:ReleaseStability>Stable</QPM:ReleaseStability> | 68 | <QPM:ReleaseStability>Stable</QPM:ReleaseStability> |
| 69 | <QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor> | 69 | <QPM:ReleaseNoteMinor></QPM:ReleaseNoteMinor> |
diff --git a/treebuild.xml b/treebuild.xml index 3423e6b..f81b449 100644 --- a/treebuild.xml +++ b/treebuild.xml | |||
| @@ -28,11 +28,6 @@ | |||
| 28 | <depend name="zconf.h" /> | 28 | <depend name="zconf.h" /> |
| 29 | <depend name="gzguts.h" /> | 29 | <depend name="gzguts.h" /> |
| 30 | </source> | 30 | </source> |
| 31 | <source name="gzio.c"> | ||
| 32 | <depend name="zlib.h" /> | ||
| 33 | <depend name="zconf.h" /> | ||
| 34 | <depend name="zutil.h" /> | ||
| 35 | </source> | ||
| 36 | <source name="gzlib.c"> | 31 | <source name="gzlib.c"> |
| 37 | <depend name="zlib.h" /> | 32 | <depend name="zlib.h" /> |
| 38 | <depend name="zconf.h" /> | 33 | <depend name="zconf.h" /> |
diff --git a/watcom/watcom_f.mak b/watcom/watcom_f.mak index 273440a..37f4d74 100644 --- a/watcom/watcom_f.mak +++ b/watcom/watcom_f.mak | |||
| @@ -6,13 +6,13 @@ | |||
| 6 | 6 | ||
| 7 | C_SOURCE = adler32.c compress.c crc32.c deflate.c & | 7 | C_SOURCE = adler32.c compress.c crc32.c deflate.c & |
| 8 | gzclose.c gzlib.c gzread.c gzwrite.c & | 8 | gzclose.c gzlib.c gzread.c gzwrite.c & |
| 9 | gzio.c infback.c inffast.c inflate.c & | 9 | infback.c inffast.c inflate.c inftrees.c & |
| 10 | inftrees.c trees.c uncompr.c zutil.c | 10 | trees.c uncompr.c zutil.c |
| 11 | 11 | ||
| 12 | OBJS = adler32.obj compress.obj crc32.obj deflate.obj & | 12 | OBJS = adler32.obj compress.obj crc32.obj deflate.obj & |
| 13 | gzclose.obj gzlib.obj gzread.obj gzwrite.obj & | 13 | gzclose.obj gzlib.obj gzread.obj gzwrite.obj & |
| 14 | gzio.obj infback.obj inffast.obj inflate.obj & | 14 | infback.obj inffast.obj inflate.obj inftrees.obj & |
| 15 | inftrees.obj trees.obj uncompr.obj zutil.obj | 15 | trees.obj uncompr.obj zutil.obj |
| 16 | 16 | ||
| 17 | CC = wcc386 | 17 | CC = wcc386 |
| 18 | LINKER = wcl386 | 18 | LINKER = wcl386 |
| @@ -27,7 +27,7 @@ all: $(ZLIB_LIB) example.exe minigzip.exe | |||
| 27 | $(ZLIB_LIB): $(OBJS) | 27 | $(ZLIB_LIB): $(OBJS) |
| 28 | wlib -b -c $(ZLIB_LIB) -+adler32.obj -+compress.obj -+crc32.obj | 28 | wlib -b -c $(ZLIB_LIB) -+adler32.obj -+compress.obj -+crc32.obj |
| 29 | wlib -b -c $(ZLIB_LIB) -+gzclose.obj -+gzlib.obj -+gzread.obj -+gzwrite.obj | 29 | wlib -b -c $(ZLIB_LIB) -+gzclose.obj -+gzlib.obj -+gzread.obj -+gzwrite.obj |
| 30 | wlib -b -c $(ZLIB_LIB) -+deflate.obj -+gzio.obj -+infback.obj | 30 | wlib -b -c $(ZLIB_LIB) -+deflate.obj -+infback.obj |
| 31 | wlib -b -c $(ZLIB_LIB) -+inffast.obj -+inflate.obj -+inftrees.obj | 31 | wlib -b -c $(ZLIB_LIB) -+inffast.obj -+inflate.obj -+inftrees.obj |
| 32 | wlib -b -c $(ZLIB_LIB) -+trees.obj -+uncompr.obj -+zutil.obj | 32 | wlib -b -c $(ZLIB_LIB) -+trees.obj -+uncompr.obj -+zutil.obj |
| 33 | 33 | ||
diff --git a/watcom/watcom_l.mak b/watcom/watcom_l.mak index 8e0f4d1..193eed7 100644 --- a/watcom/watcom_l.mak +++ b/watcom/watcom_l.mak | |||
| @@ -6,13 +6,13 @@ | |||
| 6 | 6 | ||
| 7 | C_SOURCE = adler32.c compress.c crc32.c deflate.c & | 7 | C_SOURCE = adler32.c compress.c crc32.c deflate.c & |
| 8 | gzclose.c gzlib.c gzread.c gzwrite.c & | 8 | gzclose.c gzlib.c gzread.c gzwrite.c & |
| 9 | gzio.c infback.c inffast.c inflate.c & | 9 | infback.c inffast.c inflate.c inftrees.c & |
| 10 | inftrees.c trees.c uncompr.c zutil.c | 10 | trees.c uncompr.c zutil.c |
| 11 | 11 | ||
| 12 | OBJS = adler32.obj compress.obj crc32.obj deflate.obj & | 12 | OBJS = adler32.obj compress.obj crc32.obj deflate.obj & |
| 13 | gzclose.obj gzlib.obj gzread.obj gzwrite.obj & | 13 | gzclose.obj gzlib.obj gzread.obj gzwrite.obj & |
| 14 | gzio.obj infback.obj inffast.obj inflate.obj & | 14 | infback.obj inffast.obj inflate.obj inftrees.obj & |
| 15 | inftrees.obj trees.obj uncompr.obj zutil.obj | 15 | trees.obj uncompr.obj zutil.obj |
| 16 | 16 | ||
| 17 | CC = wcc | 17 | CC = wcc |
| 18 | LINKER = wcl | 18 | LINKER = wcl |
| @@ -27,7 +27,7 @@ all: $(ZLIB_LIB) example.exe minigzip.exe | |||
| 27 | $(ZLIB_LIB): $(OBJS) | 27 | $(ZLIB_LIB): $(OBJS) |
| 28 | wlib -b -c $(ZLIB_LIB) -+adler32.obj -+compress.obj -+crc32.obj | 28 | wlib -b -c $(ZLIB_LIB) -+adler32.obj -+compress.obj -+crc32.obj |
| 29 | wlib -b -c $(ZLIB_LIB) -+gzclose.obj -+gzlib.obj -+gzread.obj -+gzwrite.obj | 29 | wlib -b -c $(ZLIB_LIB) -+gzclose.obj -+gzlib.obj -+gzread.obj -+gzwrite.obj |
| 30 | wlib -b -c $(ZLIB_LIB) -+deflate.obj -+gzio.obj -+infback.obj | 30 | wlib -b -c $(ZLIB_LIB) -+deflate.obj -+infback.obj |
| 31 | wlib -b -c $(ZLIB_LIB) -+inffast.obj -+inflate.obj -+inftrees.obj | 31 | wlib -b -c $(ZLIB_LIB) -+inffast.obj -+inflate.obj -+inftrees.obj |
| 32 | wlib -b -c $(ZLIB_LIB) -+trees.obj -+uncompr.obj -+zutil.obj | 32 | wlib -b -c $(ZLIB_LIB) -+trees.obj -+uncompr.obj -+zutil.obj |
| 33 | 33 | ||
diff --git a/win32/Makefile.bor b/win32/Makefile.bor index f975669..3981d42 100644 --- a/win32/Makefile.bor +++ b/win32/Makefile.bor | |||
| @@ -24,10 +24,10 @@ LDFLAGS = $(LOC) | |||
| 24 | # variables | 24 | # variables |
| 25 | ZLIB_LIB = zlib.lib | 25 | ZLIB_LIB = zlib.lib |
| 26 | 26 | ||
| 27 | OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzio.obj gzlib.obj gzread.obj | 27 | OBJ1 = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj |
| 28 | OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj | 28 | OBJ2 = gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj |
| 29 | #OBJA = | 29 | #OBJA = |
| 30 | OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzio.obj+gzlib.obj+gzread.obj | 30 | OBJP1 = +adler32.obj+compress.obj+crc32.obj+deflate.obj+gzclose.obj+gzlib.obj+gzread.obj |
| 31 | OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj | 31 | OBJP2 = +gzwrite.obj+infback.obj+inffast.obj+inflate.obj+inftrees.obj+trees.obj+uncompr.obj+zutil.obj |
| 32 | #OBJPA= | 32 | #OBJPA= |
| 33 | 33 | ||
| @@ -51,8 +51,6 @@ deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h | |||
| 51 | 51 | ||
| 52 | gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h | 52 | gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h |
| 53 | 53 | ||
| 54 | gzio.obj: gzio.c zutil.h zlib.h zconf.h | ||
| 55 | |||
| 56 | gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h | 54 | gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h |
| 57 | 55 | ||
| 58 | gzread.obj: gzread.c zlib.h zconf.h gzguts.h | 56 | gzread.obj: gzread.c zlib.h zconf.h gzguts.h |
diff --git a/win32/Makefile.emx b/win32/Makefile.emx index 6ec95e3..4d6ab0e 100644 --- a/win32/Makefile.emx +++ b/win32/Makefile.emx | |||
| @@ -33,7 +33,7 @@ AR=ar rcs | |||
| 33 | prefix=/usr/local | 33 | prefix=/usr/local |
| 34 | exec_prefix = $(prefix) | 34 | exec_prefix = $(prefix) |
| 35 | 35 | ||
| 36 | OBJS = adler32.o compress.o crc32.o deflate.o gzclose.o gzio.o gzlib.o gzread.o \ | 36 | OBJS = adler32.o compress.o crc32.o deflate.o gzclose.o gzlib.o gzread.o \ |
| 37 | gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o | 37 | gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o |
| 38 | 38 | ||
| 39 | TEST_OBJS = example.o minigzip.o | 39 | TEST_OBJS = example.o minigzip.o |
diff --git a/win32/Makefile.gcc b/win32/Makefile.gcc index 4e3d1f2..97571c2 100644 --- a/win32/Makefile.gcc +++ b/win32/Makefile.gcc | |||
| @@ -55,7 +55,7 @@ RM = rm -f | |||
| 55 | prefix = /usr/local | 55 | prefix = /usr/local |
| 56 | exec_prefix = $(prefix) | 56 | exec_prefix = $(prefix) |
| 57 | 57 | ||
| 58 | OBJS = adler32.o compress.o crc32.o deflate.o gzclose.o gzio.o gzlib.o gzread.o \ | 58 | OBJS = adler32.o compress.o crc32.o deflate.o gzclose.o gzlib.o gzread.o \ |
| 59 | gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o | 59 | gzwrite.o infback.o inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o |
| 60 | OBJA = | 60 | OBJA = |
| 61 | 61 | ||
| @@ -133,7 +133,6 @@ crc32.o: crc32.h zlib.h zconf.h | |||
| 133 | deflate.o: deflate.h zutil.h zlib.h zconf.h | 133 | deflate.o: deflate.h zutil.h zlib.h zconf.h |
| 134 | example.o: zlib.h zconf.h | 134 | example.o: zlib.h zconf.h |
| 135 | gzclose.o: zlib.h zconf.h gzguts.h | 135 | gzclose.o: zlib.h zconf.h gzguts.h |
| 136 | gzio.o: zutil.h zlib.h zconf.h | ||
| 137 | gzlib.o: zlib.h zconf.h gzguts.h | 136 | gzlib.o: zlib.h zconf.h gzguts.h |
| 138 | gzread.o: zlib.h zconf.h gzguts.h | 137 | gzread.o: zlib.h zconf.h gzguts.h |
| 139 | gzwrite.o: zlib.h zconf.h gzguts.h | 138 | gzwrite.o: zlib.h zconf.h gzguts.h |
diff --git a/win32/Makefile.gcc.old b/win32/Makefile.gcc.old index 62a8430..f670be4 100644 --- a/win32/Makefile.gcc.old +++ b/win32/Makefile.gcc.old | |||
| @@ -53,7 +53,7 @@ RM = rm -f | |||
| 53 | prefix = /usr/local | 53 | prefix = /usr/local |
| 54 | exec_prefix = $(prefix) | 54 | exec_prefix = $(prefix) |
| 55 | 55 | ||
| 56 | OBJS = adler32.o compress.o crc32.o deflate.o gzio.o infback.o \ | 56 | OBJS = adler32.o compress.o crc32.o deflate.o infback.o \ |
| 57 | inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o | 57 | inffast.o inflate.o inftrees.o trees.o uncompr.o zutil.o |
| 58 | OBJA = | 58 | OBJA = |
| 59 | 59 | ||
| @@ -130,7 +130,6 @@ compress.o: zlib.h zconf.h | |||
| 130 | crc32.o: crc32.h zlib.h zconf.h | 130 | crc32.o: crc32.h zlib.h zconf.h |
| 131 | deflate.o: deflate.h zutil.h zlib.h zconf.h | 131 | deflate.o: deflate.h zutil.h zlib.h zconf.h |
| 132 | example.o: zlib.h zconf.h | 132 | example.o: zlib.h zconf.h |
| 133 | gzio.o: zutil.h zlib.h zconf.h | ||
| 134 | inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h | 133 | inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h |
| 135 | inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h | 134 | inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h |
| 136 | infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h | 135 | infback.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h |
diff --git a/win32/Makefile.msc b/win32/Makefile.msc index 66e9224..3722b23 100644 --- a/win32/Makefile.msc +++ b/win32/Makefile.msc | |||
| @@ -28,7 +28,7 @@ LDFLAGS = -nologo -debug -release | |||
| 28 | ARFLAGS = -nologo | 28 | ARFLAGS = -nologo |
| 29 | RCFLAGS = /dWIN32 /r | 29 | RCFLAGS = /dWIN32 /r |
| 30 | 30 | ||
| 31 | OBJS = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzio.obj gzlib.obj gzread.obj \ | 31 | OBJS = adler32.obj compress.obj crc32.obj deflate.obj gzclose.obj gzlib.obj gzread.obj \ |
| 32 | gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj | 32 | gzwrite.obj infback.obj inffast.obj inflate.obj inftrees.obj trees.obj uncompr.obj zutil.obj |
| 33 | OBJA = | 33 | OBJA = |
| 34 | 34 | ||
| @@ -84,8 +84,6 @@ deflate.obj: deflate.c deflate.h zutil.h zlib.h zconf.h | |||
| 84 | 84 | ||
| 85 | gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h | 85 | gzclose.obj: gzclose.c zlib.h zconf.h gzguts.h |
| 86 | 86 | ||
| 87 | gzio.obj: gzio.c zutil.h zlib.h zconf.h | ||
| 88 | |||
| 89 | gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h | 87 | gzlib.obj: gzlib.c zlib.h zconf.h gzguts.h |
| 90 | 88 | ||
| 91 | gzread.obj: gzread.c zlib.h zconf.h gzguts.h | 89 | gzread.obj: gzread.c zlib.h zconf.h gzguts.h |
| @@ -7,6 +7,8 @@ | |||
| 7 | 7 | ||
| 8 | #ifndef ZCONF_H | 8 | #ifndef ZCONF_H |
| 9 | #define ZCONF_H | 9 | #define ZCONF_H |
| 10 | #cmakedefine Z_PREFIX | ||
| 11 | #cmakedefine Z_HAVE_UNISTD_H | ||
| 10 | 12 | ||
| 11 | /* | 13 | /* |
| 12 | * If you *really* need a unique prefix for all types and library functions, | 14 | * If you *really* need a unique prefix for all types and library functions, |
| @@ -361,6 +363,10 @@ typedef uLong FAR uLongf; | |||
| 361 | #endif | 363 | #endif |
| 362 | 364 | ||
| 363 | #ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */ | 365 | #ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */ |
| 366 | # define Z_HAVE_UNISTD_H | ||
| 367 | #endif | ||
| 368 | |||
| 369 | #ifdef Z_HAVE_UNISTD_H | ||
| 364 | # include <sys/types.h> /* for off_t */ | 370 | # include <sys/types.h> /* for off_t */ |
| 365 | # include <unistd.h> /* for SEEK_* and off_t */ | 371 | # include <unistd.h> /* for SEEK_* and off_t */ |
| 366 | # ifdef VMS | 372 | # ifdef VMS |
diff --git a/zconf.in.h b/zconf.in.h deleted file mode 100644 index 71a41ad..0000000 --- a/zconf.in.h +++ /dev/null | |||
| @@ -1,412 +0,0 @@ | |||
| 1 | /* zconf.h -- configuration of the zlib compression library | ||
| 2 | * Copyright (C) 1995-2010 Jean-loup Gailly. | ||
| 3 | * For conditions of distribution and use, see copyright notice in zlib.h | ||
| 4 | */ | ||
| 5 | |||
| 6 | /* @(#) $Id$ */ | ||
| 7 | |||
| 8 | #ifndef ZCONF_H | ||
| 9 | #define ZCONF_H | ||
| 10 | |||
| 11 | /* | ||
| 12 | * If you *really* need a unique prefix for all types and library functions, | ||
| 13 | * compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. | ||
| 14 | * Even better than compiling with -DZ_PREFIX would be to use configure to set | ||
| 15 | * this permanently in zconf.h using "./configure --zprefix". | ||
| 16 | */ | ||
| 17 | #ifdef Z_PREFIX /* may be set to #if 1 by ./configure */ | ||
| 18 | |||
| 19 | /* all linked symbols */ | ||
| 20 | # define _dist_code z__dist_code | ||
| 21 | # define _length_code z__length_code | ||
| 22 | # define _tr_align z__tr_align | ||
| 23 | # define _tr_flush_block z__tr_flush_block | ||
| 24 | # define _tr_init z__tr_init | ||
| 25 | # define _tr_stored_block z__tr_stored_block | ||
| 26 | # define _tr_tally z__tr_tally | ||
| 27 | # define adler32 z_adler32 | ||
| 28 | # define adler32_combine z_adler32_combine | ||
| 29 | # define adler32_combine64 z_adler32_combine64 | ||
| 30 | # define compress z_compress | ||
| 31 | # define compress2 z_compress2 | ||
| 32 | # define compressBound z_compressBound | ||
| 33 | # define crc32 z_crc32 | ||
| 34 | # define crc32_combine z_crc32_combine | ||
| 35 | # define crc32_combine64 z_crc32_combine64 | ||
| 36 | # define deflate z_deflate | ||
| 37 | # define deflateBound z_deflateBound | ||
| 38 | # define deflateCopy z_deflateCopy | ||
| 39 | # define deflateEnd z_deflateEnd | ||
| 40 | # define deflateInit2_ z_deflateInit2_ | ||
| 41 | # define deflateInit_ z_deflateInit_ | ||
| 42 | # define deflateParams z_deflateParams | ||
| 43 | # define deflatePrime z_deflatePrime | ||
| 44 | # define deflateReset z_deflateReset | ||
| 45 | # define deflateSetDictionary z_deflateSetDictionary | ||
| 46 | # define deflateSetHeader z_deflateSetHeader | ||
| 47 | # define deflateTune z_deflateTune | ||
| 48 | # define deflate_copyright z_deflate_copyright | ||
| 49 | # define get_crc_table z_get_crc_table | ||
| 50 | # define gz_error z_gz_error | ||
| 51 | # define gz_intmax z_gz_intmax | ||
| 52 | # define gz_strwinerror z_gz_strwinerror | ||
| 53 | # define gzbuffer z_gzbuffer | ||
| 54 | # define gzclearerr z_gzclearerr | ||
| 55 | # define gzclose z_gzclose | ||
| 56 | # define gzclose_r z_gzclose_r | ||
| 57 | # define gzclose_w z_gzclose_w | ||
| 58 | # define gzdirect z_gzdirect | ||
| 59 | # define gzdopen z_gzdopen | ||
| 60 | # define gzeof z_gzeof | ||
| 61 | # define gzerror z_gzerror | ||
| 62 | # define gzflush z_gzflush | ||
| 63 | # define gzgetc z_gzgetc | ||
| 64 | # define gzgets z_gzgets | ||
| 65 | # define gzoffset z_gzoffset | ||
| 66 | # define gzoffset64 z_gzoffset64 | ||
| 67 | # define gzopen z_gzopen | ||
| 68 | # define gzopen64 z_gzopen64 | ||
| 69 | # define gzprintf z_gzprintf | ||
| 70 | # define gzputc z_gzputc | ||
| 71 | # define gzputs z_gzputs | ||
| 72 | # define gzread z_gzread | ||
| 73 | # define gzrewind z_gzrewind | ||
| 74 | # define gzseek z_gzseek | ||
| 75 | # define gzseek64 z_gzseek64 | ||
| 76 | # define gzsetparams z_gzsetparams | ||
| 77 | # define gztell z_gztell | ||
| 78 | # define gztell64 z_gztell64 | ||
| 79 | # define gzungetc z_gzungetc | ||
| 80 | # define gzwrite z_gzwrite | ||
| 81 | # define inflate z_inflate | ||
| 82 | # define inflateBack z_inflateBack | ||
| 83 | # define inflateBackEnd z_inflateBackEnd | ||
| 84 | # define inflateBackInit_ z_inflateBackInit_ | ||
| 85 | # define inflateCopy z_inflateCopy | ||
| 86 | # define inflateEnd z_inflateEnd | ||
| 87 | # define inflateGetHeader z_inflateGetHeader | ||
| 88 | # define inflateInit2_ z_inflateInit2_ | ||
| 89 | # define inflateInit_ z_inflateInit_ | ||
| 90 | # define inflateMark z_inflateMark | ||
| 91 | # define inflatePrime z_inflatePrime | ||
| 92 | # define inflateReset z_inflateReset | ||
| 93 | # define inflateReset2 z_inflateReset2 | ||
| 94 | # define inflateSetDictionary z_inflateSetDictionary | ||
| 95 | # define inflateSync z_inflateSync | ||
| 96 | # define inflateSyncPoint z_inflateSyncPoint | ||
| 97 | # define inflateUndermine z_inflateUndermine | ||
| 98 | # define inflate_copyright z_inflate_copyright | ||
| 99 | # define inflate_fast z_inflate_fast | ||
| 100 | # define inflate_table z_inflate_table | ||
| 101 | # define uncompress z_uncompress | ||
| 102 | # define zError z_zError | ||
| 103 | # define zcalloc z_zcalloc | ||
| 104 | # define zcfree z_zcfree | ||
| 105 | # define zlibCompileFlags z_zlibCompileFlags | ||
| 106 | # define zlibVersion z_zlibVersion | ||
| 107 | |||
| 108 | /* all zlib typedefs in zlib.h and zconf.h */ | ||
| 109 | # define Byte z_Byte | ||
| 110 | # define Bytef z_Bytef | ||
| 111 | # define alloc_func z_alloc_func | ||
| 112 | # define charf z_charf | ||
| 113 | # define free_func z_free_func | ||
| 114 | # define gzFile z_gzFile | ||
| 115 | # define gz_header z_gz_header | ||
| 116 | # define gz_headerp z_gz_headerp | ||
| 117 | # define in_func z_in_func | ||
| 118 | # define intf z_intf | ||
| 119 | # define out_func z_out_func | ||
| 120 | # define uInt z_uInt | ||
| 121 | # define uIntf z_uIntf | ||
| 122 | # define uLong z_uLong | ||
| 123 | # define uLongf z_uLongf | ||
| 124 | # define voidp z_voidp | ||
| 125 | # define voidpc z_voidpc | ||
| 126 | # define voidpf z_voidpf | ||
| 127 | |||
| 128 | /* all zlib structs in zlib.h and zconf.h */ | ||
| 129 | # define gz_header_s z_gz_header_s | ||
| 130 | # define internal_state z_internal_state | ||
| 131 | |||
| 132 | #endif | ||
| 133 | |||
| 134 | #if defined(__MSDOS__) && !defined(MSDOS) | ||
| 135 | # define MSDOS | ||
| 136 | #endif | ||
| 137 | #if (defined(OS_2) || defined(__OS2__)) && !defined(OS2) | ||
| 138 | # define OS2 | ||
| 139 | #endif | ||
| 140 | #if defined(_WINDOWS) && !defined(WINDOWS) | ||
| 141 | # define WINDOWS | ||
| 142 | #endif | ||
| 143 | #if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__) | ||
| 144 | # ifndef WIN32 | ||
| 145 | # define WIN32 | ||
| 146 | # endif | ||
| 147 | #endif | ||
| 148 | #if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32) | ||
| 149 | # if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__) | ||
| 150 | # ifndef SYS16BIT | ||
| 151 | # define SYS16BIT | ||
| 152 | # endif | ||
| 153 | # endif | ||
| 154 | #endif | ||
| 155 | |||
| 156 | /* | ||
| 157 | * Compile with -DMAXSEG_64K if the alloc function cannot allocate more | ||
| 158 | * than 64k bytes at a time (needed on systems with 16-bit int). | ||
| 159 | */ | ||
| 160 | #ifdef SYS16BIT | ||
| 161 | # define MAXSEG_64K | ||
| 162 | #endif | ||
| 163 | #ifdef MSDOS | ||
| 164 | # define UNALIGNED_OK | ||
| 165 | #endif | ||
| 166 | |||
| 167 | #ifdef __STDC_VERSION__ | ||
| 168 | # ifndef STDC | ||
| 169 | # define STDC | ||
| 170 | # endif | ||
| 171 | # if __STDC_VERSION__ >= 199901L | ||
| 172 | # ifndef STDC99 | ||
| 173 | # define STDC99 | ||
| 174 | # endif | ||
| 175 | # endif | ||
| 176 | #endif | ||
| 177 | #if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus)) | ||
| 178 | # define STDC | ||
| 179 | #endif | ||
| 180 | #if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__)) | ||
| 181 | # define STDC | ||
| 182 | #endif | ||
| 183 | #if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32)) | ||
| 184 | # define STDC | ||
| 185 | #endif | ||
| 186 | #if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__)) | ||
| 187 | # define STDC | ||
| 188 | #endif | ||
| 189 | |||
| 190 | #if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */ | ||
| 191 | # define STDC | ||
| 192 | #endif | ||
| 193 | |||
| 194 | #ifndef STDC | ||
| 195 | # ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */ | ||
| 196 | # define const /* note: need a more gentle solution here */ | ||
| 197 | # endif | ||
| 198 | #endif | ||
| 199 | |||
| 200 | /* Some Mac compilers merge all .h files incorrectly: */ | ||
| 201 | #if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) | ||
| 202 | # define NO_DUMMY_DECL | ||
| 203 | #endif | ||
| 204 | |||
| 205 | /* Maximum value for memLevel in deflateInit2 */ | ||
| 206 | #ifndef MAX_MEM_LEVEL | ||
| 207 | # ifdef MAXSEG_64K | ||
| 208 | # define MAX_MEM_LEVEL 8 | ||
| 209 | # else | ||
| 210 | # define MAX_MEM_LEVEL 9 | ||
| 211 | # endif | ||
| 212 | #endif | ||
| 213 | |||
| 214 | /* Maximum value for windowBits in deflateInit2 and inflateInit2. | ||
| 215 | * WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files | ||
| 216 | * created by gzip. (Files created by minigzip can still be extracted by | ||
| 217 | * gzip.) | ||
| 218 | */ | ||
| 219 | #ifndef MAX_WBITS | ||
| 220 | # define MAX_WBITS 15 /* 32K LZ77 window */ | ||
| 221 | #endif | ||
| 222 | |||
| 223 | /* The memory requirements for deflate are (in bytes): | ||
| 224 | (1 << (windowBits+2)) + (1 << (memLevel+9)) | ||
| 225 | that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values) | ||
| 226 | plus a few kilobytes for small objects. For example, if you want to reduce | ||
| 227 | the default memory requirements from 256K to 128K, compile with | ||
| 228 | make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7" | ||
| 229 | Of course this will generally degrade compression (there's no free lunch). | ||
| 230 | |||
| 231 | The memory requirements for inflate are (in bytes) 1 << windowBits | ||
| 232 | that is, 32K for windowBits=15 (default value) plus a few kilobytes | ||
| 233 | for small objects. | ||
| 234 | */ | ||
| 235 | |||
| 236 | /* Type declarations */ | ||
| 237 | |||
| 238 | #ifndef OF /* function prototypes */ | ||
| 239 | # ifdef STDC | ||
| 240 | # define OF(args) args | ||
| 241 | # else | ||
| 242 | # define OF(args) () | ||
| 243 | # endif | ||
| 244 | #endif | ||
| 245 | |||
| 246 | /* The following definitions for FAR are needed only for MSDOS mixed | ||
| 247 | * model programming (small or medium model with some far allocations). | ||
| 248 | * This was tested only with MSC; for other MSDOS compilers you may have | ||
| 249 | * to define NO_MEMCPY in zutil.h. If you don't need the mixed model, | ||
| 250 | * just define FAR to be empty. | ||
| 251 | */ | ||
| 252 | #ifdef SYS16BIT | ||
| 253 | # if defined(M_I86SM) || defined(M_I86MM) | ||
| 254 | /* MSC small or medium model */ | ||
| 255 | # define SMALL_MEDIUM | ||
| 256 | # ifdef _MSC_VER | ||
| 257 | # define FAR _far | ||
| 258 | # else | ||
| 259 | # define FAR far | ||
| 260 | # endif | ||
| 261 | # endif | ||
| 262 | # if (defined(__SMALL__) || defined(__MEDIUM__)) | ||
| 263 | /* Turbo C small or medium model */ | ||
| 264 | # define SMALL_MEDIUM | ||
| 265 | # ifdef __BORLANDC__ | ||
| 266 | # define FAR _far | ||
| 267 | # else | ||
| 268 | # define FAR far | ||
| 269 | # endif | ||
| 270 | # endif | ||
| 271 | #endif | ||
| 272 | |||
| 273 | #if defined(WINDOWS) || defined(WIN32) | ||
| 274 | /* If building or using zlib as a DLL, define ZLIB_DLL. | ||
| 275 | * This is not mandatory, but it offers a little performance increase. | ||
| 276 | */ | ||
| 277 | # ifdef ZLIB_DLL | ||
| 278 | # if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500)) | ||
| 279 | # ifdef ZLIB_INTERNAL | ||
| 280 | # define ZEXTERN extern __declspec(dllexport) | ||
| 281 | # else | ||
| 282 | # define ZEXTERN extern __declspec(dllimport) | ||
| 283 | # endif | ||
| 284 | # endif | ||
| 285 | # endif /* ZLIB_DLL */ | ||
| 286 | /* If building or using zlib with the WINAPI/WINAPIV calling convention, | ||
| 287 | * define ZLIB_WINAPI. | ||
| 288 | * Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI. | ||
| 289 | */ | ||
| 290 | # ifdef ZLIB_WINAPI | ||
| 291 | # ifdef FAR | ||
| 292 | # undef FAR | ||
| 293 | # endif | ||
| 294 | # include <windows.h> | ||
| 295 | /* No need for _export, use ZLIB.DEF instead. */ | ||
| 296 | /* For complete Windows compatibility, use WINAPI, not __stdcall. */ | ||
| 297 | # define ZEXPORT WINAPI | ||
| 298 | # ifdef WIN32 | ||
| 299 | # define ZEXPORTVA WINAPIV | ||
| 300 | # else | ||
| 301 | # define ZEXPORTVA FAR CDECL | ||
| 302 | # endif | ||
| 303 | # endif | ||
| 304 | #endif | ||
| 305 | |||
| 306 | #if defined (__BEOS__) | ||
| 307 | # ifdef ZLIB_DLL | ||
| 308 | # ifdef ZLIB_INTERNAL | ||
| 309 | # define ZEXPORT __declspec(dllexport) | ||
| 310 | # define ZEXPORTVA __declspec(dllexport) | ||
| 311 | # else | ||
| 312 | # define ZEXPORT __declspec(dllimport) | ||
| 313 | # define ZEXPORTVA __declspec(dllimport) | ||
| 314 | # endif | ||
| 315 | # endif | ||
| 316 | #endif | ||
| 317 | |||
| 318 | #ifdef HAVE_VISIBILITY_PRAGMA | ||
| 319 | # define ZEXTERN __attribute__((visibility ("default"))) extern | ||
| 320 | #endif | ||
| 321 | |||
| 322 | #ifndef ZEXTERN | ||
| 323 | # define ZEXTERN extern | ||
| 324 | #endif | ||
| 325 | #ifndef ZEXPORT | ||
| 326 | # define ZEXPORT | ||
| 327 | #endif | ||
| 328 | #ifndef ZEXPORTVA | ||
| 329 | # define ZEXPORTVA | ||
| 330 | #endif | ||
| 331 | |||
| 332 | #ifndef FAR | ||
| 333 | # define FAR | ||
| 334 | #endif | ||
| 335 | |||
| 336 | #if !defined(__MACTYPES__) | ||
| 337 | typedef unsigned char Byte; /* 8 bits */ | ||
| 338 | #endif | ||
| 339 | typedef unsigned int uInt; /* 16 bits or more */ | ||
| 340 | typedef unsigned long uLong; /* 32 bits or more */ | ||
| 341 | |||
| 342 | #ifdef SMALL_MEDIUM | ||
| 343 | /* Borland C/C++ and some old MSC versions ignore FAR inside typedef */ | ||
| 344 | # define Bytef Byte FAR | ||
| 345 | #else | ||
| 346 | typedef Byte FAR Bytef; | ||
| 347 | #endif | ||
| 348 | typedef char FAR charf; | ||
| 349 | typedef int FAR intf; | ||
| 350 | typedef uInt FAR uIntf; | ||
| 351 | typedef uLong FAR uLongf; | ||
| 352 | |||
| 353 | #ifdef STDC | ||
| 354 | typedef void const *voidpc; | ||
| 355 | typedef void FAR *voidpf; | ||
| 356 | typedef void *voidp; | ||
| 357 | #else | ||
| 358 | typedef Byte const *voidpc; | ||
| 359 | typedef Byte FAR *voidpf; | ||
| 360 | typedef Byte *voidp; | ||
| 361 | #endif | ||
| 362 | |||
| 363 | #ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */ | ||
| 364 | # include <sys/types.h> /* for off_t */ | ||
| 365 | # include <unistd.h> /* for SEEK_* and off_t */ | ||
| 366 | # ifdef VMS | ||
| 367 | # include <unixio.h> /* for off_t */ | ||
| 368 | # endif | ||
| 369 | # ifndef z_off_t | ||
| 370 | # define z_off_t off_t | ||
| 371 | # endif | ||
| 372 | #endif | ||
| 373 | |||
| 374 | #ifdef _LARGEFILE64_SOURCE | ||
| 375 | # include <sys/types.h> | ||
| 376 | #endif | ||
| 377 | |||
| 378 | #ifndef SEEK_SET | ||
| 379 | # define SEEK_SET 0 /* Seek from beginning of file. */ | ||
| 380 | # define SEEK_CUR 1 /* Seek from current position. */ | ||
| 381 | # define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ | ||
| 382 | #endif | ||
| 383 | #ifndef z_off_t | ||
| 384 | # define z_off_t long | ||
| 385 | #endif | ||
| 386 | |||
| 387 | #if defined(__OS400__) | ||
| 388 | # define NO_vsnprintf | ||
| 389 | #endif | ||
| 390 | |||
| 391 | #if defined(__MVS__) | ||
| 392 | # define NO_vsnprintf | ||
| 393 | #endif | ||
| 394 | |||
| 395 | /* MVS linker does not support external names larger than 8 bytes */ | ||
| 396 | #if defined(__MVS__) | ||
| 397 | #pragma map(deflateInit_,"DEIN") | ||
| 398 | #pragma map(deflateInit2_,"DEIN2") | ||
| 399 | #pragma map(deflateEnd,"DEEND") | ||
| 400 | #pragma map(deflateBound,"DEBND") | ||
| 401 | #pragma map(inflateInit_,"ININ") | ||
| 402 | #pragma map(inflateInit2_,"ININ2") | ||
| 403 | #pragma map(inflateEnd,"INEND") | ||
| 404 | #pragma map(inflateSync,"INSY") | ||
| 405 | #pragma map(inflateSetDictionary,"INSEDI") | ||
| 406 | #pragma map(compressBound,"CMBND") | ||
| 407 | #pragma map(inflate_table,"INTABL") | ||
| 408 | #pragma map(inflate_fast,"INFA") | ||
| 409 | #pragma map(inflate_copyright,"INCOPY") | ||
| 410 | #endif | ||
| 411 | |||
| 412 | #endif /* ZCONF_H */ | ||
| @@ -1,4 +1,4 @@ | |||
| 1 | .TH ZLIB 3 "13 February 2010" | 1 | .TH ZLIB 3 "21 February 2010" |
| 2 | .SH NAME | 2 | .SH NAME |
| 3 | zlib \- compression/decompression library | 3 | zlib \- compression/decompression library |
| 4 | .SH SYNOPSIS | 4 | .SH SYNOPSIS |
| @@ -132,7 +132,7 @@ before asking for help. | |||
| 132 | Send questions and/or comments to zlib@gzip.org, | 132 | Send questions and/or comments to zlib@gzip.org, |
| 133 | or (for the Windows DLL version) to Gilles Vollant (info@winimage.com). | 133 | or (for the Windows DLL version) to Gilles Vollant (info@winimage.com). |
| 134 | .SH AUTHORS | 134 | .SH AUTHORS |
| 135 | Version 1.2.3.8 | 135 | Version 1.2.3.9 |
| 136 | Copyright (C) 1995-2010 Jean-loup Gailly (jloup@gzip.org) | 136 | Copyright (C) 1995-2010 Jean-loup Gailly (jloup@gzip.org) |
| 137 | and Mark Adler (madler@alumni.caltech.edu). | 137 | and Mark Adler (madler@alumni.caltech.edu). |
| 138 | .LP | 138 | .LP |
| @@ -1,5 +1,5 @@ | |||
| 1 | /* zlib.h -- interface of the 'zlib' general purpose compression library | 1 | /* zlib.h -- interface of the 'zlib' general purpose compression library |
| 2 | version 1.2.3.8, Feb 13th, 2010 | 2 | version 1.2.3.9, Feb 21st, 2010 |
| 3 | 3 | ||
| 4 | Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler | 4 | Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler |
| 5 | 5 | ||
| @@ -37,8 +37,8 @@ | |||
| 37 | extern "C" { | 37 | extern "C" { |
| 38 | #endif | 38 | #endif |
| 39 | 39 | ||
| 40 | #define ZLIB_VERSION "1.2.3.8" | 40 | #define ZLIB_VERSION "1.2.3.9" |
| 41 | #define ZLIB_VERNUM 0x1238 | 41 | #define ZLIB_VERNUM 0x1239 |
| 42 | #define ZLIB_VER_MAJOR 1 | 42 | #define ZLIB_VER_MAJOR 1 |
| 43 | #define ZLIB_VER_MINOR 2 | 43 | #define ZLIB_VER_MINOR 2 |
| 44 | #define ZLIB_VER_REVISION 3 | 44 | #define ZLIB_VER_REVISION 3 |
| @@ -1280,12 +1280,15 @@ ZEXTERN int ZEXPORT gzputs OF((gzFile file, const char *s)); | |||
| 1280 | 1280 | ||
| 1281 | ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len)); | 1281 | ZEXTERN char * ZEXPORT gzgets OF((gzFile file, char *buf, int len)); |
| 1282 | /* | 1282 | /* |
| 1283 | Reads bytes from the compressed file until len-1 characters are read, or | 1283 | Reads bytes from the compressed file until len-1 characters are read, or a |
| 1284 | a newline character is read and transferred to buf, or an end-of-file | 1284 | newline character is read and transferred to buf, or an end-of-file |
| 1285 | condition is encountered. The string is then terminated with a null | 1285 | condition is encountered. If any characters are read or if len == 1, the |
| 1286 | character. | 1286 | string is terminated with a null character. If no characters are read due |
| 1287 | to an end-of-file or len < 1, then the buffer is left untouched. | ||
| 1287 | 1288 | ||
| 1288 | gzgets returns buf, or NULL in case of error. | 1289 | gzgets returns buf which is a null-terminated string, or it returns NULL |
| 1290 | for end-of-file or in case of error. If there was an error, the contents at | ||
| 1291 | buf are indeterminate. | ||
| 1289 | */ | 1292 | */ |
| 1290 | 1293 | ||
| 1291 | ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c)); | 1294 | ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c)); |
| @@ -1441,6 +1444,9 @@ ZEXTERN const char * ZEXPORT gzerror OF((gzFile file, int *errnum)); | |||
| 1441 | this function may invalidate the previously returned string. If file is | 1444 | this function may invalidate the previously returned string. If file is |
| 1442 | closed, then the string previously returned by gzerror will no longer be | 1445 | closed, then the string previously returned by gzerror will no longer be |
| 1443 | available. | 1446 | available. |
| 1447 | |||
| 1448 | gzerror() should be used to distinguish errors from end-of-file for those | ||
| 1449 | functions above that do not distinguish those cases in their return values. | ||
| 1444 | */ | 1450 | */ |
| 1445 | 1451 | ||
| 1446 | ZEXTERN void ZEXPORT gzclearerr OF((gzFile file)); | 1452 | ZEXTERN void ZEXPORT gzclearerr OF((gzFile file)); |
| @@ -16,7 +16,6 @@ ZLIB_1.2.0 { | |||
| 16 | z_errmsg; | 16 | z_errmsg; |
| 17 | gz_error; | 17 | gz_error; |
| 18 | gz_intmax; | 18 | gz_intmax; |
| 19 | gzio_old; | ||
| 20 | _*; | 19 | _*; |
| 21 | }; | 20 | }; |
| 22 | 21 | ||