Check-in [96ef6083f8]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:add tcl upstream changes
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1: 96ef6083f852e10360e4b4b1d5413c77ad0d682b
User & Date: chw 2017-01-02 08:50:36
Context
2017-01-02
19:48
preliminary, hackish implementation of wayland key repeat check-in: 344e19eb18 user: chw tags: trunk
08:50
add tcl upstream changes check-in: 96ef6083f8 user: chw tags: trunk
2017-01-01
22:04
repair wayland scroll wheel and support for 3d canvas widget check-in: 5f88f29a7f user: chw tags: trunk
Changes

Changes to jni/tcl/compat/zlib/CMakeLists.txt.

     1      1   cmake_minimum_required(VERSION 2.4.4)
     2      2   set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
     3      3   
     4      4   project(zlib C)
     5      5   
     6         -set(VERSION "1.2.8")
            6  +set(VERSION "1.2.9")
     7      7   
     8      8   option(ASM686 "Enable building i686 assembly implementation")
     9      9   option(AMD64 "Enable building amd64 assembly implementation")
    10     10   
    11     11   set(INSTALL_BIN_DIR "${CMAKE_INSTALL_PREFIX}/bin" CACHE PATH "Installation directory for executables")
    12     12   set(INSTALL_LIB_DIR "${CMAKE_INSTALL_PREFIX}/lib" CACHE PATH "Installation directory for libraries")
    13     13   set(INSTALL_INC_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "Installation directory for headers")

Changes to jni/tcl/compat/zlib/ChangeLog.

     1      1   
     2      2                   ChangeLog file for zlib
     3      3   
            4  +Changes in 1.2.9 (31 Dec 2016)
            5  +- Fix contrib/minizip to permit unzipping with desktop API [Zouzou]
            6  +- Improve contrib/blast to return unused bytes
            7  +- Assure that gzoffset() is correct when appending
            8  +- Improve compress() and uncompress() to support large lengths
            9  +- Fix bug in test/example.c where error code not saved
           10  +- Remedy Coverity warning [Randers-Pehrson]
           11  +- Improve speed of gzprintf() in transparent mode
           12  +- Fix inflateInit2() bug when windowBits is 16 or 32
           13  +- Change DEBUG macro to ZLIB_DEBUG
           14  +- Avoid uninitialized access by gzclose_w()
           15  +- Allow building zlib outside of the source directory
           16  +- Fix bug that accepted invalid zlib header when windowBits is zero
           17  +- Fix gzseek() problem on MinGW due to buggy _lseeki64 there
           18  +- Loop on write() calls in gzwrite.c in case of non-blocking I/O
           19  +- Add --warn (-w) option to ./configure for more compiler warnings
           20  +- Reject a window size of 256 bytes if not using the zlib wrapper
           21  +- Fix bug when level 0 used with Z_HUFFMAN or Z_RLE
           22  +- Add --debug (-d) option to ./configure to define ZLIB_DEBUG
           23  +- Fix bugs in creating a very large gzip header
           24  +- Add uncompress2() function, which returns the input size used
           25  +- Assure that deflateParams() will not switch functions mid-block
           26  +- Dramatically speed up deflation for level 0 (storing)
           27  +- Add gzfread(), duplicating the interface of fread()
           28  +- Add gzfwrite(), duplicating the interface of fwrite()
           29  +- Add deflateGetDictionary() function
           30  +- Use snprintf() for later versions of Microsoft C
           31  +- Fix *Init macros to use z_ prefix when requested
           32  +- Replace as400 with os400 for OS/400 support [Monnerat]
           33  +- Add crc32_z() and adler32_z() functions with size_t lengths
           34  +- Update Visual Studio project files [AraHaan]
           35  +
     4     36   Changes in 1.2.8 (28 Apr 2013)
     5     37   - Update contrib/minizip/iowin32.c for Windows RT [Vollant]
     6     38   - Do not force Z_CONST for C++
     7         -- Clean up contrib/vstudio [Ro]
           39  +- Clean up contrib/vstudio [Roß]
     8     40   - Correct spelling error in zlib.h
     9     41   - Fix mixed line endings in contrib/vstudio
    10     42   
    11     43   Changes in 1.2.7.3 (13 Apr 2013)
    12     44   - Fix version numbers and DLL names in contrib/vstudio/*/zlib.rc
    13     45   
    14     46   Changes in 1.2.7.2 (13 Apr 2013)
................................................................................
    30     62   - Fix configure check for veracity of compiler error return codes
    31     63   - Fix CMake compilation of static lib for MSVC2010 x64
    32     64   - Remove unused variable in infback9.c
    33     65   - Fix argument checks in gzlog_compress() and gzlog_write()
    34     66   - Clean up the usage of z_const and respect const usage within zlib
    35     67   - Clean up examples/gzlog.[ch] comparisons of different types
    36     68   - Avoid shift equal to bits in type (caused endless loop)
    37         -- Fix unintialized value bug in gzputc() introduced by const patches
           69  +- Fix uninitialized value bug in gzputc() introduced by const patches
    38     70   - Fix memory allocation error in examples/zran.c [Nor]
    39     71   - Fix bug where gzopen(), gzclose() would write an empty file
    40     72   - Fix bug in gzclose() when gzwrite() runs out of memory
    41     73   - Check for input buffer malloc failure in examples/gzappend.c
    42     74   - Add note to contrib/blast to use binary mode in stdio
    43     75   - Fix comparisons of differently signed integers in contrib/blast
    44     76   - Check for invalid code length codes in contrib/puff
................................................................................
   190    222   - Update zconf.h.cmakein on make distclean
   191    223   - Merge vestigial vsnprintf determination from zutil.h to gzguts.h
   192    224   - Clarify how gzopen() appends in zlib.h comments
   193    225   - Correct documentation of gzdirect() since junk at end now ignored
   194    226   - Add a transparent write mode to gzopen() when 'T' is in the mode
   195    227   - Update python link in zlib man page
   196    228   - Get inffixed.h and MAKEFIXED result to match
   197         -- Add a ./config --solo option to make zlib subset with no libary use
          229  +- Add a ./config --solo option to make zlib subset with no library use
   198    230   - Add undocumented inflateResetKeep() function for CAB file decoding
   199    231   - Add --cover option to ./configure for gcc coverage testing
   200    232   - Add #define ZLIB_CONST option to use const in the z_stream interface
   201    233   - Add comment to gzdopen() in zlib.h to use dup() when using fileno()
   202    234   - Note behavior of uncompress() to provide as much data as it can
   203    235   - Add files in contrib/minizip to aid in building libminizip
   204    236   - Split off AR options in Makefile.in and configure
................................................................................
   560    592   
   561    593   Changes in 1.2.3.1 (16 August 2006)
   562    594   - Add watcom directory with OpenWatcom make files [Daniel]
   563    595   - Remove #undef of FAR in zconf.in.h for MVS [Fedtke]
   564    596   - Update make_vms.com [Zinser]
   565    597   - Use -fPIC for shared build in configure [Teredesai, Nicholson]
   566    598   - Use only major version number for libz.so on IRIX and OSF1 [Reinholdtsen]
   567         -- Use fdopen() (not _fdopen()) for Interix in zutil.h [Bck]
          599  +- Use fdopen() (not _fdopen()) for Interix in zutil.h [Bäck]
   568    600   - Add some FAQ entries about the contrib directory
   569    601   - Update the MVS question in the FAQ
   570    602   - Avoid extraneous reads after EOF in gzio.c [Brown]
   571    603   - Correct spelling of "successfully" in gzio.c [Randers-Pehrson]
   572    604   - Add comments to zlib.h about gzerror() usage [Brown]
   573    605   - Set extra flags in gzip header in gzopen() like deflate() does
   574    606   - Make configure options more compatible with double-dash conventions
................................................................................
  1174   1206   - add EXPORT in all exported functions (for Windows DLL)
  1175   1207   - added Makefile.nt (thanks to Stephen Williams)
  1176   1208   - added the unsupported "contrib" directory:
  1177   1209      contrib/asm386/ by Gilles Vollant <info@winimage.com>
  1178   1210           386 asm code replacing longest_match().
  1179   1211      contrib/iostream/ by Kevin Ruland <kevin@rodin.wustl.edu>
  1180   1212           A C++ I/O streams interface to the zlib gz* functions
  1181         -   contrib/iostream2/  by Tyge Lvset <Tyge.Lovset@cmr.no>
         1213  +   contrib/iostream2/  by Tyge Løvset <Tyge.Lovset@cmr.no>
  1182   1214           Another C++ I/O streams interface
  1183   1215      contrib/untgz/  by "Pedro A. Aranda Guti\irrez" <paag@tid.es>
  1184   1216           A very simple tar.gz file extractor using zlib
  1185   1217      contrib/visual-basic.txt by Carlos Rios <c_rios@sonda.cl>
  1186   1218           How to use compress(), uncompress() and the gz* functions from VB.
  1187   1219   - pass params -f (filtered data), -h (huffman only), -1 to -9 (compression
  1188   1220     level) in minigzip (thanks to Tom Lane)
................................................................................
  1263   1295   - updated Makefile.dj2
  1264   1296   - added algorithm.doc
  1265   1297   
  1266   1298   Changes in 1.0.1 (20 May 96) [1.0 skipped to avoid confusion]
  1267   1299   - fix array overlay in deflate.c which sometimes caused bad compressed data
  1268   1300   - fix inflate bug with empty stored block
  1269   1301   - fix MSDOS medium model which was broken in 0.99
  1270         -- fix deflateParams() which could generated bad compressed data.
         1302  +- fix deflateParams() which could generate bad compressed data.
  1271   1303   - Bytef is define'd instead of typedef'ed (work around Borland bug)
  1272   1304   - added an INDEX file
  1273   1305   - new makefiles for DJGPP (Makefile.dj2), 32-bit Borland (Makefile.b32),
  1274   1306     Watcom (Makefile.wat), Amiga SAS/C (Makefile.sas)
  1275   1307   - speed up adler32 for modern machines without auto-increment
  1276   1308   - added -ansi for IRIX in configure
  1277   1309   - static_init_done in trees.c is an int

Changes to jni/tcl/compat/zlib/Makefile.in.

     1      1   # Makefile for zlib
     2         -# Copyright (C) 1995-2013 Jean-loup Gailly, Mark Adler
            2  +# Copyright (C) 1995-2016 Jean-loup Gailly, Mark Adler
     3      3   # For conditions of distribution and use, see copyright notice in zlib.h
     4      4   
     5      5   # To compile and test, type:
     6      6   #    ./configure; make test
     7      7   # Normally configure builds both a static and a shared library.
     8      8   # If you want to build just a static library, use: ./configure --static
     9      9   
................................................................................
    16     16   # To install in $HOME instead of /usr/local, use:
    17     17   #    make install prefix=$HOME
    18     18   
    19     19   CC=cc
    20     20   
    21     21   CFLAGS=-O
    22     22   #CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
    23         -#CFLAGS=-g -DDEBUG
           23  +#CFLAGS=-g -DZLIB_DEBUG
    24     24   #CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \
    25     25   #           -Wstrict-prototypes -Wmissing-prototypes
    26     26   
    27     27   SFLAGS=-O
    28     28   LDFLAGS=
    29     29   TEST_LDFLAGS=-L. libz.a
    30     30   LDSHARED=$(CC)
    31     31   CPP=$(CC) -E
    32     32   
    33     33   STATICLIB=libz.a
    34     34   SHAREDLIB=libz.so
    35         -SHAREDLIBV=libz.so.1.2.8
           35  +SHAREDLIBV=libz.so.1.2.9
    36     36   SHAREDLIBM=libz.so.1
    37     37   LIBS=$(STATICLIB) $(SHAREDLIBV)
    38     38   
    39     39   AR=ar
    40     40   ARFLAGS=rc
    41     41   RANLIB=ranlib
    42     42   LDCONFIG=ldconfig
................................................................................
    49     49   exec_prefix = ${prefix}
    50     50   libdir = ${exec_prefix}/lib
    51     51   sharedlibdir = ${libdir}
    52     52   includedir = ${prefix}/include
    53     53   mandir = ${prefix}/share/man
    54     54   man3dir = ${mandir}/man3
    55     55   pkgconfigdir = ${libdir}/pkgconfig
           56  +SRCDIR=
           57  +ZINC=
           58  +ZINCOUT=-I.
    56     59   
    57     60   OBJZ = adler32.o crc32.o deflate.o infback.o inffast.o inflate.o inftrees.o trees.o zutil.o
    58     61   OBJG = compress.o uncompr.o gzclose.o gzlib.o gzread.o gzwrite.o
    59     62   OBJC = $(OBJZ) $(OBJG)
    60     63   
    61     64   PIC_OBJZ = adler32.lo crc32.lo deflate.lo infback.lo inffast.lo inflate.lo inftrees.lo trees.lo zutil.lo
    62     65   PIC_OBJG = compress.lo uncompr.lo gzclose.lo gzlib.lo gzread.lo gzwrite.lo
................................................................................
   109    112   	if echo hello world | ./minigzip64 | ./minigzip64 -d && ./example64 $$TMP64; then \
   110    113   	  echo '		*** zlib 64-bit test OK ***'; \
   111    114   	else \
   112    115   	  echo '		*** zlib 64-bit test FAILED ***'; false; \
   113    116   	fi; \
   114    117   	rm -f $$TMP64
   115    118   
   116         -infcover.o: test/infcover.c zlib.h zconf.h
   117         -	$(CC) $(CFLAGS) -I. -c -o $@ test/infcover.c
          119  +infcover.o: $(SRCDIR)test/infcover.c $(SRCDIR)zlib.h zconf.h
          120  +	$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/infcover.c
   118    121   
   119    122   infcover: infcover.o libz.a
   120    123   	$(CC) $(CFLAGS) -o $@ infcover.o libz.a
   121    124   
   122    125   cover: infcover
   123    126   	rm -f *.gcda
   124    127   	./infcover
................................................................................
   136    139   
   137    140   match.lo: match.S
   138    141   	$(CPP) match.S > _match.s
   139    142   	$(CC) -c -fPIC _match.s
   140    143   	mv _match.o match.lo
   141    144   	rm -f _match.s
   142    145   
   143         -example.o: test/example.c zlib.h zconf.h
   144         -	$(CC) $(CFLAGS) -I. -c -o $@ test/example.c
   145         -
   146         -minigzip.o: test/minigzip.c zlib.h zconf.h
   147         -	$(CC) $(CFLAGS) -I. -c -o $@ test/minigzip.c
   148         -
   149         -example64.o: test/example.c zlib.h zconf.h
   150         -	$(CC) $(CFLAGS) -I. -D_FILE_OFFSET_BITS=64 -c -o $@ test/example.c
   151         -
   152         -minigzip64.o: test/minigzip.c zlib.h zconf.h
   153         -	$(CC) $(CFLAGS) -I. -D_FILE_OFFSET_BITS=64 -c -o $@ test/minigzip.c
   154         -
   155         -.SUFFIXES: .lo
   156         -
   157         -.c.lo:
          146  +example.o: $(SRCDIR)test/example.c $(SRCDIR)zlib.h zconf.h
          147  +	$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/example.c
          148  +
          149  +minigzip.o: $(SRCDIR)test/minigzip.c $(SRCDIR)zlib.h zconf.h
          150  +	$(CC) $(CFLAGS) $(ZINCOUT) -c -o $@ $(SRCDIR)test/minigzip.c
          151  +
          152  +example64.o: $(SRCDIR)test/example.c $(SRCDIR)zlib.h zconf.h
          153  +	$(CC) $(CFLAGS) $(ZINCOUT) -D_FILE_OFFSET_BITS=64 -c -o $@ $(SRCDIR)test/example.c
          154  +
          155  +minigzip64.o: $(SRCDIR)test/minigzip.c $(SRCDIR)zlib.h zconf.h
          156  +	$(CC) $(CFLAGS) $(ZINCOUT) -D_FILE_OFFSET_BITS=64 -c -o $@ $(SRCDIR)test/minigzip.c
          157  +
          158  +
          159  +adler32.o: $(SRCDIR)adler32.c
          160  +	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)adler32.c
          161  +
          162  +crc32.o: $(SRCDIR)crc32.c
          163  +	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)crc32.c
          164  +
          165  +deflate.o: $(SRCDIR)deflate.c
          166  +	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)deflate.c
          167  +
          168  +infback.o: $(SRCDIR)infback.c
          169  +	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)infback.c
          170  +
          171  +inffast.o: $(SRCDIR)inffast.c
          172  +	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inffast.c
          173  +
          174  +inflate.o: $(SRCDIR)inflate.c
          175  +	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inflate.c
          176  +
          177  +inftrees.o: $(SRCDIR)inftrees.c
          178  +	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)inftrees.c
          179  +
          180  +trees.o: $(SRCDIR)trees.c
          181  +	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)trees.c
          182  +
          183  +zutil.o: $(SRCDIR)zutil.c
          184  +	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)zutil.c
          185  +
          186  +compress.o: $(SRCDIR)compress.c
          187  +	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)compress.c
          188  +
          189  +uncompr.o: $(SRCDIR)uncompr.c
          190  +	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)uncompr.c
          191  +
          192  +gzclose.o: $(SRCDIR)gzclose.c
          193  +	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzclose.c
          194  +
          195  +gzlib.o: $(SRCDIR)gzlib.c
          196  +	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzlib.c
          197  +
          198  +gzread.o: $(SRCDIR)gzread.c
          199  +	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzread.c
          200  +
          201  +gzwrite.o: $(SRCDIR)gzwrite.c
          202  +	$(CC) $(CFLAGS) $(ZINC) -c -o $@ $(SRCDIR)gzwrite.c
          203  +
          204  +
          205  +adler32.lo: $(SRCDIR)adler32.c
          206  +	-@mkdir objs 2>/dev/null || test -d objs
          207  +	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/adler32.o $(SRCDIR)adler32.c
          208  +	-@mv objs/adler32.o $@
          209  +
          210  +crc32.lo: $(SRCDIR)crc32.c
          211  +	-@mkdir objs 2>/dev/null || test -d objs
          212  +	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/crc32.o $(SRCDIR)crc32.c
          213  +	-@mv objs/crc32.o $@
          214  +
          215  +deflate.lo: $(SRCDIR)deflate.c
          216  +	-@mkdir objs 2>/dev/null || test -d objs
          217  +	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/deflate.o $(SRCDIR)deflate.c
          218  +	-@mv objs/deflate.o $@
          219  +
          220  +infback.lo: $(SRCDIR)infback.c
          221  +	-@mkdir objs 2>/dev/null || test -d objs
          222  +	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/infback.o $(SRCDIR)infback.c
          223  +	-@mv objs/infback.o $@
          224  +
          225  +inffast.lo: $(SRCDIR)inffast.c
          226  +	-@mkdir objs 2>/dev/null || test -d objs
          227  +	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inffast.o $(SRCDIR)inffast.c
          228  +	-@mv objs/inffast.o $@
          229  +
          230  +inflate.lo: $(SRCDIR)inflate.c
          231  +	-@mkdir objs 2>/dev/null || test -d objs
          232  +	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inflate.o $(SRCDIR)inflate.c
          233  +	-@mv objs/inflate.o $@
          234  +
          235  +inftrees.lo: $(SRCDIR)inftrees.c
          236  +	-@mkdir objs 2>/dev/null || test -d objs
          237  +	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/inftrees.o $(SRCDIR)inftrees.c
          238  +	-@mv objs/inftrees.o $@
          239  +
          240  +trees.lo: $(SRCDIR)trees.c
          241  +	-@mkdir objs 2>/dev/null || test -d objs
          242  +	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/trees.o $(SRCDIR)trees.c
          243  +	-@mv objs/trees.o $@
          244  +
          245  +zutil.lo: $(SRCDIR)zutil.c
          246  +	-@mkdir objs 2>/dev/null || test -d objs
          247  +	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/zutil.o $(SRCDIR)zutil.c
          248  +	-@mv objs/zutil.o $@
          249  +
          250  +compress.lo: $(SRCDIR)compress.c
          251  +	-@mkdir objs 2>/dev/null || test -d objs
          252  +	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/compress.o $(SRCDIR)compress.c
          253  +	-@mv objs/compress.o $@
          254  +
          255  +uncompr.lo: $(SRCDIR)uncompr.c
          256  +	-@mkdir objs 2>/dev/null || test -d objs
          257  +	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/uncompr.o $(SRCDIR)uncompr.c
          258  +	-@mv objs/uncompr.o $@
          259  +
          260  +gzclose.lo: $(SRCDIR)gzclose.c
          261  +	-@mkdir objs 2>/dev/null || test -d objs
          262  +	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzclose.o $(SRCDIR)gzclose.c
          263  +	-@mv objs/gzclose.o $@
          264  +
          265  +gzlib.lo: $(SRCDIR)gzlib.c
          266  +	-@mkdir objs 2>/dev/null || test -d objs
          267  +	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzlib.o $(SRCDIR)gzlib.c
          268  +	-@mv objs/gzlib.o $@
          269  +
          270  +gzread.lo: $(SRCDIR)gzread.c
          271  +	-@mkdir objs 2>/dev/null || test -d objs
          272  +	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzread.o $(SRCDIR)gzread.c
          273  +	-@mv objs/gzread.o $@
          274  +
          275  +gzwrite.lo: $(SRCDIR)gzwrite.c
   158    276   	-@mkdir objs 2>/dev/null || test -d objs
   159         -	$(CC) $(SFLAGS) -DPIC -c -o objs/$*.o $<
   160         -	-@mv objs/$*.o $@
          277  +	$(CC) $(SFLAGS) $(ZINC) -DPIC -c -o objs/gzwrite.o $(SRCDIR)gzwrite.c
          278  +	-@mv objs/gzwrite.o $@
          279  +
   161    280   
   162    281   placebo $(SHAREDLIBV): $(PIC_OBJS) libz.a
   163    282   	$(LDSHARED) $(SFLAGS) -o $@ $(PIC_OBJS) $(LDSHAREDLIBC) $(LDFLAGS)
   164    283   	rm -f $(SHAREDLIB) $(SHAREDLIBM)
   165    284   	ln -s $@ $(SHAREDLIB)
   166    285   	ln -s $@ $(SHAREDLIBM)
   167    286   	-@rmdir objs
................................................................................
   199    318   	  chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV); \
   200    319   	  echo "chmod 755 $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBV)"; \
   201    320   	  rm -f $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
   202    321   	  ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIB); \
   203    322   	  ln -s $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)/$(SHAREDLIBM); \
   204    323   	  ($(LDCONFIG) || true)  >/dev/null 2>&1; \
   205    324   	fi
   206         -	cp zlib.3 $(DESTDIR)$(man3dir)
          325  +	cp $(SRCDIR)zlib.3 $(DESTDIR)$(man3dir)
   207    326   	chmod 644 $(DESTDIR)$(man3dir)/zlib.3
   208    327   	cp zlib.pc $(DESTDIR)$(pkgconfigdir)
   209    328   	chmod 644 $(DESTDIR)$(pkgconfigdir)/zlib.pc
   210    329   # The ranlib in install is needed on NeXTSTEP which checks file times
   211    330   # ldconfig is for Linux
   212    331   
   213    332   install: install-libs
   214    333   	-@if [ ! -d $(DESTDIR)$(includedir)   ]; then mkdir -p $(DESTDIR)$(includedir); fi
   215         -	cp zlib.h zconf.h $(DESTDIR)$(includedir)
          334  +	cp $(SRCDIR)zlib.h zconf.h $(DESTDIR)$(includedir)
   216    335   	chmod 644 $(DESTDIR)$(includedir)/zlib.h $(DESTDIR)$(includedir)/zconf.h
   217    336   
   218    337   uninstall:
   219    338   	cd $(DESTDIR)$(includedir) && rm -f zlib.h zconf.h
   220    339   	cd $(DESTDIR)$(libdir) && rm -f libz.a; \
   221    340   	if test -n "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \
   222    341   	  rm -f $(SHAREDLIBV) $(SHAREDLIB) $(SHAREDLIBM); \
   223    342   	fi
   224    343   	cd $(DESTDIR)$(man3dir) && rm -f zlib.3
   225    344   	cd $(DESTDIR)$(pkgconfigdir) && rm -f zlib.pc
   226    345   
   227    346   docs: zlib.3.pdf
   228    347   
   229         -zlib.3.pdf: zlib.3
   230         -	groff -mandoc -f H -T ps zlib.3 | ps2pdf - zlib.3.pdf
          348  +zlib.3.pdf: $(SRCDIR)zlib.3
          349  +	groff -mandoc -f H -T ps $(SRCDIR)zlib.3 | ps2pdf - $@
   231    350   
   232         -zconf.h.cmakein: zconf.h.in
          351  +zconf.h.cmakein: $(SRCDIR)zconf.h.in
   233    352   	-@ TEMPFILE=zconfh_$$; \
   234    353   	echo "/#define ZCONF_H/ a\\\\\n#cmakedefine Z_PREFIX\\\\\n#cmakedefine Z_HAVE_UNISTD_H\n" >> $$TEMPFILE &&\
   235         -	sed -f $$TEMPFILE zconf.h.in > zconf.h.cmakein &&\
   236         -	touch -r zconf.h.in zconf.h.cmakein &&\
          354  +	sed -f $$TEMPFILE $(SRCDIR)zconf.h.in > $@ &&\
          355  +	touch -r $(SRCDIR)zconf.h.in $@ &&\
   237    356   	rm $$TEMPFILE
   238    357   
   239         -zconf: zconf.h.in
   240         -	cp -p zconf.h.in zconf.h
          358  +zconf: $(SRCDIR)zconf.h.in
          359  +	cp -p $(SRCDIR)zconf.h.in zconf.h
   241    360   
   242    361   mostlyclean: clean
   243    362   clean:
   244    363   	rm -f *.o *.lo *~ \
   245    364   	   example$(EXE) minigzip$(EXE) examplesh$(EXE) minigzipsh$(EXE) \
   246    365   	   example64$(EXE) minigzip64$(EXE) \
   247    366   	   infcover \
................................................................................
   251    370   	rm -f *.gcda *.gcno *.gcov
   252    371   	rm -f contrib/infback9/*.gcda contrib/infback9/*.gcno contrib/infback9/*.gcov
   253    372   
   254    373   maintainer-clean: distclean
   255    374   distclean: clean zconf zconf.h.cmakein docs
   256    375   	rm -f Makefile zlib.pc configure.log
   257    376   	-@rm -f .DS_Store
   258         -	-@printf 'all:\n\t-@echo "Please use ./configure first.  Thank you."\n' > Makefile
   259         -	-@printf '\ndistclean:\n\tmake -f Makefile.in distclean\n' >> Makefile
   260         -	-@touch -r Makefile.in Makefile
          377  +	@if [ -f Makefile.in ]; then \
          378  +	printf 'all:\n\t-@echo "Please use ./configure first.  Thank you."\n' > Makefile ; \
          379  +	printf '\ndistclean:\n\tmake -f Makefile.in distclean\n' >> Makefile ; \
          380  +	touch -r $(SRCDIR)Makefile.in Makefile ; fi
          381  +	@if [ ! -f zconf.h.in ]; then rm -f zconf.h zconf.h.cmakein ; fi
          382  +	@if [ ! -f zlib.3 ]; then rm -f zlib.3.pdf ; fi
   261    383   
   262    384   tags:
   263         -	etags *.[ch]
          385  +	etags $(SRCDIR)*.[ch]
   264    386   
   265         -depend:
   266         -	makedepend -- $(CFLAGS) -- *.[ch]
   267         -
   268         -# DO NOT DELETE THIS LINE -- make depend depends on it.
   269         -
   270         -adler32.o zutil.o: zutil.h zlib.h zconf.h
   271         -gzclose.o gzlib.o gzread.o gzwrite.o: zlib.h zconf.h gzguts.h
   272         -compress.o example.o minigzip.o uncompr.o: zlib.h zconf.h
   273         -crc32.o: zutil.h zlib.h zconf.h crc32.h
   274         -deflate.o: deflate.h zutil.h zlib.h zconf.h
   275         -infback.o inflate.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inffixed.h
   276         -inffast.o: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
   277         -inftrees.o: zutil.h zlib.h zconf.h inftrees.h
   278         -trees.o: deflate.h zutil.h zlib.h zconf.h trees.h
          387  +adler32.o zutil.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
          388  +gzclose.o gzlib.o gzread.o gzwrite.o: $(SRCDIR)zlib.h zconf.h $(SRCDIR)gzguts.h
          389  +compress.o example.o minigzip.o uncompr.o: $(SRCDIR)zlib.h zconf.h
          390  +crc32.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)crc32.h
          391  +deflate.o: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
          392  +infback.o inflate.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h $(SRCDIR)inffixed.h
          393  +inffast.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h
          394  +inftrees.o: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h
          395  +trees.o: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h
   279    396   
   280         -adler32.lo zutil.lo: zutil.h zlib.h zconf.h
   281         -gzclose.lo gzlib.lo gzread.lo gzwrite.lo: zlib.h zconf.h gzguts.h
   282         -compress.lo example.lo minigzip.lo uncompr.lo: zlib.h zconf.h
   283         -crc32.lo: zutil.h zlib.h zconf.h crc32.h
   284         -deflate.lo: deflate.h zutil.h zlib.h zconf.h
   285         -infback.lo inflate.lo: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h inffixed.h
   286         -inffast.lo: zutil.h zlib.h zconf.h inftrees.h inflate.h inffast.h
   287         -inftrees.lo: zutil.h zlib.h zconf.h inftrees.h
   288         -trees.lo: deflate.h zutil.h zlib.h zconf.h trees.h
          397  +adler32.lo zutil.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
          398  +gzclose.lo gzlib.lo gzread.lo gzwrite.lo: $(SRCDIR)zlib.h zconf.h $(SRCDIR)gzguts.h
          399  +compress.lo example.lo minigzip.lo uncompr.lo: $(SRCDIR)zlib.h zconf.h
          400  +crc32.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)crc32.h
          401  +deflate.lo: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h
          402  +infback.lo inflate.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h $(SRCDIR)inffixed.h
          403  +inffast.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h $(SRCDIR)inflate.h $(SRCDIR)inffast.h
          404  +inftrees.lo: $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)inftrees.h
          405  +trees.lo: $(SRCDIR)deflate.h $(SRCDIR)zutil.h $(SRCDIR)zlib.h zconf.h $(SRCDIR)trees.h

Changes to jni/tcl/compat/zlib/README.

     1      1   ZLIB DATA COMPRESSION LIBRARY
     2      2   
     3         -zlib 1.2.8 is a general purpose data compression library.  All the code is
            3  +zlib 1.2.9 is a general purpose data compression library.  All the code is
     4      4   thread safe.  The data format used by the zlib library is described by RFCs
     5      5   (Request for Comments) 1950 to 1952 in the files
     6      6   http://tools.ietf.org/html/rfc1950 (zlib format), rfc1951 (deflate format) and
     7      7   rfc1952 (gzip format).
     8      8   
     9      9   All functions of the compression library are documented in the file zlib.h
    10     10   (volunteer to write man pages welcome, contact zlib@gzip.org).  A usage example
................................................................................
    27     27   
    28     28   PLEASE read the zlib FAQ http://zlib.net/zlib_faq.html before asking for help.
    29     29   
    30     30   Mark Nelson <markn@ieee.org> wrote an article about zlib for the Jan.  1997
    31     31   issue of Dr.  Dobb's Journal; a copy of the article is available at
    32     32   http://marknelson.us/1997/01/01/zlib-engine/ .
    33     33   
    34         -The changes made in version 1.2.8 are documented in the file ChangeLog.
           34  +The changes made in version 1.2.9 are documented in the file ChangeLog.
    35     35   
    36     36   Unsupported third party contributions are provided in directory contrib/ .
    37     37   
    38     38   zlib is available in Java using the java.util.zip package, documented at
    39     39   http://java.sun.com/developer/technicalArticles/Programming/compression/ .
    40     40   
    41     41   A Perl interface to zlib written by Paul Marquess <pmqs@cpan.org> is available
................................................................................
    80     80     The deflate format used by zlib was defined by Phil Katz.  The deflate and
    81     81     zlib specifications were written by L.  Peter Deutsch.  Thanks to all the
    82     82     people who reported problems and suggested various improvements in zlib; they
    83     83     are too numerous to cite here.
    84     84   
    85     85   Copyright notice:
    86     86   
    87         - (C) 1995-2013 Jean-loup Gailly and Mark Adler
           87  + (C) 1995-2016 Jean-loup Gailly and Mark Adler
    88     88   
    89     89     This software is provided 'as-is', without any express or implied
    90     90     warranty.  In no event will the authors be held liable for any damages
    91     91     arising from the use of this software.
    92     92   
    93     93     Permission is granted to anyone to use this software for any purpose,
    94     94     including commercial applications, and to alter it and redistribute it

Changes to jni/tcl/compat/zlib/adler32.c.

     1      1   /* adler32.c -- compute the Adler-32 checksum of a data stream
     2         - * Copyright (C) 1995-2011 Mark Adler
            2  + * Copyright (C) 1995-2011, 2016 Mark Adler
     3      3    * For conditions of distribution and use, see copyright notice in zlib.h
     4      4    */
     5      5   
     6      6   /* @(#) $Id$ */
     7      7   
     8      8   #include "zutil.h"
     9      9   
    10         -#define local static
    11         -
    12     10   local uLong adler32_combine_ OF((uLong adler1, uLong adler2, z_off64_t len2));
    13     11   
    14         -#define BASE 65521      /* largest prime smaller than 65536 */
           12  +#define BASE 65521U     /* largest prime smaller than 65536 */
    15     13   #define NMAX 5552
    16     14   /* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */
    17     15   
    18     16   #define DO1(buf,i)  {adler += (buf)[i]; sum2 += adler;}
    19     17   #define DO2(buf,i)  DO1(buf,i); DO1(buf,i+1);
    20     18   #define DO4(buf,i)  DO2(buf,i); DO2(buf,i+2);
    21     19   #define DO8(buf,i)  DO4(buf,i); DO4(buf,i+4);
................................................................................
    58     56   #else
    59     57   #  define MOD(a) a %= BASE
    60     58   #  define MOD28(a) a %= BASE
    61     59   #  define MOD63(a) a %= BASE
    62     60   #endif
    63     61   
    64     62   /* ========================================================================= */
    65         -uLong ZEXPORT adler32(adler, buf, len)
           63  +uLong ZEXPORT adler32_z(adler, buf, len)
    66     64       uLong adler;
    67     65       const Bytef *buf;
    68         -    uInt len;
           66  +    z_size_t len;
    69     67   {
    70     68       unsigned long sum2;
    71     69       unsigned n;
    72     70   
    73     71       /* split Adler-32 into component sums */
    74     72       sum2 = (adler >> 16) & 0xffff;
    75     73       adler &= 0xffff;
................................................................................
   127    125           MOD(adler);
   128    126           MOD(sum2);
   129    127       }
   130    128   
   131    129       /* return recombined sums */
   132    130       return adler | (sum2 << 16);
   133    131   }
          132  +
          133  +/* ========================================================================= */
          134  +uLong ZEXPORT adler32(adler, buf, len)
          135  +    uLong adler;
          136  +    const Bytef *buf;
          137  +    uInt len;
          138  +{
          139  +    return adler32_z(adler, buf, len);
          140  +}
   134    141   
   135    142   /* ========================================================================= */
   136    143   local uLong adler32_combine_(adler1, adler2, len2)
   137    144       uLong adler1;
   138    145       uLong adler2;
   139    146       z_off64_t len2;
   140    147   {
................................................................................
   152    159       sum1 = adler1 & 0xffff;
   153    160       sum2 = rem * sum1;
   154    161       MOD(sum2);
   155    162       sum1 += (adler2 & 0xffff) + BASE - 1;
   156    163       sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem;
   157    164       if (sum1 >= BASE) sum1 -= BASE;
   158    165       if (sum1 >= BASE) sum1 -= BASE;
   159         -    if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1);
          166  +    if (sum2 >= ((unsigned long)BASE << 1)) sum2 -= ((unsigned long)BASE << 1);
   160    167       if (sum2 >= BASE) sum2 -= BASE;
   161    168       return sum1 | (sum2 << 16);
   162    169   }
   163    170   
   164    171   /* ========================================================================= */
   165    172   uLong ZEXPORT adler32_combine(adler1, adler2, len2)
   166    173       uLong adler1;

Deleted jni/tcl/compat/zlib/as400/bndsrc.

     1         -STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB')
     2         -
     3         -/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
     4         -/*   Version 1.1.3 entry points.                                    */
     5         -/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
     6         -
     7         -/********************************************************************/
     8         -/*   *MODULE      ADLER32      ZLIB         01/02/01  00:15:09      */
     9         -/********************************************************************/
    10         -
    11         -  EXPORT SYMBOL("adler32")
    12         -
    13         -/********************************************************************/
    14         -/*   *MODULE      COMPRESS     ZLIB         01/02/01  00:15:09      */
    15         -/********************************************************************/
    16         -
    17         -  EXPORT SYMBOL("compress")
    18         -  EXPORT SYMBOL("compress2")
    19         -
    20         -/********************************************************************/
    21         -/*   *MODULE      CRC32        ZLIB         01/02/01  00:15:09      */
    22         -/********************************************************************/
    23         -
    24         -  EXPORT SYMBOL("crc32")
    25         -  EXPORT SYMBOL("get_crc_table")
    26         -
    27         -/********************************************************************/
    28         -/*   *MODULE      DEFLATE      ZLIB         01/02/01  00:15:09      */
    29         -/********************************************************************/
    30         -
    31         -  EXPORT SYMBOL("deflate")
    32         -  EXPORT SYMBOL("deflateEnd")
    33         -  EXPORT SYMBOL("deflateSetDictionary")
    34         -  EXPORT SYMBOL("deflateCopy")
    35         -  EXPORT SYMBOL("deflateReset")
    36         -  EXPORT SYMBOL("deflateParams")
    37         -  EXPORT SYMBOL("deflatePrime")
    38         -  EXPORT SYMBOL("deflateInit_")
    39         -  EXPORT SYMBOL("deflateInit2_")
    40         -
    41         -/********************************************************************/
    42         -/*   *MODULE      GZIO         ZLIB         01/02/01  00:15:09      */
    43         -/********************************************************************/
    44         -
    45         -  EXPORT SYMBOL("gzopen")
    46         -  EXPORT SYMBOL("gzdopen")
    47         -  EXPORT SYMBOL("gzsetparams")
    48         -  EXPORT SYMBOL("gzread")
    49         -  EXPORT SYMBOL("gzwrite")
    50         -  EXPORT SYMBOL("gzprintf")
    51         -  EXPORT SYMBOL("gzputs")
    52         -  EXPORT SYMBOL("gzgets")
    53         -  EXPORT SYMBOL("gzputc")
    54         -  EXPORT SYMBOL("gzgetc")
    55         -  EXPORT SYMBOL("gzflush")
    56         -  EXPORT SYMBOL("gzseek")
    57         -  EXPORT SYMBOL("gzrewind")
    58         -  EXPORT SYMBOL("gztell")
    59         -  EXPORT SYMBOL("gzeof")
    60         -  EXPORT SYMBOL("gzclose")
    61         -  EXPORT SYMBOL("gzerror")
    62         -
    63         -/********************************************************************/
    64         -/*   *MODULE      INFLATE      ZLIB         01/02/01  00:15:09      */
    65         -/********************************************************************/
    66         -
    67         -  EXPORT SYMBOL("inflate")
    68         -  EXPORT SYMBOL("inflateEnd")
    69         -  EXPORT SYMBOL("inflateSetDictionary")
    70         -  EXPORT SYMBOL("inflateSync")
    71         -  EXPORT SYMBOL("inflateReset")
    72         -  EXPORT SYMBOL("inflateInit_")
    73         -  EXPORT SYMBOL("inflateInit2_")
    74         -  EXPORT SYMBOL("inflateSyncPoint")
    75         -
    76         -/********************************************************************/
    77         -/*   *MODULE      UNCOMPR      ZLIB         01/02/01  00:15:09      */
    78         -/********************************************************************/
    79         -
    80         -  EXPORT SYMBOL("uncompress")
    81         -
    82         -/********************************************************************/
    83         -/*   *MODULE      ZUTIL        ZLIB         01/02/01  00:15:09      */
    84         -/********************************************************************/
    85         -
    86         -  EXPORT SYMBOL("zlibVersion")
    87         -  EXPORT SYMBOL("zError")
    88         -
    89         -/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
    90         -/*   Version 1.2.1 additional entry points.                         */
    91         -/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
    92         -
    93         -/********************************************************************/
    94         -/*   *MODULE      COMPRESS     ZLIB         01/02/01  00:15:09      */
    95         -/********************************************************************/
    96         -
    97         -  EXPORT SYMBOL("compressBound")
    98         -
    99         -/********************************************************************/
   100         -/*   *MODULE      DEFLATE      ZLIB         01/02/01  00:15:09      */
   101         -/********************************************************************/
   102         -
   103         -  EXPORT SYMBOL("deflateBound")
   104         -
   105         -/********************************************************************/
   106         -/*   *MODULE      GZIO         ZLIB         01/02/01  00:15:09      */
   107         -/********************************************************************/
   108         -
   109         -  EXPORT SYMBOL("gzungetc")
   110         -  EXPORT SYMBOL("gzclearerr")
   111         -
   112         -/********************************************************************/
   113         -/*   *MODULE      INFBACK      ZLIB         01/02/01  00:15:09      */
   114         -/********************************************************************/
   115         -
   116         -  EXPORT SYMBOL("inflateBack")
   117         -  EXPORT SYMBOL("inflateBackEnd")
   118         -  EXPORT SYMBOL("inflateBackInit_")
   119         -
   120         -/********************************************************************/
   121         -/*   *MODULE      INFLATE      ZLIB         01/02/01  00:15:09      */
   122         -/********************************************************************/
   123         -
   124         -  EXPORT SYMBOL("inflateCopy")
   125         -
   126         -/********************************************************************/
   127         -/*   *MODULE      ZUTIL        ZLIB         01/02/01  00:15:09      */
   128         -/********************************************************************/
   129         -
   130         -  EXPORT SYMBOL("zlibCompileFlags")
   131         -
   132         -/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
   133         -/*   Version 1.2.5 additional entry points.                         */
   134         -/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
   135         -
   136         -/********************************************************************/
   137         -/*   *MODULE      ADLER32      ZLIB         01/02/01  00:15:09      */
   138         -/********************************************************************/
   139         -
   140         -  EXPORT SYMBOL("adler32_combine")
   141         -  EXPORT SYMBOL("adler32_combine64")
   142         -
   143         -/********************************************************************/
   144         -/*   *MODULE      CRC32        ZLIB         01/02/01  00:15:09      */
   145         -/********************************************************************/
   146         -
   147         -  EXPORT SYMBOL("crc32_combine")
   148         -  EXPORT SYMBOL("crc32_combine64")
   149         -
   150         -/********************************************************************/
   151         -/*   *MODULE      GZLIB        ZLIB         01/02/01  00:15:09      */
   152         -/********************************************************************/
   153         -
   154         -  EXPORT SYMBOL("gzbuffer")
   155         -  EXPORT SYMBOL("gzoffset")
   156         -  EXPORT SYMBOL("gzoffset64")
   157         -  EXPORT SYMBOL("gzopen64")
   158         -  EXPORT SYMBOL("gzseek64")
   159         -  EXPORT SYMBOL("gztell64")
   160         -
   161         -/********************************************************************/
   162         -/*   *MODULE      GZREAD       ZLIB         01/02/01  00:15:09      */
   163         -/********************************************************************/
   164         -
   165         -  EXPORT SYMBOL("gzclose_r")
   166         -
   167         -/********************************************************************/
   168         -/*   *MODULE      GZWRITE      ZLIB         01/02/01  00:15:09      */
   169         -/********************************************************************/
   170         -
   171         -  EXPORT SYMBOL("gzclose_w")
   172         -
   173         -/********************************************************************/
   174         -/*   *MODULE      INFLATE      ZLIB         01/02/01  00:15:09      */
   175         -/********************************************************************/
   176         -
   177         -  EXPORT SYMBOL("inflateMark")
   178         -  EXPORT SYMBOL("inflatePrime")
   179         -  EXPORT SYMBOL("inflateReset2")
   180         -  EXPORT SYMBOL("inflateUndermine")
   181         -
   182         -/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
   183         -/*   Version 1.2.6 additional entry points.                         */
   184         -/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
   185         -
   186         -/********************************************************************/
   187         -/*   *MODULE      DEFLATE      ZLIB         01/02/01  00:15:09      */
   188         -/********************************************************************/
   189         -
   190         -  EXPORT SYMBOL("deflateResetKeep")
   191         -  EXPORT SYMBOL("deflatePending")
   192         -
   193         -/********************************************************************/
   194         -/*   *MODULE      GZWRITE      ZLIB         01/02/01  00:15:09      */
   195         -/********************************************************************/
   196         -
   197         -  EXPORT SYMBOL("gzgetc_")
   198         -
   199         -/********************************************************************/
   200         -/*   *MODULE      INFLATE      ZLIB         01/02/01  00:15:09      */
   201         -/********************************************************************/
   202         -
   203         -  EXPORT SYMBOL("inflateResetKeep")
   204         -
   205         -/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
   206         -/*   Version 1.2.8 additional entry points.                         */
   207         -/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
   208         -
   209         -/********************************************************************/
   210         -/*   *MODULE      INFLATE      ZLIB         01/02/01  00:15:09      */
   211         -/********************************************************************/
   212         -
   213         -  EXPORT SYMBOL("inflateGetDictionary")
   214         -
   215         -ENDPGMEXP

Deleted jni/tcl/compat/zlib/as400/compile.clp.

     1         -/******************************************************************************/
     2         -/*                                                                            */
     3         -/*  ZLIB                                                                      */
     4         -/*                                                                            */
     5         -/*    Compile sources into modules and link them into a service program.      */
     6         -/*                                                                            */
     7         -/******************************************************************************/
     8         -
     9         -             PGM
    10         -
    11         -/*      Configuration adjustable parameters.                                  */
    12         -
    13         -             DCL        VAR(&SRCLIB) TYPE(*CHAR) LEN(10) +
    14         -                          VALUE('ZLIB')                         /* Source library. */
    15         -             DCL        VAR(&SRCFILE) TYPE(*CHAR) LEN(10) +
    16         -                          VALUE('SOURCES')                      /* Source member file. */
    17         -             DCL        VAR(&CTLFILE) TYPE(*CHAR) LEN(10) +
    18         -                          VALUE('TOOLS')                        /* Control member file. */
    19         -
    20         -             DCL        VAR(&MODLIB) TYPE(*CHAR) LEN(10) +
    21         -                          VALUE('ZLIB')                         /* Module library. */
    22         -
    23         -             DCL        VAR(&SRVLIB) TYPE(*CHAR) LEN(10) +
    24         -                          VALUE('LGPL')                         /* Service program library. */
    25         -
    26         -             DCL        VAR(&CFLAGS) TYPE(*CHAR) +
    27         -                          VALUE('OPTIMIZE(40)')                 /* Compile options. */
    28         -
    29         -             DCL        VAR(&TGTRLS) TYPE(*CHAR) +
    30         -                          VALUE('V5R3M0')                       /* Target release. */
    31         -
    32         -
    33         -/*      Working storage.                                                      */
    34         -
    35         -             DCL        VAR(&CMDLEN) TYPE(*DEC) LEN(15 5) VALUE(300)    /* Command length. */
    36         -             DCL        VAR(&CMD) TYPE(*CHAR) LEN(512)
    37         -             DCL        VAR(&FIXDCMD) TYPE(*CHAR) LEN(512)
    38         -
    39         -
    40         -/*      Compile sources into modules.                                         */
    41         -
    42         -             CHGVAR     VAR(&FIXDCMD) VALUE('CRTCMOD' *BCAT &CFLAGS *BCAT      +
    43         -                        'SYSIFCOPT(*IFS64IO)' *BCAT                            +
    44         -                        'DEFINE(''_LARGEFILE64_SOURCE''' *BCAT                 +
    45         -                        '''_LFS64_LARGEFILE=1'') TGTRLS(' *TCAT &TGTRLS *TCAT  +
    46         -                        ') SRCFILE(' *TCAT &SRCLIB *TCAT '/' *TCAT             +
    47         -                        &SRCFILE *TCAT ') MODULE(' *TCAT &MODLIB *TCAT '/')
    48         -
    49         -
    50         -             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'ADLER32)')
    51         -             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
    52         -
    53         -             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'COMPRESS)')
    54         -             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
    55         -
    56         -             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'CRC32)')
    57         -             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
    58         -
    59         -             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'DEFLATE)')
    60         -             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
    61         -
    62         -             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'GZCLOSE)')
    63         -             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
    64         -
    65         -             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'GZLIB)')
    66         -             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
    67         -
    68         -             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'GZREAD)')
    69         -             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
    70         -
    71         -             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'GZWRITE)')
    72         -             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
    73         -
    74         -             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'INFBACK)')
    75         -             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
    76         -
    77         -             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'INFFAST)')
    78         -             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
    79         -
    80         -             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'INFLATE)')
    81         -             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
    82         -
    83         -             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'INFTREES)')
    84         -             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
    85         -
    86         -             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'TREES)')
    87         -             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
    88         -
    89         -             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'UNCOMPR)')
    90         -             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
    91         -
    92         -             CHGVAR     VAR(&CMD) VALUE(&FIXDCMD *TCAT 'ZUTIL)')
    93         -             CALL       PGM(QCMDEXC) PARM(&CMD &CMDLEN)
    94         -
    95         -
    96         -/*      Link modules into a service program.                                  */
    97         -
    98         -             CRTSRVPGM  SRVPGM(&SRVLIB/ZLIB) +
    99         -                          MODULE(&MODLIB/ADLER32     &MODLIB/COMPRESS    +
   100         -                                 &MODLIB/CRC32       &MODLIB/DEFLATE     +
   101         -                                 &MODLIB/GZCLOSE     &MODLIB/GZLIB       +
   102         -                                 &MODLIB/GZREAD      &MODLIB/GZWRITE     +
   103         -                                 &MODLIB/INFBACK     &MODLIB/INFFAST     +
   104         -                                 &MODLIB/INFLATE     &MODLIB/INFTREES    +
   105         -                                 &MODLIB/TREES       &MODLIB/UNCOMPR     +
   106         -                                 &MODLIB/ZUTIL)                          +
   107         -                          SRCFILE(&SRCLIB/&CTLFILE) SRCMBR(BNDSRC)       +
   108         -                          TEXT('ZLIB 1.2.8') TGTRLS(&TGTRLS)
   109         -
   110         -             ENDPGM

Deleted jni/tcl/compat/zlib/as400/readme.txt.

     1         -        ZLIB version 1.2.8 for AS400 installation instructions
     2         -
     3         -I) From an AS400 *SAVF file:
     4         -
     5         -1)      Unpacking archive to an AS400 save file
     6         -
     7         -On the AS400:
     8         -
     9         -_       Create the ZLIB AS400 library:
    10         -
    11         -        CRTLIB LIB(ZLIB) TYPE(*PROD) TEXT('ZLIB compression API library')
    12         -
    13         -_       Create a work save file, for example:
    14         -
    15         -                CRTSAVF FILE(ZLIB/ZLIBSAVF)
    16         -
    17         -On a PC connected to the target AS400:
    18         -
    19         -_       Unpack the save file image to a PC file "ZLIBSAVF"
    20         -_       Upload this file into the save file on the AS400, for example
    21         -                using ftp in BINARY mode.
    22         -
    23         -
    24         -2)      Populating the ZLIB AS400 source library
    25         -
    26         -On the AS400:
    27         -
    28         -_       Extract the saved objects into the ZLIB AS400 library using:
    29         -
    30         -RSTOBJ OBJ(*ALL) SAVLIB(ZLIB) DEV(*SAVF) SAVF(ZLIB/ZLIBSAVF) RSTLIB(ZLIB)
    31         -
    32         -
    33         -3)      Customize installation:
    34         -
    35         -_       Edit CL member ZLIB/TOOLS(COMPILE) and change parameters if needed,
    36         -                according to the comments.
    37         -
    38         -_       Compile this member with:
    39         -
    40         -        CRTCLPGM PGM(ZLIB/COMPILE) SRCFILE(ZLIB/TOOLS) SRCMBR(COMPILE)
    41         -
    42         -
    43         -4)      Compile and generate the service program:
    44         -
    45         -_       This can now be done by executing:
    46         -
    47         -        CALL PGM(ZLIB/COMPILE)
    48         -
    49         -
    50         -
    51         -II) From the original source distribution:
    52         -
    53         -1)      On the AS400, create the source library:
    54         -
    55         -        CRTLIB LIB(ZLIB) TYPE(*PROD) TEXT('ZLIB compression API library')
    56         -
    57         -2)      Create the source files:
    58         -
    59         -        CRTSRCPF FILE(ZLIB/SOURCES) RCDLEN(112) TEXT('ZLIB library modules')
    60         -        CRTSRCPF FILE(ZLIB/H)       RCDLEN(112) TEXT('ZLIB library includes')
    61         -        CRTSRCPF FILE(ZLIB/TOOLS)   RCDLEN(112) TEXT('ZLIB library control utilities')
    62         -
    63         -3)      From the machine hosting the distribution files, upload them (with
    64         -                FTP in text mode, for example) according to the following table:
    65         -
    66         -    Original    AS400   AS400    AS400 AS400
    67         -    file        file    member   type  description
    68         -                SOURCES                Original ZLIB C subprogram sources
    69         -    adler32.c           ADLER32  C     ZLIB - Compute the Adler-32 checksum of a dta strm
    70         -    compress.c          COMPRESS C     ZLIB - Compress a memory buffer
    71         -    crc32.c             CRC32    C     ZLIB - Compute the CRC-32 of a data stream
    72         -    deflate.c           DEFLATE  C     ZLIB - Compress data using the deflation algorithm
    73         -    gzclose.c           GZCLOSE  C     ZLIB - Close .gz files
    74         -    gzlib.c             GZLIB    C     ZLIB - Miscellaneous .gz files IO support
    75         -    gzread.c            GZREAD   C     ZLIB - Read .gz files
    76         -    gzwrite.c           GZWRITE  C     ZLIB - Write .gz files
    77         -    infback.c           INFBACK  C     ZLIB - Inflate using a callback interface
    78         -    inffast.c           INFFAST  C     ZLIB - Fast proc. literals & length/distance pairs
    79         -    inflate.c           INFLATE  C     ZLIB - Interface to inflate modules
    80         -    inftrees.c          INFTREES C     ZLIB - Generate Huffman trees for efficient decode
    81         -    trees.c             TREES    C     ZLIB - Output deflated data using Huffman coding
    82         -    uncompr.c           UNCOMPR  C     ZLIB - Decompress a memory buffer
    83         -    zutil.c             ZUTIL    C     ZLIB - Target dependent utility functions
    84         -                H                      Original ZLIB C and ILE/RPG include files
    85         -    crc32.h             CRC32    C     ZLIB - CRC32 tables
    86         -    deflate.h           DEFLATE  C     ZLIB - Internal compression state
    87         -    gzguts.h            GZGUTS   C     ZLIB - Definitions for the gzclose module
    88         -    inffast.h           INFFAST  C     ZLIB - Header to use inffast.c
    89         -    inffixed.h          INFFIXED C     ZLIB - Table for decoding fixed codes
    90         -    inflate.h           INFLATE  C     ZLIB - Internal inflate state definitions
    91         -    inftrees.h          INFTREES C     ZLIB - Header to use inftrees.c
    92         -    trees.h             TREES    C     ZLIB - Created automatically with -DGEN_TREES_H
    93         -    zconf.h             ZCONF    C     ZLIB - Compression library configuration
    94         -    zlib.h              ZLIB     C     ZLIB - Compression library C user interface
    95         -    as400/zlib.inc      ZLIB.INC RPGLE ZLIB - Compression library ILE RPG user interface
    96         -    zutil.h             ZUTIL    C     ZLIB - Internal interface and configuration
    97         -                TOOLS                  Building source software & AS/400 README
    98         -    as400/bndsrc        BNDSRC         Entry point exportation list
    99         -    as400/compile.clp   COMPILE  CLP   Compile sources & generate service program
   100         -    as400/readme.txt    README   TXT   Installation instructions
   101         -
   102         -4)      Continue as in I)3).
   103         -
   104         -
   105         -
   106         -
   107         -Notes:  For AS400 ILE RPG programmers, a /copy member defining the ZLIB
   108         -                API prototypes for ILE RPG can be found in ZLIB/H(ZLIB.INC).
   109         -                Please read comments in this member for more information.
   110         -
   111         -        Remember that most foreign textual data are ASCII coded: this
   112         -                implementation does not handle conversion from/to ASCII, so
   113         -                text data code conversions must be done explicitely.
   114         -
   115         -        Mainly for the reason above, always open zipped files in binary mode.

Deleted jni/tcl/compat/zlib/as400/zlib.inc.

     1         -      *  ZLIB.INC - Interface to the general purpose compression library
     2         -      *
     3         -      *  ILE RPG400 version by Patrick Monnerat, DATASPHERE.
     4         -      *  Version 1.2.8
     5         -      *
     6         -      *
     7         -      *  WARNING:
     8         -      *     Procedures inflateInit(), inflateInit2(), deflateInit(),
     9         -      *         deflateInit2() and inflateBackInit() need to be called with
    10         -      *         two additional arguments:
    11         -      *         the package version string and the stream control structure.
    12         -      *         size. This is needed because RPG lacks some macro feature.
    13         -      *         Call these procedures as:
    14         -      *             inflateInit(...: ZLIB_VERSION: %size(z_stream))
    15         -      *
    16         -      /if not defined(ZLIB_H_)
    17         -      /define ZLIB_H_
    18         -      *
    19         -      **************************************************************************
    20         -      *                               Constants
    21         -      **************************************************************************
    22         -      *
    23         -      *  Versioning information.
    24         -      *
    25         -     D ZLIB_VERSION    C                   '1.2.8'
    26         -     D ZLIB_VERNUM     C                   X'1280'
    27         -     D ZLIB_VER_MAJOR  C                   1
    28         -     D ZLIB_VER_MINOR  C                   2
    29         -     D ZLIB_VER_REVISION...
    30         -     D                 C                   8
    31         -     D ZLIB_VER_SUBREVISION...
    32         -     D                 C                   0
    33         -      *
    34         -      *  Other equates.
    35         -      *
    36         -     D Z_NO_FLUSH      C                   0
    37         -     D Z_PARTIAL_FLUSH...
    38         -     D                 C                   1
    39         -     D Z_SYNC_FLUSH    C                   2
    40         -     D Z_FULL_FLUSH    C                   3
    41         -     D Z_FINISH        C                   4
    42         -     D Z_BLOCK         C                   5
    43         -     D Z_TREES         C                   6
    44         -      *
    45         -     D Z_OK            C                   0
    46         -     D Z_STREAM_END    C                   1
    47         -     D Z_NEED_DICT     C                   2
    48         -     D Z_ERRNO         C                   -1
    49         -     D Z_STREAM_ERROR  C                   -2
    50         -     D Z_DATA_ERROR    C                   -3
    51         -     D Z_MEM_ERROR     C                   -4
    52         -     D Z_BUF_ERROR     C                   -5
    53         -     DZ_VERSION_ERROR  C                   -6
    54         -      *
    55         -     D Z_NO_COMPRESSION...
    56         -     D                 C                   0
    57         -     D Z_BEST_SPEED    C                   1
    58         -     D Z_BEST_COMPRESSION...
    59         -     D                 C                   9
    60         -     D Z_DEFAULT_COMPRESSION...
    61         -     D                 C                   -1
    62         -      *
    63         -     D Z_FILTERED      C                   1
    64         -     D Z_HUFFMAN_ONLY  C                   2
    65         -     D Z_RLE           C                   3
    66         -     D Z_DEFAULT_STRATEGY...
    67         -     D                 C                   0
    68         -      *
    69         -     D Z_BINARY        C                   0
    70         -     D Z_ASCII         C                   1
    71         -     D Z_UNKNOWN       C                   2
    72         -      *
    73         -     D Z_DEFLATED      C                   8
    74         -      *
    75         -     D Z_NULL          C                   0
    76         -      *
    77         -      **************************************************************************
    78         -      *                                 Types
    79         -      **************************************************************************
    80         -      *
    81         -     D z_streamp       S               *                                        Stream struct ptr
    82         -     D gzFile          S               *                                        File pointer
    83         -     D z_off_t         S             10i 0                                      Stream offsets
    84         -     D z_off64_t       S             20i 0                                      Stream offsets
    85         -      *
    86         -      **************************************************************************
    87         -      *                               Structures
    88         -      **************************************************************************
    89         -      *
    90         -      *  The GZIP encode/decode stream support structure.
    91         -      *
    92         -     D z_stream        DS                  align based(z_streamp)
    93         -     D  zs_next_in                     *                                        Next input byte
    94         -     D  zs_avail_in                  10U 0                                      Byte cnt at next_in
    95         -     D  zs_total_in                  10U 0                                      Total bytes read
    96         -     D  zs_next_out                    *                                        Output buffer ptr
    97         -     D  zs_avail_out                 10U 0                                      Room left @ next_out
    98         -     D  zs_total_out                 10U 0                                      Total bytes written
    99         -     D  zs_msg                         *                                        Last errmsg or null
   100         -     D  zs_state                       *                                        Internal state
   101         -     D  zs_zalloc                      *   procptr                              Int. state allocator
   102         -     D  zs_free                        *   procptr                              Int. state dealloc.
   103         -     D  zs_opaque                      *                                        Private alloc. data
   104         -     D  zs_data_type                 10i 0                                      ASC/BIN best guess
   105         -     D  zs_adler                     10u 0                                      Uncompr. adler32 val
   106         -     D                               10U 0                                      Reserved
   107         -     D                               10U 0                                      Ptr. alignment
   108         -      *
   109         -      **************************************************************************
   110         -      *                     Utility function prototypes
   111         -      **************************************************************************
   112         -      *
   113         -     D compress        PR            10I 0 extproc('compress')
   114         -     D  dest                      65535    options(*varsize)                    Destination buffer
   115         -     D  destLen                      10U 0                                      Destination length
   116         -     D  source                    65535    const options(*varsize)              Source buffer
   117         -     D  sourceLen                    10u 0 value                                Source length
   118         -      *
   119         -     D compress2       PR            10I 0 extproc('compress2')
   120         -     D  dest                      65535    options(*varsize)                    Destination buffer
   121         -     D  destLen                      10U 0                                      Destination length
   122         -     D  source                    65535    const options(*varsize)              Source buffer
   123         -     D  sourceLen                    10U 0 value                                Source length
   124         -     D  level                        10I 0 value                                Compression level
   125         -      *
   126         -     D compressBound   PR            10U 0 extproc('compressBound')
   127         -     D  sourceLen                    10U 0 value
   128         -      *
   129         -     D uncompress      PR            10I 0 extproc('uncompress')
   130         -     D  dest                      65535    options(*varsize)                    Destination buffer
   131         -     D  destLen                      10U 0                                      Destination length
   132         -     D  source                    65535    const options(*varsize)              Source buffer
   133         -     D  sourceLen                    10U 0 value                                Source length
   134         -      *
   135         -      /if not defined(LARGE_FILES)
   136         -     D gzopen          PR                  extproc('gzopen')
   137         -     D                                     like(gzFile)
   138         -     D  path                           *   value options(*string)               File pathname
   139         -     D  mode                           *   value options(*string)               Open mode
   140         -      /else
   141         -     D gzopen          PR                  extproc('gzopen64')
   142         -     D                                     like(gzFile)
   143         -     D  path                           *   value options(*string)               File pathname
   144         -     D  mode                           *   value options(*string)               Open mode
   145         -      *
   146         -     D gzopen64        PR                  extproc('gzopen64')
   147         -     D                                     like(gzFile)
   148         -     D  path                           *   value options(*string)               File pathname
   149         -     D  mode                           *   value options(*string)               Open mode
   150         -      /endif
   151         -      *
   152         -     D gzdopen         PR                  extproc('gzdopen')
   153         -     D                                     like(gzFile)
   154         -     D  fd                           10I 0 value                                File descriptor
   155         -     D  mode                           *   value options(*string)               Open mode
   156         -      *
   157         -     D gzbuffer        PR            10I 0 extproc('gzbuffer')
   158         -     D  file                               value like(gzFile)                   File pointer
   159         -     D  size                         10U 0 value
   160         -      *
   161         -     D gzsetparams     PR            10I 0 extproc('gzsetparams')
   162         -     D  file                               value like(gzFile)                   File pointer
   163         -     D  level                        10I 0 value
   164         -     D  strategy                     10I 0 value
   165         -      *
   166         -     D gzread          PR            10I 0 extproc('gzread')
   167         -     D  file                               value like(gzFile)                   File pointer
   168         -     D  buf                       65535    options(*varsize)                    Buffer
   169         -     D  len                          10u 0 value                                Buffer length
   170         -      *
   171         -     D gzwrite         PR            10I 0 extproc('gzwrite')
   172         -     D  file                               value like(gzFile)                   File pointer
   173         -     D  buf                       65535    const options(*varsize)              Buffer
   174         -     D  len                          10u 0 value                                Buffer length
   175         -      *
   176         -     D gzputs          PR            10I 0 extproc('gzputs')
   177         -     D  file                               value like(gzFile)                   File pointer
   178         -     D  s                              *   value options(*string)               String to output
   179         -      *
   180         -     D gzgets          PR              *   extproc('gzgets')
   181         -     D  file                               value like(gzFile)                   File pointer
   182         -     D  buf                       65535    options(*varsize)                    Read buffer
   183         -     D  len                          10i 0 value                                Buffer length
   184         -      *
   185         -     D gzputc          PR            10i 0 extproc('gzputc')
   186         -     D  file                               value like(gzFile)                   File pointer
   187         -     D  c                            10I 0 value                                Character to write
   188         -      *
   189         -     D gzgetc          PR            10i 0 extproc('gzgetc')
   190         -     D  file                               value like(gzFile)                   File pointer
   191         -      *
   192         -     D gzgetc_         PR            10i 0 extproc('gzgetc_')
   193         -     D  file                               value like(gzFile)                   File pointer
   194         -      *
   195         -     D gzungetc        PR            10i 0 extproc('gzungetc')
   196         -     D  c                            10I 0 value                                Character to push
   197         -     D  file                               value like(gzFile)                   File pointer
   198         -      *
   199         -     D gzflush         PR            10i 0 extproc('gzflush')
   200         -     D  file                               value like(gzFile)                   File pointer
   201         -     D  flush                        10I 0 value                                Type of flush
   202         -      *
   203         -      /if not defined(LARGE_FILES)
   204         -     D gzseek          PR                  extproc('gzseek')
   205         -     D                                     like(z_off_t)
   206         -     D  file                               value like(gzFile)                   File pointer
   207         -     D  offset                             value like(z_off_t)                  Offset
   208         -     D  whence                       10i 0 value                                Origin
   209         -      /else
   210         -     D gzseek          PR                  extproc('gzseek64')
   211         -     D                                     like(z_off_t)
   212         -     D  file                               value like(gzFile)                   File pointer
   213         -     D  offset                             value like(z_off_t)                  Offset
   214         -     D  whence                       10i 0 value                                Origin
   215         -      *
   216         -     D gzseek64        PR                  extproc('gzseek64')
   217         -     D                                     like(z_off64_t)
   218         -     D  file                               value like(gzFile)                   File pointer
   219         -     D  offset                             value like(z_off64_t)                Offset
   220         -     D  whence                       10i 0 value                                Origin
   221         -      /endif
   222         -      *
   223         -     D gzrewind        PR            10i 0 extproc('gzrewind')
   224         -     D  file                               value like(gzFile)                   File pointer
   225         -      *
   226         -      /if not defined(LARGE_FILES)
   227         -     D gztell          PR                  extproc('gztell')
   228         -     D                                     like(z_off_t)
   229         -     D  file                               value like(gzFile)                   File pointer
   230         -      /else
   231         -     D gztell          PR                  extproc('gztell64')
   232         -     D                                     like(z_off_t)
   233         -     D  file                               value like(gzFile)                   File pointer
   234         -      *
   235         -     D gztell64        PR                  extproc('gztell64')
   236         -     D                                     like(z_off64_t)
   237         -     D  file                               value like(gzFile)                   File pointer
   238         -      /endif
   239         -      *
   240         -      /if not defined(LARGE_FILES)
   241         -     D gzoffset        PR                  extproc('gzoffset')
   242         -     D                                     like(z_off_t)
   243         -     D  file                               value like(gzFile)                   File pointer
   244         -      /else
   245         -     D gzoffset        PR                  extproc('gzoffset64')
   246         -     D                                     like(z_off_t)
   247         -     D  file                               value like(gzFile)                   File pointer
   248         -      *
   249         -     D gzoffset64      PR                  extproc('gzoffset64')
   250         -     D                                     like(z_off64_t)
   251         -     D  file                               value like(gzFile)                   File pointer
   252         -      /endif
   253         -      *
   254         -     D gzeof           PR            10i 0 extproc('gzeof')
   255         -     D  file                               value like(gzFile)                   File pointer
   256         -      *
   257         -     D gzclose_r       PR            10i 0 extproc('gzclose_r')
   258         -     D  file                               value like(gzFile)                   File pointer
   259         -      *
   260         -     D gzclose_w       PR            10i 0 extproc('gzclose_w')
   261         -     D  file                               value like(gzFile)                   File pointer
   262         -      *
   263         -     D gzclose         PR            10i 0 extproc('gzclose')
   264         -     D  file                               value like(gzFile)                   File pointer
   265         -      *
   266         -     D gzerror         PR              *   extproc('gzerror')                   Error string
   267         -     D  file                               value like(gzFile)                   File pointer
   268         -     D  errnum                       10I 0                                      Error code
   269         -      *
   270         -     D gzclearerr      PR                  extproc('gzclearerr')
   271         -     D  file                               value like(gzFile)                   File pointer
   272         -      *
   273         -      **************************************************************************
   274         -      *                        Basic function prototypes
   275         -      **************************************************************************
   276         -      *
   277         -     D zlibVersion     PR              *   extproc('zlibVersion')               Version string
   278         -      *
   279         -     D deflateInit     PR            10I 0 extproc('deflateInit_')              Init. compression
   280         -     D  strm                               like(z_stream)                       Compression stream
   281         -     D  level                        10I 0 value                                Compression level
   282         -     D  version                        *   value options(*string)               Version string
   283         -     D  stream_size                  10i 0 value                                Stream struct. size
   284         -      *
   285         -     D deflate         PR            10I 0 extproc('deflate')                   Compress data
   286         -     D  strm                               like(z_stream)                       Compression stream
   287         -     D  flush                        10I 0 value                                Flush type required
   288         -      *
   289         -     D deflateEnd      PR            10I 0 extproc('deflateEnd')                Termin. compression
   290         -     D  strm                               like(z_stream)                       Compression stream
   291         -      *
   292         -     D inflateInit     PR            10I 0 extproc('inflateInit_')              Init. expansion
   293         -     D  strm                               like(z_stream)                       Expansion stream
   294         -     D  version                        *   value options(*string)               Version string
   295         -     D  stream_size                  10i 0 value                                Stream struct. size
   296         -      *
   297         -     D inflate         PR            10I 0 extproc('inflate')                   Expand data
   298         -     D  strm                               like(z_stream)                       Expansion stream
   299         -     D  flush                        10I 0 value                                Flush type required
   300         -      *
   301         -     D inflateEnd      PR            10I 0 extproc('inflateEnd')                Termin. expansion
   302         -     D  strm                               like(z_stream)                       Expansion stream
   303         -      *
   304         -      **************************************************************************
   305         -      *                        Advanced function prototypes
   306         -      **************************************************************************
   307         -      *
   308         -     D deflateInit2    PR            10I 0 extproc('deflateInit2_')             Init. compression
   309         -     D  strm                               like(z_stream)                       Compression stream
   310         -     D  level                        10I 0 value                                Compression level
   311         -     D  method                       10I 0 value                                Compression method
   312         -     D  windowBits                   10I 0 value                                log2(window size)
   313         -     D  memLevel                     10I 0 value                                Mem/cmpress tradeoff
   314         -     D  strategy                     10I 0 value                                Compression stategy
   315         -     D  version                        *   value options(*string)               Version string
   316         -     D  stream_size                  10i 0 value                                Stream struct. size
   317         -      *
   318         -     D deflateSetDictionary...
   319         -     D                 PR            10I 0 extproc('deflateSetDictionary')      Init. dictionary
   320         -     D  strm                               like(z_stream)                       Compression stream
   321         -     D  dictionary                65535    const options(*varsize)              Dictionary bytes
   322         -     D  dictLength                   10U 0 value                                Dictionary length
   323         -      *
   324         -     D deflateCopy     PR            10I 0 extproc('deflateCopy')               Compress strm 2 strm
   325         -     D  dest                               like(z_stream)                       Destination stream
   326         -     D  source                             like(z_stream)                       Source stream
   327         -      *
   328         -     D deflateReset    PR            10I 0 extproc('deflateReset')              End and init. stream
   329         -     D  strm                               like(z_stream)                       Compression stream
   330         -      *
   331         -     D deflateParams   PR            10I 0 extproc('deflateParams')             Change level & strat
   332         -     D  strm                               like(z_stream)                       Compression stream
   333         -     D  level                        10I 0 value                                Compression level
   334         -     D  strategy                     10I 0 value                                Compression stategy
   335         -      *
   336         -     D deflateBound    PR            10U 0 extproc('deflateBound')              Change level & strat
   337         -     D  strm                               like(z_stream)                       Compression stream
   338         -     D  sourcelen                    10U 0 value                                Compression level
   339         -      *
   340         -     D deflatePending  PR            10I 0 extproc('deflatePending')            Change level & strat
   341         -     D  strm                               like(z_stream)                       Compression stream
   342         -     D  pending                      10U 0                                      Pending bytes
   343         -     D  bits                         10I 0                                      Pending bits
   344         -      *
   345         -     D deflatePrime    PR            10I 0 extproc('deflatePrime')              Change level & strat
   346         -     D  strm                               like(z_stream)                       Compression stream
   347         -     D  bits                         10I 0 value                                # of bits to insert
   348         -     D  value                        10I 0 value                                Bits to insert
   349         -      *
   350         -     D inflateInit2    PR            10I 0 extproc('inflateInit2_')             Init. expansion
   351         -     D  strm                               like(z_stream)                       Expansion stream
   352         -     D  windowBits                   10I 0 value                                log2(window size)
   353         -     D  version                        *   value options(*string)               Version string
   354         -     D  stream_size                  10i 0 value                                Stream struct. size
   355         -      *
   356         -     D inflateSetDictionary...
   357         -     D                 PR            10I 0 extproc('inflateSetDictionary')      Init. dictionary
   358         -     D  strm                               like(z_stream)                       Expansion stream
   359         -     D  dictionary                65535    const options(*varsize)              Dictionary bytes
   360         -     D  dictLength                   10U 0 value                                Dictionary length
   361         -      *
   362         -     D inflateGetDictionary...
   363         -     D                 PR            10I 0 extproc('inflateGetDictionary')      Get dictionary
   364         -     D  strm                               like(z_stream)                       Expansion stream
   365         -     D  dictionary                65535    options(*varsize)                    Dictionary bytes
   366         -     D  dictLength                   10U 0                                      Dictionary length
   367         -      *
   368         -     D inflateSync     PR            10I 0 extproc('inflateSync')               Sync. expansion
   369         -     D  strm                               like(z_stream)                       Expansion stream
   370         -      *
   371         -     D inflateCopy     PR            10I 0 extproc('inflateCopy')
   372         -     D  dest                               like(z_stream)                       Destination stream
   373         -     D  source                             like(z_stream)                       Source stream
   374         -      *
   375         -     D inflateReset    PR            10I 0 extproc('inflateReset')              End and init. stream
   376         -     D  strm                               like(z_stream)                       Expansion stream
   377         -      *
   378         -     D inflateReset2   PR            10I 0 extproc('inflateReset2')             End and init. stream
   379         -     D  strm                               like(z_stream)                       Expansion stream
   380         -     D  windowBits                   10I 0 value                                Log2(buffer size)
   381         -      *
   382         -     D inflatePrime    PR            10I 0 extproc('inflatePrime')              Insert bits
   383         -     D  strm                               like(z_stream)                       Expansion stream
   384         -     D  bits                         10I 0 value                                Bit count
   385         -     D  value                        10I 0 value                                Bits to insert
   386         -      *
   387         -     D inflateMark     PR            10I 0 extproc('inflateMark')               Get inflate info
   388         -     D  strm                               like(z_stream)                       Expansion stream
   389         -      *
   390         -     D inflateBackInit...
   391         -     D                 PR            10I 0 extproc('inflateBackInit_')
   392         -     D  strm                               like(z_stream)                       Expansion stream
   393         -     D  windowBits                   10I 0 value                                Log2(buffer size)
   394         -     D  window                    65535    options(*varsize)                    Buffer
   395         -     D  version                        *   value options(*string)               Version string
   396         -     D  stream_size                  10i 0 value                                Stream struct. size
   397         -      *
   398         -     D inflateBack     PR            10I 0 extproc('inflateBack')
   399         -     D  strm                               like(z_stream)                       Expansion stream
   400         -     D  in                             *   value procptr                        Input function
   401         -     D  in_desc                        *   value                                Input descriptor
   402         -     D  out                            *   value procptr                        Output function
   403         -     D  out_desc                       *   value                                Output descriptor
   404         -      *
   405         -     D inflateBackEnd  PR            10I 0 extproc('inflateBackEnd')
   406         -     D  strm                               like(z_stream)                       Expansion stream
   407         -      *
   408         -     D zlibCompileFlags...
   409         -     D                 PR            10U 0 extproc('zlibCompileFlags')
   410         -      *
   411         -      **************************************************************************
   412         -      *                        Checksum function prototypes
   413         -      **************************************************************************
   414         -      *
   415         -     D adler32         PR            10U 0 extproc('adler32')                   New checksum
   416         -     D  adler                        10U 0 value                                Old checksum
   417         -     D  buf                       65535    const options(*varsize)              Bytes to accumulate
   418         -     D  len                          10U 0 value                                Buffer length
   419         -      *
   420         -     D crc32           PR            10U 0 extproc('crc32')                     New checksum
   421         -     D  crc                          10U 0 value                                Old checksum
   422         -     D  buf                       65535    const options(*varsize)              Bytes to accumulate
   423         -     D  len                          10U 0 value                                Buffer length
   424         -      *
   425         -      **************************************************************************
   426         -      *                     Miscellaneous function prototypes
   427         -      **************************************************************************
   428         -      *
   429         -     D zError          PR              *   extproc('zError')                    Error string
   430         -     D  err                          10I 0 value                                Error code
   431         -      *
   432         -     D inflateSyncPoint...
   433         -     D                 PR            10I 0 extproc('inflateSyncPoint')
   434         -     D  strm                               like(z_stream)                       Expansion stream
   435         -      *
   436         -     D get_crc_table   PR              *   extproc('get_crc_table')             Ptr to ulongs
   437         -      *
   438         -     D inflateUndermine...
   439         -     D                 PR            10I 0 extproc('inflateUndermine')
   440         -     D  strm                               like(z_stream)                       Expansion stream
   441         -     D  arg                          10I 0 value                                Error code
   442         -      *
   443         -     D inflateResetKeep...
   444         -     D                 PR            10I 0 extproc('inflateResetKeep')          End and init. stream
   445         -     D  strm                               like(z_stream)                       Expansion stream
   446         -      *
   447         -     D deflateResetKeep...
   448         -     D                 PR            10I 0 extproc('deflateResetKeep')          End and init. stream
   449         -     D  strm                               like(z_stream)                       Expansion stream
   450         -      *
   451         -      /endif

Changes to jni/tcl/compat/zlib/compress.c.

     1      1   /* compress.c -- compress a memory buffer
     2         - * Copyright (C) 1995-2005 Jean-loup Gailly.
            2  + * Copyright (C) 1995-2005, 2014, 2016 Jean-loup Gailly, Mark Adler
     3      3    * For conditions of distribution and use, see copyright notice in zlib.h
     4      4    */
     5      5   
     6      6   /* @(#) $Id$ */
     7      7   
     8      8   #define ZLIB_INTERNAL
     9      9   #include "zlib.h"
................................................................................
    24     24       uLongf *destLen;
    25     25       const Bytef *source;
    26     26       uLong sourceLen;
    27     27       int level;
    28     28   {
    29     29       z_stream stream;
    30     30       int err;
           31  +    const uInt max = (uInt)-1;
           32  +    uLong left;
    31     33   
    32         -    stream.next_in = (z_const Bytef *)source;
    33         -    stream.avail_in = (uInt)sourceLen;
    34         -#ifdef MAXSEG_64K
    35         -    /* Check for source > 64K on 16-bit machine: */
    36         -    if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR;
    37         -#endif
    38         -    stream.next_out = dest;
    39         -    stream.avail_out = (uInt)*destLen;
    40         -    if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR;
           34  +    left = *destLen;
           35  +    *destLen = 0;
    41     36   
    42     37       stream.zalloc = (alloc_func)0;
    43     38       stream.zfree = (free_func)0;
    44     39       stream.opaque = (voidpf)0;
    45     40   
    46     41       err = deflateInit(&stream, level);
    47     42       if (err != Z_OK) return err;
    48     43   
    49         -    err = deflate(&stream, Z_FINISH);
    50         -    if (err != Z_STREAM_END) {
    51         -        deflateEnd(&stream);
    52         -        return err == Z_OK ? Z_BUF_ERROR : err;
    53         -    }
    54         -    *destLen = stream.total_out;
           44  +    stream.next_out = dest;
           45  +    stream.avail_out = 0;
           46  +    stream.next_in = (z_const Bytef *)source;
           47  +    stream.avail_in = 0;
           48  +
           49  +    do {
           50  +        if (stream.avail_out == 0) {
           51  +            stream.avail_out = left > (uLong)max ? max : (uInt)left;
           52  +            left -= stream.avail_out;
           53  +        }
           54  +        if (stream.avail_in == 0) {
           55  +            stream.avail_in = sourceLen > (uLong)max ? max : (uInt)sourceLen;
           56  +            sourceLen -= stream.avail_in;
           57  +        }
           58  +        err = deflate(&stream, sourceLen ? Z_NO_FLUSH : Z_FINISH);
           59  +    } while (err == Z_OK);
    55     60   
    56         -    err = deflateEnd(&stream);
    57         -    return err;
           61  +    *destLen = stream.total_out;
           62  +    deflateEnd(&stream);
           63  +    return err == Z_STREAM_END ? Z_OK : err;
    58     64   }
    59     65   
    60     66   /* ===========================================================================
    61     67    */
    62     68   int ZEXPORT compress (dest, destLen, source, sourceLen)
    63     69       Bytef *dest;
    64     70       uLongf *destLen;

Changes to jni/tcl/compat/zlib/configure.

    13     13   # If you have problems, try without defining CC and CFLAGS before reporting
    14     14   # an error.
    15     15   
    16     16   # start off configure.log
    17     17   echo -------------------- >> configure.log
    18     18   echo $0 $* >> configure.log
    19     19   date >> configure.log
           20  +
           21  +# get source directory
           22  +SRCDIR=`dirname $0`
           23  +if test $SRCDIR = "."; then
           24  +    ZINC=""
           25  +    ZINCOUT="-I."
           26  +    SRCDIR=""
           27  +else
           28  +    ZINC='-include zconf.h'
           29  +    ZINCOUT='-I. -I$(SRCDIR)'
           30  +    SRCDIR="$SRCDIR/"
           31  +fi
    20     32   
    21     33   # set command prefix for cross-compilation
    22     34   if [ -n "${CHOST}" ]; then
    23     35       uname="`echo "${CHOST}" | sed -e 's/^[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)$/\1/' -e 's/^[^-]*-[^-]*-\([^-]*\)-.*$/\1/'`"
    24     36       CROSS_PREFIX="${CHOST}-"
    25     37   fi
    26     38   
    27     39   # destination name for static library
    28     40   STATICLIB=libz.a
    29     41   
    30     42   # extract zlib version numbers from zlib.h
    31         -VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < zlib.h`
    32         -VER3=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\\.[0-9]*\).*/\1/p' < zlib.h`
    33         -VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < zlib.h`
    34         -VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < zlib.h`
           43  +VER=`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' < ${SRCDIR}zlib.h`
           44  +VER3=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\\.[0-9]*\).*/\1/p' < ${SRCDIR}zlib.h`
           45  +VER2=`sed -n -e '/VERSION "/s/.*"\([0-9]*\\.[0-9]*\)\\..*/\1/p' < ${SRCDIR}zlib.h`
           46  +VER1=`sed -n -e '/VERSION "/s/.*"\([0-9]*\)\\..*/\1/p' < ${SRCDIR}zlib.h`
    35     47   
    36     48   # establish commands for library building
    37     49   if "${CROSS_PREFIX}ar" --version >/dev/null 2>/dev/null || test $? -lt 126; then
    38     50       AR=${AR-"${CROSS_PREFIX}ar"}
    39     51       test -n "${CROSS_PREFIX}" && echo Using ${AR} | tee -a configure.log
    40     52   else
    41     53       AR=${AR-"ar"}
................................................................................
    69     81   shared=1
    70     82   solo=0
    71     83   cover=0
    72     84   zprefix=0
    73     85   zconst=0
    74     86   build64=0
    75     87   gcc=0
           88  +warn=0
           89  +debug=0
    76     90   old_cc="$CC"
    77     91   old_cflags="$CFLAGS"
    78     92   OBJC='$(OBJZ) $(OBJG)'
    79     93   PIC_OBJC='$(PIC_OBJZ) $(PIC_OBJG)'
    80     94   
    81     95   # leave this script, optionally in a bad way
    82     96   leave()
................................................................................
   117    131       --cover) cover=1; shift ;;
   118    132       -z* | --zprefix) zprefix=1; shift ;;
   119    133       -6* | --64) build64=1; shift ;;
   120    134       -a*=* | --archs=*) ARCHS=`echo $1 | sed 's/.*=//'`; shift ;;
   121    135       --sysconfdir=*) echo "ignored option: --sysconfdir" | tee -a configure.log; shift ;;
   122    136       --localstatedir=*) echo "ignored option: --localstatedir" | tee -a configure.log; shift ;;
   123    137       -c* | --const) zconst=1; shift ;;
          138  +    -w* | --warn) warn=1; shift ;;
          139  +    -d* | --debug) debug=1; shift ;;
   124    140       *)
   125    141         echo "unknown option: $1" | tee -a configure.log
   126    142         echo "$0 --help for help" | tee -a configure.log
   127    143         leave 1;;
   128    144       esac
   129    145   done
   130    146   
................................................................................
   155    171   # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
   156    172   case "$cc" in
   157    173     *gcc*) gcc=1 ;;
   158    174     *clang*) gcc=1 ;;
   159    175   esac
   160    176   case `$cc -v 2>&1` in
   161    177     *gcc*) gcc=1 ;;
          178  +  *clang*) gcc=1 ;;
   162    179   esac
   163    180   
   164    181   show $cc -c $test.c
   165    182   if test "$gcc" -eq 1 && ($cc -c $test.c) >> configure.log 2>&1; then
   166    183     echo ... using gcc >> configure.log
   167    184     CC="$cc"
   168         -  CFLAGS="${CFLAGS--O3} ${ARCHS}"
          185  +  CFLAGS="${CFLAGS--O3}"
   169    186     SFLAGS="${CFLAGS--O3} -fPIC"
   170         -  LDFLAGS="${LDFLAGS} ${ARCHS}"
          187  +  if test "$ARCHS"; then
          188  +    CFLAGS="${CFLAGS} ${ARCHS}"
          189  +    LDFLAGS="${LDFLAGS} ${ARCHS}"
          190  +  fi
   171    191     if test $build64 -eq 1; then
   172    192       CFLAGS="${CFLAGS} -m64"
   173    193       SFLAGS="${SFLAGS} -m64"
   174    194     fi
   175         -  if test "${ZLIBGCCWARN}" = "YES"; then
          195  +  if test "$warn" -eq 1; then
   176    196       if test "$zconst" -eq 1; then
   177    197         CFLAGS="${CFLAGS} -Wall -Wextra -Wcast-qual -pedantic -DZLIB_CONST"
   178    198       else
   179    199         CFLAGS="${CFLAGS} -Wall -Wextra -pedantic"
   180    200       fi
   181    201     fi
          202  +  if test $debug -eq 1; then
          203  +    CFLAGS="${CFLAGS} -DZLIB_DEBUG"
          204  +    SFLAGS="${SFLAGS} -DZLIB_DEBUG"
          205  +  fi
   182    206     if test -z "$uname"; then
   183    207       uname=`(uname -s || echo unknown) 2>/dev/null`
   184    208     fi
   185    209     case "$uname" in
   186    210     Linux* | linux* | GNU | GNU/* | solaris*)
   187         -        LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"} ;;
          211  +        LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"} ;;
   188    212     *BSD | *bsd* | DragonFly)
   189         -        LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,zlib.map"}
          213  +        LDSHARED=${LDSHARED-"$cc -shared -Wl,-soname,libz.so.1,--version-script,${SRCDIR}zlib.map"}
   190    214           LDCONFIG="ldconfig -m" ;;
   191    215     CYGWIN* | Cygwin* | cygwin* | OS/2*)
   192    216           EXE='.exe' ;;
   193    217     MINGW* | mingw*)
   194    218   # temporary bypass
   195    219           rm -f $test.[co] $test $test$shared_ext
   196    220           echo "Please use win32/Makefile.gcc instead." | tee -a configure.log
................................................................................
   283    307                        CFLAGS="$CFLAGS -xarch=amd64" ;;
   284    308                      *)
   285    309                        SFLAGS="$SFLAGS -xarch=v9"
   286    310                        CFLAGS="$CFLAGS -xarch=v9" ;;
   287    311                    esac
   288    312                fi
   289    313            fi
          314  +         if test -n "$ZINC"; then
          315  +             ZINC='-I- -I. -I$(SRCDIR)'
          316  +         fi
   290    317            ;;
   291    318     SunOS\ 4*) SFLAGS=${CFLAGS-"-O2 -PIC"}
   292    319                CFLAGS=${CFLAGS-"-O2"}
   293    320                LDSHARED=${LDSHARED-"ld"} ;;
   294    321     SunStudio\ 9*) SFLAGS=${CFLAGS-"-fast -xcode=pic32 -xtarget=ultra3 -xarch=v9b"}
   295    322                CFLAGS=${CFLAGS-"-fast -xtarget=ultra3 -xarch=v9b"}
   296    323                LDSHARED=${LDSHARED-"cc -xarch=v9b"} ;;
................................................................................
   333    360     try()
   334    361     {
   335    362       show $*
   336    363       test "`( $* ) 2>&1 | tee -a configure.log`" = ""
   337    364     }
   338    365     echo - using any output from compiler to indicate an error >> configure.log
   339    366   else
   340         -try()
   341         -{
   342         -  show $*
   343         -  ( $* ) >> configure.log 2>&1
   344         -  ret=$?
   345         -  if test $ret -ne 0; then
   346         -    echo "(exit code "$ret")" >> configure.log
   347         -  fi
   348         -  return $ret
   349         -}
          367  +  try()
          368  +  {
          369  +    show $*
          370  +    ( $* ) >> configure.log 2>&1
          371  +    ret=$?
          372  +    if test $ret -ne 0; then
          373  +      echo "(exit code "$ret")" >> configure.log
          374  +    fi
          375  +    return $ret
          376  +  }
   350    377   fi
   351    378   
   352    379   tryboth()
   353    380   {
   354    381     show $*
   355    382     got=`( $* ) 2>&1`
   356    383     ret=$?
................................................................................
   418    445       else
   419    446         echo Checking for underline in external names... Yes. | tee -a configure.log
   420    447       fi ;;
   421    448   esac
   422    449   
   423    450   echo >> configure.log
   424    451   
          452  +# check for size_t
          453  +cat > $test.c <<EOF
          454  +#include <stdio.h>
          455  +#include <stdlib.h>
          456  +size_t dummy = 0;
          457  +EOF
          458  +if try $CC -c $CFLAGS $test.c; then
          459  +  echo "Checking for size_t... Yes." | tee -a configure.log
          460  +  need_sizet=0
          461  +else
          462  +  echo "Checking for size_t... No." | tee -a configure.log
          463  +  need_sizet=1
          464  +fi
          465  +
          466  +echo >> configure.log
          467  +
          468  +# find the size_t integer type, if needed
          469  +if test $need_sizet -eq 1; then
          470  +  cat > $test.c <<EOF
          471  +long long dummy = 0;
          472  +EOF
          473  +  if try $CC -c $CFLAGS $test.c; then
          474  +    echo "Checking for long long... Yes." | tee -a configure.log
          475  +    cat > $test.c <<EOF
          476  +#include <stdio.h>
          477  +int main(void) {
          478  +    if (sizeof(void *) <= sizeof(int)) puts("int");
          479  +    else if (sizeof(void *) <= sizeof(long)) puts("long");
          480  +    else puts("z_longlong");
          481  +    return 0;
          482  +}
          483  +EOF
          484  +  else
          485  +    echo "Checking for long long... No." | tee -a configure.log
          486  +    cat > $test.c <<EOF
          487  +#include <stdio.h>
          488  +int main(void) {
          489  +    if (sizeof(void *) <= sizeof(int)) puts("int");
          490  +    else puts("long");
          491  +    return 0;
          492  +}
          493  +EOF
          494  +  fi
          495  +  if try $CC $CFLAGS -o $test $test.c; then
          496  +    sizet=`./$test`
          497  +    echo "Checking for a pointer-size integer type..." $sizet"." | tee -a configure.log
          498  +  else
          499  +    echo "Failed to find a pointer-size integer type." | tee -a configure.log
          500  +    leave 1
          501  +  fi
          502  +fi
          503  +
          504  +if test $need_sizet -eq 1; then
          505  +  CFLAGS="${CFLAGS} -DNO_SIZE_T=${sizet}"
          506  +  SFLAGS="${SFLAGS} -DNO_SIZE_T=${sizet}"
          507  +fi
          508  +
          509  +echo >> configure.log
          510  +
   425    511   # check for large file support, and if none, check for fseeko()
   426    512   cat > $test.c <<EOF
   427    513   #include <sys/types.h>
   428    514   off64_t dummy = 0;
   429    515   EOF
   430    516   if try $CC -c $CFLAGS -D_LARGEFILE64_SOURCE=1 $test.c; then
   431    517     CFLAGS="${CFLAGS} -D_LARGEFILE64_SOURCE=1"
................................................................................
   466    552   else
   467    553     CFLAGS="${CFLAGS} -DNO_STRERROR"
   468    554     SFLAGS="${SFLAGS} -DNO_STRERROR"
   469    555     echo "Checking for strerror... No." | tee -a configure.log
   470    556   fi
   471    557   
   472    558   # copy clean zconf.h for subsequent edits
   473         -cp -p zconf.h.in zconf.h
          559  +cp -p ${SRCDIR}zconf.h.in zconf.h
   474    560   
   475    561   echo >> configure.log
   476    562   
   477    563   # check for unistd.h and save result in zconf.h
   478    564   cat > $test.c <<EOF
   479    565   #include <unistd.h>
   480    566   int main() { return 0; }
................................................................................
   760    846   echo SHAREDLIB = $SHAREDLIB >> configure.log
   761    847   echo SHAREDLIBM = $SHAREDLIBM >> configure.log
   762    848   echo SHAREDLIBV = $SHAREDLIBV >> configure.log
   763    849   echo STATICLIB = $STATICLIB >> configure.log
   764    850   echo TEST = $TEST >> configure.log
   765    851   echo VER = $VER >> configure.log
   766    852   echo Z_U4 = $Z_U4 >> configure.log
          853  +echo SRCDIR = $SRCDIR >> configure.log
   767    854   echo exec_prefix = $exec_prefix >> configure.log
   768    855   echo includedir = $includedir >> configure.log
   769    856   echo libdir = $libdir >> configure.log
   770    857   echo mandir = $mandir >> configure.log
   771    858   echo prefix = $prefix >> configure.log
   772    859   echo sharedlibdir = $sharedlibdir >> configure.log
   773    860   echo uname = $uname >> configure.log
   774    861   
   775    862   # udpate Makefile with the configure results
   776         -sed < Makefile.in "
          863  +sed < ${SRCDIR}Makefile.in "
   777    864   /^CC *=/s#=.*#=$CC#
   778    865   /^CFLAGS *=/s#=.*#=$CFLAGS#
   779    866   /^SFLAGS *=/s#=.*#=$SFLAGS#
   780    867   /^LDFLAGS *=/s#=.*#=$LDFLAGS#
   781    868   /^LDSHARED *=/s#=.*#=$LDSHARED#
   782    869   /^CPP *=/s#=.*#=$CPP#
   783    870   /^STATICLIB *=/s#=.*#=$STATICLIB#
................................................................................
   786    873   /^SHAREDLIBM *=/s#=.*#=$SHAREDLIBM#
   787    874   /^AR *=/s#=.*#=$AR#
   788    875   /^ARFLAGS *=/s#=.*#=$ARFLAGS#
   789    876   /^RANLIB *=/s#=.*#=$RANLIB#
   790    877   /^LDCONFIG *=/s#=.*#=$LDCONFIG#
   791    878   /^LDSHAREDLIBC *=/s#=.*#=$LDSHAREDLIBC#
   792    879   /^EXE *=/s#=.*#=$EXE#
          880  +/^SRCDIR *=/s#=.*#=$SRCDIR#
          881  +/^ZINC *=/s#=.*#=$ZINC#
          882  +/^ZINCOUT *=/s#=.*#=$ZINCOUT#
   793    883   /^prefix *=/s#=.*#=$prefix#
   794    884   /^exec_prefix *=/s#=.*#=$exec_prefix#
   795    885   /^libdir *=/s#=.*#=$libdir#
   796    886   /^sharedlibdir *=/s#=.*#=$sharedlibdir#
   797    887   /^includedir *=/s#=.*#=$includedir#
   798    888   /^mandir *=/s#=.*#=$mandir#
   799    889   /^OBJC *=/s#=.*#= $OBJC#
   800    890   /^PIC_OBJC *=/s#=.*#= $PIC_OBJC#
   801    891   /^all: */s#:.*#: $ALL#
   802    892   /^test: */s#:.*#: $TEST#
   803    893   " > Makefile
   804    894   
   805    895   # create zlib.pc with the configure results
   806         -sed < zlib.pc.in "
          896  +sed < ${SRCDIR}zlib.pc.in "
   807    897   /^CC *=/s#=.*#=$CC#
   808    898   /^CFLAGS *=/s#=.*#=$CFLAGS#
   809    899   /^CPP *=/s#=.*#=$CPP#
   810    900   /^LDSHARED *=/s#=.*#=$LDSHARED#
   811    901   /^STATICLIB *=/s#=.*#=$STATICLIB#
   812    902   /^SHAREDLIB *=/s#=.*#=$SHAREDLIB#
   813    903   /^SHAREDLIBV *=/s#=.*#=$SHAREDLIBV#

Changes to jni/tcl/compat/zlib/contrib/README.contrib.

    34     34   
    35     35   inflate86/  by Chris Anderson <christop@charm.net>
    36     36           Tuned x86 gcc asm code to replace inflate_fast()
    37     37   
    38     38   iostream/   by Kevin Ruland <kevin@rodin.wustl.edu>
    39     39           A C++ I/O streams interface to the zlib gz* functions
    40     40   
    41         -iostream2/  by Tyge Lvset <Tyge.Lovset@cmr.no>
           41  +iostream2/  by Tyge Løvset <Tyge.Lovset@cmr.no>
    42     42           Another C++ I/O streams interface
    43     43   
    44     44   iostream3/  by Ludwig Schwardt <schwardt@sun.ac.za>
    45     45               and Kevin Ruland <kevin@rodin.wustl.edu>
    46     46           Yet another C++ I/O streams interface
    47     47   
    48     48   masmx64/    by Gilles Vollant <info@winimage.com>
................................................................................
    54     54           x86 asm code to replace longest_match() and inflate_fast(),
    55     55           for Visual C++ and MASM (32 bits).
    56     56           Based on Brian Raiter (asm686) and Chris Anderson (inflate86)
    57     57   
    58     58   minizip/    by Gilles Vollant <info@winimage.com>
    59     59           Mini zip and unzip based on zlib
    60     60           Includes Zip64 support by Mathias Svensson <mathias@result42.com>
    61         -        See http://www.winimage.com/zLibDll/unzip.html
           61  +        See http://www.winimage.com/zLibDll/minizip.html
    62     62   
    63     63   pascal/     by Bob Dellaca <bobdl@xtra.co.nz> et al.
    64     64           Support for Pascal
    65     65   
    66     66   puff/       by Mark Adler <madler@alumni.caltech.edu>
    67     67           Small, low memory usage inflate.  Also serves to provide an
    68     68           unambiguous description of the deflate format.

Changes to jni/tcl/compat/zlib/contrib/ada/zlib-streams.ads.

    27     27         Item   : in     Ada.Streams.Stream_Element_Array);
    28     28   
    29     29      procedure Flush
    30     30        (Stream : in out Stream_Type;
    31     31         Mode   : in     Flush_Mode := Sync_Flush);
    32     32      --  Flush the written data to the back stream,
    33     33      --  all data placed to the compressor is flushing to the Back stream.
    34         -   --  Should not be used untill necessary, becouse it is decreasing
           34  +   --  Should not be used until necessary, because it is decreasing
    35     35      --  compression.
    36     36   
    37     37      function Read_Total_In (Stream : in Stream_Type) return Count;
    38     38      pragma Inline (Read_Total_In);
    39     39      --  Return total number of bytes read from back stream so far.
    40     40   
    41     41      function Read_Total_Out (Stream : in Stream_Type) return Count;
................................................................................
    93     93         Mode       : Stream_Mode;
    94     94   
    95     95         Buffer     : Buffer_Access;
    96     96         Rest_First : Stream_Element_Offset;
    97     97         Rest_Last  : Stream_Element_Offset;
    98     98         --  Buffer for Read operation.
    99     99         --  We need to have this buffer in the record
   100         -      --  becouse not all read data from back stream
          100  +      --  because not all read data from back stream
   101    101         --  could be processed during the read operation.
   102    102   
   103    103         Buffer_Size : Stream_Element_Offset;
   104    104         --  Buffer size for write operation.
   105    105         --  We do not need to have this buffer
   106         -      --  in the record becouse all data could be
          106  +      --  in the record because all data could be
   107    107         --  processed in the write operation.
   108    108   
   109    109         Back       : Stream_Access;
   110    110         Reader     : Filter_Type;
   111    111         Writer     : Filter_Type;
   112    112      end record;
   113    113   
   114    114   end ZLib.Streams;

Changes to jni/tcl/compat/zlib/contrib/ada/zlib-thin.ads.

   432    432      pragma Import (C, compressBound, "compressBound");
   433    433      pragma Import (C, deflateBound, "deflateBound");
   434    434      pragma Import (C, gzungetc, "gzungetc");
   435    435      pragma Import (C, zlibCompileFlags, "zlibCompileFlags");
   436    436   
   437    437      pragma Import (C, inflateBackInit, "inflateBackInit_");
   438    438   
   439         -   --  I stopped binding the inflateBack routines, becouse realize that
          439  +   --  I stopped binding the inflateBack routines, because realize that
   440    440      --  it does not support zlib and gzip headers for now, and have no
   441    441      --  symmetric deflateBack routines.
   442    442      --  ZLib-Ada is symmetric regarding deflate/inflate data transformation
   443    443      --  and has a similar generic callback interface for the
   444    444      --  deflate/inflate transformation based on the regular Deflate/Inflate
   445    445      --  routines.
   446    446   
   447    447      --  pragma Import (C, inflateBack, "inflateBack");
   448    448      --  pragma Import (C, inflateBackEnd, "inflateBackEnd");
   449    449   
   450    450   end ZLib.Thin;

Changes to jni/tcl/compat/zlib/contrib/blast/blast.c.

     1      1   /* blast.c
     2         - * Copyright (C) 2003, 2012 Mark Adler
            2  + * Copyright (C) 2003, 2012, 2013 Mark Adler
     3      3    * For conditions of distribution and use, see copyright notice in blast.h
     4         - * version 1.2, 24 Oct 2012
            4  + * version 1.3, 24 Aug 2013
     5      5    *
     6      6    * blast.c decompresses data compressed by the PKWare Compression Library.
     7      7    * This function provides functionality similar to the explode() function of
     8      8    * the PKWare library, hence the name "blast".
     9      9    *
    10     10    * This decompressor is based on the excellent format description provided by
    11     11    * Ben Rudiak-Gould in comp.compression on August 13, 2001.  Interestingly, the
................................................................................
    20     20   /*
    21     21    * Change history:
    22     22    *
    23     23    * 1.0  12 Feb 2003     - First version
    24     24    * 1.1  16 Feb 2003     - Fixed distance check for > 4 GB uncompressed data
    25     25    * 1.2  24 Oct 2012     - Add note about using binary mode in stdio
    26     26    *                      - Fix comparisons of differently signed integers
           27  + * 1.3  24 Aug 2013     - Return unused input from blast()
           28  + *                      - Fix test code to correctly report unused input
           29  + *                      - Enable the provision of initial input to blast()
    27     30    */
    28     31   
           32  +#include <stddef.h>             /* for NULL */
    29     33   #include <setjmp.h>             /* for setjmp(), longjmp(), and jmp_buf */
    30     34   #include "blast.h"              /* prototype for blast() */
    31     35   
    32     36   #define local static            /* for local function definitions */
    33     37   #define MAXBITS 13              /* maximum code length */
    34     38   #define MAXWIN 4096             /* maximum window size */
    35     39   
................................................................................
   252    256    *   coded distance to represent a string that occurs earlier in the
   253    257    *   uncompressed data that occurs again at the current location.
   254    258    *
   255    259    * - A bit preceding a literal or length/distance pair indicates which comes
   256    260    *   next, 0 for literals, 1 for length/distance.
   257    261    *
   258    262    * - If literals are uncoded, then the next eight bits are the literal, in the
   259         - *   normal bit order in th stream, i.e. no bit-reversal is needed. Similarly,
          263  + *   normal bit order in the stream, i.e. no bit-reversal is needed. Similarly,
   260    264    *   no bit reversal is needed for either the length extra bits or the distance
   261    265    *   extra bits.
   262    266    *
   263    267    * - Literal bytes are simply written to the output.  A length/distance pair is
   264    268    *   an instruction to copy previously uncompressed bytes to the output.  The
   265    269    *   copy is from distance bytes back in the output stream, copying for length
   266    270    *   bytes.
................................................................................
   372    376               }
   373    377           }
   374    378       } while (1);
   375    379       return 0;
   376    380   }
   377    381   
   378    382   /* See comments in blast.h */
   379         -int blast(blast_in infun, void *inhow, blast_out outfun, void *outhow)
          383  +int blast(blast_in infun, void *inhow, blast_out outfun, void *outhow,
          384  +          unsigned *left, unsigned char **in)
   380    385   {
   381    386       struct state s;             /* input/output state */
   382    387       int err;                    /* return value */
   383    388   
   384    389       /* initialize input state */
   385    390       s.infun = infun;
   386    391       s.inhow = inhow;
   387         -    s.left = 0;
          392  +    if (left != NULL && *left) {
          393  +        s.left = *left;
          394  +        s.in = *in;
          395  +    }
          396  +    else
          397  +        s.left = 0;
   388    398       s.bitbuf = 0;
   389    399       s.bitcnt = 0;
   390    400   
   391    401       /* initialize output state */
   392    402       s.outfun = outfun;
   393    403       s.outhow = outhow;
   394    404       s.next = 0;
................................................................................
   396    406   
   397    407       /* return if bits() or decode() tries to read past available input */
   398    408       if (setjmp(s.env) != 0)             /* if came back here via longjmp(), */
   399    409           err = 2;                        /*  then skip decomp(), return error */
   400    410       else
   401    411           err = decomp(&s);               /* decompress */
   402    412   
          413  +    /* return unused input */
          414  +    if (left != NULL)
          415  +        *left = s.left;
          416  +    if (in != NULL)
          417  +        *in = s.left ? s.in : NULL;
          418  +
   403    419       /* write any leftover output and update the error code if needed */
   404    420       if (err != 1 && s.next && s.outfun(s.outhow, s.out, s.next) && err == 0)
   405    421           err = 1;
   406    422       return err;
   407    423   }
   408    424   
   409    425   #ifdef TEST
................................................................................
   425    441   {
   426    442       return fwrite(buf, 1, len, (FILE *)how) != len;
   427    443   }
   428    444   
   429    445   /* Decompress a PKWare Compression Library stream from stdin to stdout */
   430    446   int main(void)
   431    447   {
   432         -    int ret, n;
          448  +    int ret;
          449  +    unsigned left;
   433    450   
   434    451       /* decompress to stdout */
   435         -    ret = blast(inf, stdin, outf, stdout);
   436         -    if (ret != 0) fprintf(stderr, "blast error: %d\n", ret);
          452  +    left = 0;
          453  +    ret = blast(inf, stdin, outf, stdout, &left, NULL);
          454  +    if (ret != 0)
          455  +        fprintf(stderr, "blast error: %d\n", ret);
   437    456   
   438         -    /* see if there are any leftover bytes */
   439         -    n = 0;
   440         -    while (getchar() != EOF) n++;
   441         -    if (n) fprintf(stderr, "blast warning: %d unused bytes of input\n", n);
          457  +    /* count any leftover bytes */
          458  +    while (getchar() != EOF)
          459  +        left++;
          460  +    if (left)
          461  +        fprintf(stderr, "blast warning: %u unused bytes of input\n", left);
   442    462   
   443    463       /* return blast() error code */
   444    464       return ret;
   445    465   }
   446    466   #endif

Changes to jni/tcl/compat/zlib/contrib/blast/blast.h.

     1      1   /* blast.h -- interface for blast.c
     2         -  Copyright (C) 2003, 2012 Mark Adler
     3         -  version 1.2, 24 Oct 2012
            2  +  Copyright (C) 2003, 2012, 2013 Mark Adler
            3  +  version 1.3, 24 Aug 2013
     4      4   
     5      5     This software is provided 'as-is', without any express or implied
     6      6     warranty.  In no event will the author be held liable for any damages
     7      7     arising from the use of this software.
     8      8   
     9      9     Permission is granted to anyone to use this software for any purpose,
    10     10     including commercial applications, and to alter it and redistribute it
................................................................................
    38     38   typedef unsigned (*blast_in)(void *how, unsigned char **buf);
    39     39   typedef int (*blast_out)(void *how, unsigned char *buf, unsigned len);
    40     40   /* Definitions for input/output functions passed to blast().  See below for
    41     41    * what the provided functions need to do.
    42     42    */
    43     43   
    44     44   
    45         -int blast(blast_in infun, void *inhow, blast_out outfun, void *outhow);
           45  +int blast(blast_in infun, void *inhow, blast_out outfun, void *outhow,
           46  +          unsigned *left, unsigned char **in);
    46     47   /* Decompress input to output using the provided infun() and outfun() calls.
    47     48    * On success, the return value of blast() is zero.  If there is an error in
    48     49    * the source data, i.e. it is not in the proper format, then a negative value
    49     50    * is returned.  If there is not enough input available or there is not enough
    50     51    * output space, then a positive error is returned.
    51     52    *
    52     53    * The input function is invoked: len = infun(how, &buf), where buf is set by
    53     54    * infun() to point to the input buffer, and infun() returns the number of
    54     55    * available bytes there.  If infun() returns zero, then blast() returns with
    55     56    * an input error.  (blast() only asks for input if it needs it.)  inhow is for
    56     57    * use by the application to pass an input descriptor to infun(), if desired.
    57     58    *
           59  + * If left and in are not NULL and *left is not zero when blast() is called,
           60  + * then the *left bytes are *in are consumed for input before infun() is used.
           61  + *
    58     62    * The output function is invoked: err = outfun(how, buf, len), where the bytes
    59     63    * to be written are buf[0..len-1].  If err is not zero, then blast() returns
    60     64    * with an output error.  outfun() is always called with len <= 4096.  outhow
    61     65    * is for use by the application to pass an output descriptor to outfun(), if
    62     66    * desired.
           67  + *
           68  + * If there is any unused input, *left is set to the number of bytes that were
           69  + * read and *in points to them.  Otherwise *left is set to zero and *in is set
           70  + * to NULL.  If left or in are NULL, then they are not set.
    63     71    *
    64     72    * The return codes are:
    65     73    *
    66     74    *   2:  ran out of input before completing decompression
    67     75    *   1:  output error before completing decompression
    68     76    *   0:  successful decompression
    69     77    *  -1:  literal flag not zero or one
    70     78    *  -2:  dictionary size not in 4..6
    71     79    *  -3:  distance is too far back
    72     80    *
    73     81    * At the bottom of blast.c is an example program that uses blast() that can be
    74     82    * compiled to produce a command-line decompression filter by defining TEST.
    75     83    */

Changes to jni/tcl/compat/zlib/contrib/delphi/ZLib.pas.

   148    148          InBytes = number of bytes in InBuf
   149    149     Out: OutBuf = ptr to user-allocated buffer to contain decompressed data
   150    150          BufSize = number of bytes in OutBuf   }
   151    151   procedure DecompressToUserBuf(const InBuf: Pointer; InBytes: Integer;
   152    152     const OutBuf: Pointer; BufSize: Integer);
   153    153   
   154    154   const
   155         -  zlib_version = '1.2.8';
          155  +  zlib_version = '1.2.9';
   156    156   
   157    157   type
   158    158     EZlibError = class(Exception);
   159    159     ECompressionError = class(EZlibError);
   160    160     EDecompressionError = class(EZlibError);
   161    161   
   162    162   implementation

Changes to jni/tcl/compat/zlib/contrib/dotzlib/DotZLib/UnitTests.cs.

   152    152       public class InfoTests
   153    153       {
   154    154           #region Info tests
   155    155           [Test]
   156    156           public void Info_Version()
   157    157           {
   158    158               Info info = new Info();
   159         -            Assert.AreEqual("1.2.8", Info.Version);
          159  +            Assert.AreEqual("1.2.9", Info.Version);
   160    160               Assert.AreEqual(32, info.SizeOfUInt);
   161    161               Assert.AreEqual(32, info.SizeOfULong);
   162    162               Assert.AreEqual(32, info.SizeOfPointer);
   163    163               Assert.AreEqual(32, info.SizeOfOffset);
   164    164           }
   165    165           #endregion
   166    166       }

Changes to jni/tcl/compat/zlib/contrib/infback9/inftree9.c.

     1      1   /* inftree9.c -- generate Huffman trees for efficient decoding
     2         - * Copyright (C) 1995-2013 Mark Adler
            2  + * Copyright (C) 1995-2016 Mark Adler
     3      3    * For conditions of distribution and use, see copyright notice in zlib.h
     4      4    */
     5      5   
     6      6   #include "zutil.h"
     7      7   #include "inftree9.h"
     8      8   
     9      9   #define MAXBITS 15
    10     10   
    11     11   const char inflate9_copyright[] =
    12         -   " inflate9 1.2.8 Copyright 1995-2013 Mark Adler ";
           12  +   " inflate9 1.2.9 Copyright 1995-2016 Mark Adler ";
    13     13   /*
    14     14     If you use the zlib library in a product, an acknowledgment is welcome
    15     15     in the documentation of your product. If for some reason you cannot
    16     16     include such an acknowledgment, I would appreciate that you keep this
    17     17     copyright string in the executable of your product.
    18     18    */
    19     19   
................................................................................
    60     60       static const unsigned short lbase[31] = { /* Length codes 257..285 base */
    61     61           3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17,
    62     62           19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115,
    63     63           131, 163, 195, 227, 3, 0, 0};
    64     64       static const unsigned short lext[31] = { /* Length codes 257..285 extra */
    65     65           128, 128, 128, 128, 128, 128, 128, 128, 129, 129, 129, 129,
    66     66           130, 130, 130, 130, 131, 131, 131, 131, 132, 132, 132, 132,
    67         -        133, 133, 133, 133, 144, 72, 78};
           67  +        133, 133, 133, 133, 144, 192, 79};
    68     68       static const unsigned short dbase[32] = { /* Distance codes 0..31 base */
    69     69           1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49,
    70     70           65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073,
    71     71           4097, 6145, 8193, 12289, 16385, 24577, 32769, 49153};
    72     72       static const unsigned short dext[32] = { /* Distance codes 0..31 extra */
    73     73           128, 128, 128, 128, 129, 129, 130, 130, 131, 131, 132, 132,
    74     74           133, 133, 134, 134, 135, 135, 136, 136, 137, 137, 138, 138,

Changes to jni/tcl/compat/zlib/contrib/minizip/configure.ac.

     1      1   #                                               -*- Autoconf -*-
     2      2   # Process this file with autoconf to produce a configure script.
     3      3   
     4         -AC_INIT([minizip], [1.2.8], [bugzilla.redhat.com])
            4  +AC_INIT([minizip], [1.2.9], [bugzilla.redhat.com])
     5      5   AC_CONFIG_SRCDIR([minizip.c])
     6      6   AM_INIT_AUTOMAKE([foreign])
     7      7   LT_INIT
     8      8   
     9      9   AC_MSG_CHECKING([whether to build example programs])
    10     10   AC_ARG_ENABLE([demos], AC_HELP_STRING([--enable-demos], [build example programs]))
    11     11   AM_CONDITIONAL([COND_DEMOS], [test "$enable_demos" = yes])

Changes to jni/tcl/compat/zlib/contrib/minizip/iowin32.c.

    22     22   #endif
    23     23   
    24     24   #ifndef INVALID_SET_FILE_POINTER
    25     25   #define INVALID_SET_FILE_POINTER ((DWORD)-1)
    26     26   #endif
    27     27   
    28     28   
           29  +// see Include/shared/winapifamily.h in the Windows Kit
    29     30   #if defined(WINAPI_FAMILY_PARTITION) && (!(defined(IOWIN32_USING_WINRT_API)))
    30         -#if WINAPI_FAMILY_PARTITION(WINAPI_PARTITION_APP)
           31  +#if WINAPI_FAMILY_ONE_PARTITION(WINAPI_FAMILY, WINAPI_PARTITION_APP)
    31     32   #define IOWIN32_USING_WINRT_API 1
    32     33   #endif
    33     34   #endif
    34     35   
    35     36   voidpf  ZCALLBACK win32_open_file_func  OF((voidpf opaque, const char* filename, int mode));
    36     37   uLong   ZCALLBACK win32_read_file_func  OF((voidpf opaque, voidpf stream, void* buf, uLong size));
    37     38   uLong   ZCALLBACK win32_write_file_func OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
................................................................................
   239    240   
   240    241   static BOOL MySetFilePointerEx(HANDLE hFile, LARGE_INTEGER pos, LARGE_INTEGER *newPos,  DWORD dwMoveMethod)
   241    242   {
   242    243   #ifdef IOWIN32_USING_WINRT_API
   243    244       return SetFilePointerEx(hFile, pos, newPos, dwMoveMethod);
   244    245   #else
   245    246       LONG lHigh = pos.HighPart;
   246         -    DWORD dwNewPos = SetFilePointer(hFile, pos.LowPart, &lHigh, FILE_CURRENT);
          247  +    DWORD dwNewPos = SetFilePointer(hFile, pos.LowPart, &lHigh, dwMoveMethod);
   247    248       BOOL fOk = TRUE;
   248    249       if (dwNewPos == 0xFFFFFFFF)
   249    250           if (GetLastError() != NO_ERROR)
   250    251               fOk = FALSE;
   251    252       if ((newPos != NULL) && (fOk))
   252    253       {
   253    254           newPos->LowPart = dwNewPos;
................................................................................
   366    367           default: return -1;
   367    368       }
   368    369   
   369    370       if (hFile)
   370    371       {
   371    372           LARGE_INTEGER pos;
   372    373           pos.QuadPart = offset;
   373         -        if (!MySetFilePointerEx(hFile, pos, NULL, FILE_CURRENT))
          374  +        if (!MySetFilePointerEx(hFile, pos, NULL, dwMoveMethod))
   374    375           {
   375    376               DWORD dwErr = GetLastError();
   376    377               ((WIN32FILE_IOWIN*)stream) -> error=(int)dwErr;
   377    378               ret = -1;
   378    379           }
   379    380           else
   380    381               ret=0;

Changes to jni/tcl/compat/zlib/contrib/minizip/unzip.c.

   196    196   #ifndef NOUNCRYPT
   197    197   #include "crypt.h"
   198    198   #endif
   199    199   
   200    200   /* ===========================================================================
   201    201        Read a byte from a gz_stream; update next_in and avail_in. Return EOF
   202    202      for end of file.
   203         -   IN assertion: the stream s has been sucessfully opened for reading.
          203  +   IN assertion: the stream s has been successfully opened for reading.
   204    204   */
   205    205   
   206    206   
   207    207   local int unz64local_getByte OF((
   208    208       const zlib_filefunc64_32_def* pzlib_filefunc_def,
   209    209       voidpf filestream,
   210    210       int *pi));

Changes to jni/tcl/compat/zlib/contrib/minizip/zip.c.

    11     11   
    12     12            Changes
    13     13      Oct-2009 - Mathias Svensson - Remove old C style function prototypes
    14     14      Oct-2009 - Mathias Svensson - Added Zip64 Support when creating new file archives
    15     15      Oct-2009 - Mathias Svensson - Did some code cleanup and refactoring to get better overview of some functions.
    16     16      Oct-2009 - Mathias Svensson - Added zipRemoveExtraInfoBlock to strip extra field data from its ZIP64 data
    17     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 automatically added to items that needs it, and existing ZIP64 data need to be removed.
    19     19      Oct-2009 - Mathias Svensson - Added support for BZIP2 as compression mode (bzip2 lib is required)
    20     20      Jan-2010 - back to unzip and minizip 1.0 name scheme, with compatibility layer
    21     21   
    22     22   */
    23     23   
    24     24   
    25     25   #include <stdio.h>
................................................................................
   112    112   #define SIZECENTRALHEADER (0x2e) /* 46 */
   113    113   
   114    114   typedef struct linkedlist_datablock_internal_s
   115    115   {
   116    116     struct linkedlist_datablock_internal_s* next_datablock;
   117    117     uLong  avail_in_this_block;
   118    118     uLong  filled_in_this_block;
   119         -  uLong  unused; /* for future use and alignement */
          119  +  uLong  unused; /* for future use and alignment */
   120    120     unsigned char data[SIZEDATA_INDATABLOCK];
   121    121   } linkedlist_datablock_internal;
   122    122   
   123    123   typedef struct linkedlist_data_s
   124    124   {
   125    125       linkedlist_datablock_internal* first_block;
   126    126       linkedlist_datablock_internal* last_block;
................................................................................
   167    167       zlib_filefunc64_32_def z_filefunc;
   168    168       voidpf filestream;        /* io structore of the zipfile */
   169    169       linkedlist_data central_dir;/* datablock with central dir in construction*/
   170    170       int  in_opened_file_inzip;  /* 1 if a file in the zip is currently writ.*/
   171    171       curfile64_info ci;            /* info on the file curretly writing */
   172    172   
   173    173       ZPOS64_T begin_pos;            /* position of the beginning of the zipfile */
   174         -    ZPOS64_T add_position_when_writting_offset;
          174  +    ZPOS64_T add_position_when_writing_offset;
   175    175       ZPOS64_T number_entry;
   176    176   
   177    177   #ifndef NO_ADDFILEINEXISTINGZIP
   178    178       char *globalcomment;
   179    179   #endif
   180    180   
   181    181   } zip64_internal;
................................................................................
   803    803       {
   804    804         size_comment = ZREAD64(pziinit->z_filefunc, pziinit->filestream, pziinit->globalcomment,size_comment);
   805    805         pziinit->globalcomment[size_comment]=0;
   806    806       }
   807    807     }
   808    808   
   809    809     byte_before_the_zipfile = central_pos - (offset_central_dir+size_central_dir);
   810         -  pziinit->add_position_when_writting_offset = byte_before_the_zipfile;
          810  +  pziinit->add_position_when_writing_offset = byte_before_the_zipfile;
   811    811   
   812    812     {
   813    813       ZPOS64_T size_central_dir_to_read = size_central_dir;
   814    814       size_t buf_size = SIZEDATA_INDATABLOCK;
   815    815       void* buf_read = (void*)ALLOC(buf_size);
   816    816       if (ZSEEK64(pziinit->z_filefunc, pziinit->filestream, offset_central_dir + byte_before_the_zipfile, ZLIB_FILEFUNC_SEEK_SET) != 0)
   817    817         err=ZIP_ERRNO;
................................................................................
   871    871       if (append == APPEND_STATUS_CREATEAFTER)
   872    872           ZSEEK64(ziinit.z_filefunc,ziinit.filestream,0,SEEK_END);
   873    873   
   874    874       ziinit.begin_pos = ZTELL64(ziinit.z_filefunc,ziinit.filestream);
   875    875       ziinit.in_opened_file_inzip = 0;
   876    876       ziinit.ci.stream_initialised = 0;
   877    877       ziinit.number_entry = 0;
   878         -    ziinit.add_position_when_writting_offset = 0;
          878  +    ziinit.add_position_when_writing_offset = 0;
   879    879       init_linkedlist(&(ziinit.central_dir));
   880    880   
   881    881   
   882    882   
   883    883       zi = (zip64_internal*)ALLOC(sizeof(zip64_internal));
   884    884       if (zi==NULL)
   885    885       {
................................................................................
  1160   1160           zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)0,4);
  1161   1161       else
  1162   1162           zip64local_putValue_inmemory(zi->ci.central_header+38,(uLong)zipfi->external_fa,4);
  1163   1163   
  1164   1164       if(zi->ci.pos_local_header >= 0xffffffff)
  1165   1165         zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)0xffffffff,4);
  1166   1166       else
  1167         -      zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header - zi->add_position_when_writting_offset,4);
         1167  +      zip64local_putValue_inmemory(zi->ci.central_header+42,(uLong)zi->ci.pos_local_header - zi->add_position_when_writing_offset,4);
  1168   1168   
  1169   1169       for (i=0;i<size_filename;i++)
  1170   1170           *(zi->ci.central_header+SIZECENTRALHEADER+i) = *(filename+i);
  1171   1171   
  1172   1172       for (i=0;i<size_extrafield_global;i++)
  1173   1173           *(zi->ci.central_header+SIZECENTRALHEADER+size_filename+i) =
  1174   1174                 *(((const char*)extrafield_global)+i);
................................................................................
  1751   1751   {
  1752   1752       return zipCloseFileInZipRaw (file,0,0);
  1753   1753   }
  1754   1754   
  1755   1755   int Write_Zip64EndOfCentralDirectoryLocator(zip64_internal* zi, ZPOS64_T zip64eocd_pos_inzip)
  1756   1756   {
  1757   1757     int err = ZIP_OK;
  1758         -  ZPOS64_T pos = zip64eocd_pos_inzip - zi->add_position_when_writting_offset;
         1758  +  ZPOS64_T pos = zip64eocd_pos_inzip - zi->add_position_when_writing_offset;
  1759   1759   
  1760   1760     err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)ZIP64ENDLOCHEADERMAGIC,4);
  1761   1761   
  1762   1762     /*num disks*/
  1763   1763       if (err==ZIP_OK) /* number of the disk with the start of the central directory */
  1764   1764         err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)0,4);
  1765   1765   
................................................................................
  1804   1804       err = zip64local_putValue(&zi->z_filefunc, zi->filestream, zi->number_entry, 8);
  1805   1805   
  1806   1806     if (err==ZIP_OK) /* size of the central directory */
  1807   1807       err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(ZPOS64_T)size_centraldir,8);
  1808   1808   
  1809   1809     if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
  1810   1810     {
  1811         -    ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
         1811  +    ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
  1812   1812       err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (ZPOS64_T)pos,8);
  1813   1813     }
  1814   1814     return err;
  1815   1815   }
  1816   1816   int Write_EndOfCentralDirectoryRecord(zip64_internal* zi, uLong size_centraldir, ZPOS64_T centraldir_pos_inzip)
  1817   1817   {
  1818   1818     int err = ZIP_OK;
................................................................................
  1845   1845     }
  1846   1846   
  1847   1847     if (err==ZIP_OK) /* size of the central directory */
  1848   1848       err = zip64local_putValue(&zi->z_filefunc,zi->filestream,(uLong)size_centraldir,4);
  1849   1849   
  1850   1850     if (err==ZIP_OK) /* offset of start of central directory with respect to the starting disk number */
  1851   1851     {
  1852         -    ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
         1852  +    ZPOS64_T pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
  1853   1853       if(pos >= 0xffffffff)
  1854   1854       {
  1855   1855         err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)0xffffffff,4);
  1856   1856       }
  1857   1857       else
  1858         -      err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)(centraldir_pos_inzip - zi->add_position_when_writting_offset),4);
         1858  +      err = zip64local_putValue(&zi->z_filefunc,zi->filestream, (uLong)(centraldir_pos_inzip - zi->add_position_when_writing_offset),4);
  1859   1859     }
  1860   1860   
  1861   1861      return err;
  1862   1862   }
  1863   1863   
  1864   1864   int Write_GlobalComment(zip64_internal* zi, const char* global_comment)
  1865   1865   {
................................................................................
  1917   1917   
  1918   1918               size_centraldir += ldi->filled_in_this_block;
  1919   1919               ldi = ldi->next_datablock;
  1920   1920           }
  1921   1921       }
  1922   1922       free_linkedlist(&(zi->central_dir));
  1923   1923   
  1924         -    pos = centraldir_pos_inzip - zi->add_position_when_writting_offset;
         1924  +    pos = centraldir_pos_inzip - zi->add_position_when_writing_offset;
  1925   1925       if(pos >= 0xffffffff || zi->number_entry > 0xFFFF)
  1926   1926       {
  1927   1927         ZPOS64_T Zip64EOCDpos = ZTELL64(zi->z_filefunc,zi->filestream);
  1928   1928         Write_Zip64EndOfCentralDirectoryRecord(zi, size_centraldir, centraldir_pos_inzip);
  1929   1929   
  1930   1930         Write_Zip64EndOfCentralDirectoryLocator(zi, Zip64EOCDpos);
  1931   1931       }

Changes to jni/tcl/compat/zlib/contrib/pascal/zlibpas.pas.

     6      6    *)
     7      7   
     8      8   unit zlibpas;
     9      9   
    10     10   interface
    11     11   
    12     12   const
    13         -  ZLIB_VERSION = '1.2.8';
    14         -  ZLIB_VERNUM  = $1280;
           13  +  ZLIB_VERSION = '1.2.9';
           14  +  ZLIB_VERNUM  = $1290;
    15     15   
    16     16   type
    17     17     alloc_func = function(opaque: Pointer; items, size: Integer): Pointer;
    18     18                    cdecl;
    19     19     free_func  = procedure(opaque, address: Pointer);
    20     20                    cdecl;
    21     21   

Changes to jni/tcl/compat/zlib/contrib/puff/puff.c.

    13     13    * around 4K on my machine (a PowerPC using GNU cc).  If the faster decode()
    14     14    * function here is used, then puff() is only twice as slow as zlib's
    15     15    * inflate().
    16     16    *
    17     17    * All dynamically allocated memory comes from the stack.  The stack required
    18     18    * is less than 2K bytes.  This code is compatible with 16-bit int's and
    19     19    * assumes that long's are at least 32 bits.  puff.c uses the short data type,
    20         - * assumed to be 16 bits, for arrays in order to to conserve memory.  The code
           20  + * assumed to be 16 bits, for arrays in order to conserve memory.  The code
    21     21    * works whether integers are stored big endian or little endian.
    22     22    *
    23     23    * In the comments below are "Format notes" that describe the inflate process
    24     24    * and document some of the less obvious aspects of the format.  This source
    25     25    * code is meant to supplement RFC 1951, which formally describes the deflate
    26     26    * format:
    27     27    *

Changes to jni/tcl/compat/zlib/contrib/vstudio/readme.txt.

     1         -Building instructions for the DLL versions of Zlib 1.2.8
            1  +Building instructions for the DLL versions of Zlib 1.2.9
     2      2   ========================================================
     3      3   
     4      4   This directory contains projects that build zlib and minizip using
     5      5   Microsoft Visual C++ 9.0/10.0.
     6      6   
     7      7   You don't need to build these projects yourself. You can download the
     8      8   binaries from:
................................................................................
    12     12   
    13     13   
    14     14   
    15     15   
    16     16   
    17     17   Build instructions for Visual Studio 2008 (32 bits or 64 bits)
    18     18   --------------------------------------------------------------
    19         -- Uncompress current zlib, including all contrib/* files
           19  +- Decompress current zlib, including all contrib/* files
    20     20   - Compile assembly code (with Visual Studio Command Prompt) by running:
    21     21      bld_ml64.bat (in contrib\masmx64)
    22     22      bld_ml32.bat (in contrib\masmx86)
    23     23   - Open contrib\vstudio\vc9\zlibvc.sln with Microsoft Visual C++ 2008
    24     24   - Or run: vcbuild /rebuild contrib\vstudio\vc9\zlibvc.sln "Release|Win32"
    25     25   
    26     26   Build instructions for Visual Studio 2010 (32 bits or 64 bits)
    27     27   --------------------------------------------------------------
    28         -- Uncompress current zlib, including all contrib/* files
           28  +- Decompress current zlib, including all contrib/* files
    29     29   - Open contrib\vstudio\vc10\zlibvc.sln with Microsoft Visual C++ 2010
    30     30   
    31     31   Build instructions for Visual Studio 2012 (32 bits or 64 bits)
    32     32   --------------------------------------------------------------
    33         -- Uncompress current zlib, including all contrib/* files
           33  +- Decompress current zlib, including all contrib/* files
    34     34   - Open contrib\vstudio\vc11\zlibvc.sln with Microsoft Visual C++ 2012
    35     35   
           36  +Build instructions for Visual Studio 2013 (32 bits or 64 bits)
           37  +--------------------------------------------------------------
           38  +- Decompress current zlib, including all contrib/* files
           39  +- Open contrib\vstudio\vc12\zlibvc.sln with Microsoft Visual C++ 2013
           40  +
           41  +Build instructions for Visual Studio 2015 (32 bits or 64 bits)
           42  +--------------------------------------------------------------
           43  +- Decompress current zlib, including all contrib/* files
           44  +- Open contrib\vstudio\vc14\zlibvc.sln with Microsoft Visual C++ 2015
           45  +
    36     46   
    37     47   Important
    38     48   ---------
    39     49   - To use zlibwapi.dll in your application, you must define the
    40     50     macro ZLIB_WINAPI when compiling your application's source files.
    41     51   
    42     52   
................................................................................
    59     69   - There used to be a ZLIB_DLL macro in zlib 1.1.x, but now this symbol
    60     70     has a slightly different effect. To avoid compatibility problems, do
    61     71     not define it here.
    62     72   
    63     73   
    64     74   Gilles Vollant
    65     75   info@winimage.com
           76  +
           77  +Visual Studio 2013 and 2015 Projects from Sean Hunt
           78  +seandhunt_7@yahoo.com

Changes to jni/tcl/compat/zlib/contrib/vstudio/vc10/zlib.rc.

     1      1   #include <windows.h>
     2      2   
     3      3   #define IDR_VERSION1  1
     4      4   IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
     5         -  FILEVERSION	 1,2,8,0
     6         -  PRODUCTVERSION 1,2,8,0
            5  +  FILEVERSION	 1, 2, 9, 0
            6  +  PRODUCTVERSION 1, 2, 9, 0
     7      7     FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
     8      8     FILEFLAGS	0
     9      9     FILEOS	VOS_DOS_WINDOWS32
    10     10     FILETYPE	VFT_DLL
    11     11     FILESUBTYPE	0	// not used
    12     12   BEGIN
    13     13     BLOCK "StringFileInfo"
    14     14     BEGIN
    15     15       BLOCK "040904E4"
    16     16       //language ID = U.S. English, char set = Windows, Multilingual
    17     17   
    18     18       BEGIN
    19     19         VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
    20         -      VALUE "FileVersion",	"1.2.8\0"
           20  +      VALUE "FileVersion",	"1.2.9\0"
    21     21         VALUE "InternalName",	"zlib\0"
    22     22         VALUE "OriginalFilename",	"zlibwapi.dll\0"
    23     23         VALUE "ProductName",	"ZLib.DLL\0"
    24     24         VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
    25         -      VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
           25  +      VALUE "LegalCopyright", "(C) 1995-2016 Jean-loup Gailly & Mark Adler\0"
    26     26       END
    27     27     END
    28     28     BLOCK "VarFileInfo"
    29     29     BEGIN
    30     30       VALUE "Translation", 0x0409, 1252
    31     31     END
    32     32   END

Changes to jni/tcl/compat/zlib/contrib/vstudio/vc10/zlibvc.def.

     1      1   LIBRARY
     2      2   ; zlib data compression and ZIP file I/O library
     3      3   
     4         -VERSION		1.2.8
            4  +VERSION		1.2
     5      5   
     6      6   EXPORTS
     7      7           adler32                                  @1
     8      8           compress                                 @2
     9      9           crc32                                    @3
    10     10           deflate                                  @4
    11     11           deflateCopy                              @5
................................................................................
   137    137   
   138    138   ; zlib1 v1.2.7 added:
   139    139           gzopen_w                                @165
   140    140   
   141    141   ; zlib1 v1.2.8 added:
   142    142           inflateGetDictionary                    @166
   143    143           gzvprintf                               @167
          144  +
          145  +; zlib1 v1.2.9 added:
          146  +        inflateCodesUsed                        @168
          147  +        inflateValidate                         @169
          148  +        uncompress2                             @170
          149  +        gzfread                                 @171
          150  +        gzfwrite                                @172
          151  +        deflateGetDictionary                    @173
          152  +        adler32_z                               @174
          153  +        crc32_z                                 @175

Changes to jni/tcl/compat/zlib/contrib/vstudio/vc11/zlib.rc.

     1      1   #include <windows.h>
     2      2   
     3      3   #define IDR_VERSION1  1
     4      4   IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
     5         -  FILEVERSION	 1,2,8,0
     6         -  PRODUCTVERSION 1,2,8,0
            5  +  FILEVERSION	 1, 2, 9, 0
            6  +  PRODUCTVERSION 1, 2, 9, 0
     7      7     FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
     8      8     FILEFLAGS	0
     9      9     FILEOS	VOS_DOS_WINDOWS32
    10     10     FILETYPE	VFT_DLL
    11     11     FILESUBTYPE	0	// not used
    12     12   BEGIN
    13     13     BLOCK "StringFileInfo"
    14     14     BEGIN
    15     15       BLOCK "040904E4"
    16     16       //language ID = U.S. English, char set = Windows, Multilingual
    17     17   
    18     18       BEGIN
    19     19         VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
    20         -      VALUE "FileVersion",	"1.2.8\0"
           20  +      VALUE "FileVersion",	"1.2.9\0"
    21     21         VALUE "InternalName",	"zlib\0"
    22     22         VALUE "OriginalFilename",	"zlibwapi.dll\0"
    23     23         VALUE "ProductName",	"ZLib.DLL\0"
    24     24         VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
    25         -      VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
           25  +      VALUE "LegalCopyright", "(C) 1995-2016 Jean-loup Gailly & Mark Adler\0"
    26     26       END
    27     27     END
    28     28     BLOCK "VarFileInfo"
    29     29     BEGIN
    30     30       VALUE "Translation", 0x0409, 1252
    31     31     END
    32     32   END

Changes to jni/tcl/compat/zlib/contrib/vstudio/vc11/zlibvc.def.

     1      1   LIBRARY
     2      2   ; zlib data compression and ZIP file I/O library
     3      3   
     4         -VERSION		1.2.8
            4  +VERSION		1.2
     5      5   
     6      6   EXPORTS
     7      7           adler32                                  @1
     8      8           compress                                 @2
     9      9           crc32                                    @3
    10     10           deflate                                  @4
    11     11           deflateCopy                              @5
................................................................................
   137    137   
   138    138   ; zlib1 v1.2.7 added:
   139    139           gzopen_w                                @165
   140    140   
   141    141   ; zlib1 v1.2.8 added:
   142    142           inflateGetDictionary                    @166
   143    143           gzvprintf                               @167
          144  +
          145  +; zlib1 v1.2.9 added:
          146  +        inflateCodesUsed                        @168
          147  +        inflateValidate                         @169
          148  +        uncompress2                             @170
          149  +        gzfread                                 @171
          150  +        gzfwrite                                @172
          151  +        deflateGetDictionary                    @173
          152  +        adler32_z                               @174
          153  +        crc32_z                                 @175

Added jni/tcl/compat/zlib/contrib/vstudio/vc12/miniunz.vcxproj.

            1  +<?xml version="1.0" encoding="utf-8"?>
            2  +<Project DefaultTargets="Build" ToolsVersion="12.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  +    <PlatformToolset>v120</PlatformToolset>
           38  +  </PropertyGroup>
           39  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
           40  +    <ConfigurationType>Application</ConfigurationType>
           41  +    <CharacterSet>Unicode</CharacterSet>
           42  +    <PlatformToolset>v120</PlatformToolset>
           43  +  </PropertyGroup>
           44  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
           45  +    <ConfigurationType>Application</ConfigurationType>
           46  +    <CharacterSet>MultiByte</CharacterSet>
           47  +    <PlatformToolset>v120</PlatformToolset>
           48  +  </PropertyGroup>
           49  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
           50  +    <ConfigurationType>Application</ConfigurationType>
           51  +    <CharacterSet>MultiByte</CharacterSet>
           52  +    <PlatformToolset>v120</PlatformToolset>
           53  +  </PropertyGroup>
           54  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
           55  +    <ConfigurationType>Application</ConfigurationType>
           56  +    <CharacterSet>MultiByte</CharacterSet>
           57  +    <PlatformToolset>v120</PlatformToolset>
           58  +  </PropertyGroup>
           59  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
           60  +    <ConfigurationType>Application</ConfigurationType>
           61  +    <CharacterSet>MultiByte</CharacterSet>
           62  +    <PlatformToolset>v120</PlatformToolset>
           63  +  </PropertyGroup>
           64  +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
           65  +  <ImportGroup Label="ExtensionSettings">
           66  +  </ImportGroup>
           67  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" 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|Win32'" 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|Itanium'" 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|Itanium'" Label="PropertySheets">
           77  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
           78  +  </ImportGroup>
           79  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
           80  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
           81  +  </ImportGroup>
           82  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
           83  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
           84  +  </ImportGroup>
           85  +  <PropertyGroup Label="UserMacros" />
           86  +  <PropertyGroup>
           87  +    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
           88  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>
           89  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>
           90  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
           91  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
           92  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>
           93  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>
           94  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
           95  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
           96  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\</OutDir>
           97  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>
           98  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
           99  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
          100  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>
          101  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>
          102  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
          103  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
          104  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\</OutDir>
          105  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>
          106  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
          107  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
          108  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>
          109  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>
          110  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
          111  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
          112  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
          113  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
          114  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
          115  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
          116  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
          117  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
          118  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
          119  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
          120  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
          121  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
          122  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
          123  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
          124  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
          125  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
          126  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
          127  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
          128  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
          129  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
          130  +  </PropertyGroup>
          131  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
          132  +    <ClCompile>
          133  +      <Optimization>Disabled</Optimization>
          134  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          135  +      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          136  +      <MinimalRebuild>true</MinimalRebuild>
          137  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          138  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          139  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          140  +      <PrecompiledHeader>
          141  +      </PrecompiledHeader>
          142  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          143  +      <WarningLevel>Level3</WarningLevel>
          144  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          145  +    </ClCompile>
          146  +    <Link>
          147  +      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          148  +      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
          149  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          150  +      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
          151  +      <SubSystem>Console</SubSystem>
          152  +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
          153  +      <DataExecutionPrevention>
          154  +      </DataExecutionPrevention>
          155  +      <TargetMachine>MachineX86</TargetMachine>
          156  +    </Link>
          157  +  </ItemDefinitionGroup>
          158  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
          159  +    <ClCompile>
          160  +      <Optimization>MaxSpeed</Optimization>
          161  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          162  +      <OmitFramePointers>true</OmitFramePointers>
          163  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          164  +      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          165  +      <StringPooling>true</StringPooling>
          166  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          167  +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
          168  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          169  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          170  +      <PrecompiledHeader>
          171  +      </PrecompiledHeader>
          172  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          173  +      <WarningLevel>Level3</WarningLevel>
          174  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          175  +    </ClCompile>
          176  +    <Link>
          177  +      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          178  +      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
          179  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          180  +      <SubSystem>Console</SubSystem>
          181  +      <OptimizeReferences>true</OptimizeReferences>
          182  +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
          183  +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
          184  +      <DataExecutionPrevention>
          185  +      </DataExecutionPrevention>
          186  +      <TargetMachine>MachineX86</TargetMachine>
          187  +    </Link>
          188  +  </ItemDefinitionGroup>
          189  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
          190  +    <Midl>
          191  +      <TargetEnvironment>X64</TargetEnvironment>
          192  +    </Midl>
          193  +    <ClCompile>
          194  +      <Optimization>Disabled</Optimization>
          195  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          196  +      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          197  +      <MinimalRebuild>true</MinimalRebuild>
          198  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          199  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          200  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          201  +      <PrecompiledHeader>
          202  +      </PrecompiledHeader>
          203  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          204  +      <WarningLevel>Level3</WarningLevel>
          205  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          206  +    </ClCompile>
          207  +    <Link>
          208  +      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          209  +      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
          210  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          211  +      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
          212  +      <SubSystem>Console</SubSystem>
          213  +      <TargetMachine>MachineX64</TargetMachine>
          214  +    </Link>
          215  +  </ItemDefinitionGroup>
          216  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
          217  +    <Midl>
          218  +      <TargetEnvironment>Itanium</TargetEnvironment>
          219  +    </Midl>
          220  +    <ClCompile>
          221  +      <Optimization>Disabled</Optimization>
          222  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          223  +      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          224  +      <MinimalRebuild>true</MinimalRebuild>
          225  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          226  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          227  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          228  +      <PrecompiledHeader>
          229  +      </PrecompiledHeader>
          230  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          231  +      <WarningLevel>Level3</WarningLevel>
          232  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          233  +    </ClCompile>
          234  +    <Link>
          235  +      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          236  +      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
          237  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          238  +      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
          239  +      <SubSystem>Console</SubSystem>
          240  +      <TargetMachine>MachineIA64</TargetMachine>
          241  +    </Link>
          242  +  </ItemDefinitionGroup>
          243  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
          244  +    <Midl>
          245  +      <TargetEnvironment>X64</TargetEnvironment>
          246  +    </Midl>
          247  +    <ClCompile>
          248  +      <Optimization>MaxSpeed</Optimization>
          249  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          250  +      <OmitFramePointers>true</OmitFramePointers>
          251  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          252  +      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          253  +      <StringPooling>true</StringPooling>
          254  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          255  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          256  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          257  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          258  +      <PrecompiledHeader>
          259  +      </PrecompiledHeader>
          260  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          261  +      <WarningLevel>Level3</WarningLevel>
          262  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          263  +    </ClCompile>
          264  +    <Link>
          265  +      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          266  +      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
          267  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          268  +      <SubSystem>Console</SubSystem>
          269  +      <OptimizeReferences>true</OptimizeReferences>
          270  +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
          271  +      <TargetMachine>MachineX64</TargetMachine>
          272  +    </Link>
          273  +  </ItemDefinitionGroup>
          274  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
          275  +    <Midl>
          276  +      <TargetEnvironment>Itanium</TargetEnvironment>
          277  +    </Midl>
          278  +    <ClCompile>
          279  +      <Optimization>MaxSpeed</Optimization>
          280  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          281  +      <OmitFramePointers>true</OmitFramePointers>
          282  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          283  +      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          284  +      <StringPooling>true</StringPooling>
          285  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          286  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          287  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          288  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          289  +      <PrecompiledHeader>
          290  +      </PrecompiledHeader>
          291  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          292  +      <WarningLevel>Level3</WarningLevel>
          293  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          294  +    </ClCompile>
          295  +    <Link>
          296  +      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          297  +      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
          298  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          299  +      <SubSystem>Console</SubSystem>
          300  +      <OptimizeReferences>true</OptimizeReferences>
          301  +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
          302  +      <TargetMachine>MachineIA64</TargetMachine>
          303  +    </Link>
          304  +  </ItemDefinitionGroup>
          305  +  <ItemGroup>
          306  +    <ClCompile Include="..\..\minizip\miniunz.c" />
          307  +  </ItemGroup>
          308  +  <ItemGroup>
          309  +    <ProjectReference Include="zlibvc.vcxproj">
          310  +      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
          311  +    </ProjectReference>
          312  +  </ItemGroup>
          313  +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
          314  +  <ImportGroup Label="ExtensionTargets">
          315  +  </ImportGroup>
          316  +</Project>

Added jni/tcl/compat/zlib/contrib/vstudio/vc12/minizip.vcxproj.

            1  +<?xml version="1.0" encoding="utf-8"?>
            2  +<Project DefaultTargets="Build" ToolsVersion="12.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  +    <PlatformToolset>v120</PlatformToolset>
           38  +  </PropertyGroup>
           39  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
           40  +    <ConfigurationType>Application</ConfigurationType>
           41  +    <CharacterSet>Unicode</CharacterSet>
           42  +    <PlatformToolset>v120</PlatformToolset>
           43  +  </PropertyGroup>
           44  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
           45  +    <ConfigurationType>Application</ConfigurationType>
           46  +    <CharacterSet>MultiByte</CharacterSet>
           47  +    <PlatformToolset>v120</PlatformToolset>
           48  +  </PropertyGroup>
           49  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
           50  +    <ConfigurationType>Application</ConfigurationType>
           51  +    <CharacterSet>MultiByte</CharacterSet>
           52  +    <PlatformToolset>v120</PlatformToolset>
           53  +  </PropertyGroup>
           54  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
           55  +    <ConfigurationType>Application</ConfigurationType>
           56  +    <CharacterSet>MultiByte</CharacterSet>
           57  +    <PlatformToolset>v120</PlatformToolset>
           58  +  </PropertyGroup>
           59  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
           60  +    <ConfigurationType>Application</ConfigurationType>
           61  +    <CharacterSet>MultiByte</CharacterSet>
           62  +    <PlatformToolset>v120</PlatformToolset>
           63  +  </PropertyGroup>
           64  +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
           65  +  <ImportGroup Label="ExtensionSettings">
           66  +  </ImportGroup>
           67  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" 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|Win32'" 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|Itanium'" 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|Itanium'" Label="PropertySheets">
           77  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
           78  +  </ImportGroup>
           79  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
           80  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
           81  +  </ImportGroup>
           82  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
           83  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
           84  +  </ImportGroup>
           85  +  <PropertyGroup Label="UserMacros" />
           86  +  <PropertyGroup>
           87  +    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
           88  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\</OutDir>
           89  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>
           90  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
           91  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
           92  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\</OutDir>
           93  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>
           94  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
           95  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</OutDir>
           96  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</IntDir>
           97  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
           98  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
           99  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</OutDir>
          100  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</IntDir>
          101  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
          102  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
          103  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</OutDir>
          104  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</IntDir>
          105  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
          106  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</OutDir>
          107  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</IntDir>
          108  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
          109  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
          110  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
          111  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
          112  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
          113  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
          114  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
          115  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
          116  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
          117  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
          118  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
          119  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
          120  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
          121  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
          122  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
          123  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
          124  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
          125  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
          126  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
          127  +  </PropertyGroup>
          128  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
          129  +    <ClCompile>
          130  +      <Optimization>Disabled</Optimization>
          131  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          132  +      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          133  +      <MinimalRebuild>true</MinimalRebuild>
          134  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          135  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          136  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          137  +      <PrecompiledHeader>
          138  +      </PrecompiledHeader>
          139  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          140  +      <WarningLevel>Level3</WarningLevel>
          141  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          142  +    </ClCompile>
          143  +    <Link>
          144  +      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          145  +      <OutputFile>$(OutDir)minizip.exe</OutputFile>
          146  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          147  +      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
          148  +      <SubSystem>Console</SubSystem>
          149  +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
          150  +      <DataExecutionPrevention>
          151  +      </DataExecutionPrevention>
          152  +      <TargetMachine>MachineX86</TargetMachine>
          153  +    </Link>
          154  +  </ItemDefinitionGroup>
          155  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
          156  +    <ClCompile>
          157  +      <Optimization>MaxSpeed</Optimization>
          158  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          159  +      <OmitFramePointers>true</OmitFramePointers>
          160  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          161  +      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          162  +      <StringPooling>true</StringPooling>
          163  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          164  +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
          165  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          166  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          167  +      <PrecompiledHeader>
          168  +      </PrecompiledHeader>
          169  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          170  +      <WarningLevel>Level3</WarningLevel>
          171  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          172  +    </ClCompile>
          173  +    <Link>
          174  +      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          175  +      <OutputFile>$(OutDir)minizip.exe</OutputFile>
          176  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          177  +      <SubSystem>Console</SubSystem>
          178  +      <OptimizeReferences>true</OptimizeReferences>
          179  +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
          180  +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
          181  +      <DataExecutionPrevention>
          182  +      </DataExecutionPrevention>
          183  +      <TargetMachine>MachineX86</TargetMachine>
          184  +    </Link>
          185  +  </ItemDefinitionGroup>
          186  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
          187  +    <Midl>
          188  +      <TargetEnvironment>X64</TargetEnvironment>
          189  +    </Midl>
          190  +    <ClCompile>
          191  +      <Optimization>Disabled</Optimization>
          192  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          193  +      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          194  +      <MinimalRebuild>true</MinimalRebuild>
          195  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          196  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          197  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          198  +      <PrecompiledHeader>
          199  +      </PrecompiledHeader>
          200  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          201  +      <WarningLevel>Level3</WarningLevel>
          202  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          203  +    </ClCompile>
          204  +    <Link>
          205  +      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          206  +      <OutputFile>$(OutDir)minizip.exe</OutputFile>
          207  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          208  +      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
          209  +      <SubSystem>Console</SubSystem>
          210  +      <TargetMachine>MachineX64</TargetMachine>
          211  +    </Link>
          212  +  </ItemDefinitionGroup>
          213  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
          214  +    <Midl>
          215  +      <TargetEnvironment>Itanium</TargetEnvironment>
          216  +    </Midl>
          217  +    <ClCompile>
          218  +      <Optimization>Disabled</Optimization>
          219  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          220  +      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          221  +      <MinimalRebuild>true</MinimalRebuild>
          222  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          223  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          224  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          225  +      <PrecompiledHeader>
          226  +      </PrecompiledHeader>
          227  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          228  +      <WarningLevel>Level3</WarningLevel>
          229  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          230  +    </ClCompile>
          231  +    <Link>
          232  +      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          233  +      <OutputFile>$(OutDir)minizip.exe</OutputFile>
          234  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          235  +      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
          236  +      <SubSystem>Console</SubSystem>
          237  +      <TargetMachine>MachineIA64</TargetMachine>
          238  +    </Link>
          239  +  </ItemDefinitionGroup>
          240  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
          241  +    <Midl>
          242  +      <TargetEnvironment>X64</TargetEnvironment>
          243  +    </Midl>
          244  +    <ClCompile>
          245  +      <Optimization>MaxSpeed</Optimization>
          246  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          247  +      <OmitFramePointers>true</OmitFramePointers>
          248  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          249  +      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          250  +      <StringPooling>true</StringPooling>
          251  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          252  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          253  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          254  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          255  +      <PrecompiledHeader>
          256  +      </PrecompiledHeader>
          257  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          258  +      <WarningLevel>Level3</WarningLevel>
          259  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          260  +    </ClCompile>
          261  +    <Link>
          262  +      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          263  +      <OutputFile>$(OutDir)minizip.exe</OutputFile>
          264  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          265  +      <SubSystem>Console</SubSystem>
          266  +      <OptimizeReferences>true</OptimizeReferences>
          267  +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
          268  +      <TargetMachine>MachineX64</TargetMachine>
          269  +    </Link>
          270  +  </ItemDefinitionGroup>
          271  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
          272  +    <Midl>
          273  +      <TargetEnvironment>Itanium</TargetEnvironment>
          274  +    </Midl>
          275  +    <ClCompile>
          276  +      <Optimization>MaxSpeed</Optimization>
          277  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          278  +      <OmitFramePointers>true</OmitFramePointers>
          279  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          280  +      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          281  +      <StringPooling>true</StringPooling>
          282  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          283  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          284  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          285  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          286  +      <PrecompiledHeader>
          287  +      </PrecompiledHeader>
          288  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          289  +      <WarningLevel>Level3</WarningLevel>
          290  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          291  +    </ClCompile>
          292  +    <Link>
          293  +      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          294  +      <OutputFile>$(OutDir)minizip.exe</OutputFile>
          295  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          296  +      <SubSystem>Console</SubSystem>
          297  +      <OptimizeReferences>true</OptimizeReferences>
          298  +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
          299  +      <TargetMachine>MachineIA64</TargetMachine>
          300  +    </Link>
          301  +  </ItemDefinitionGroup>
          302  +  <ItemGroup>
          303  +    <ClCompile Include="..\..\minizip\minizip.c" />
          304  +  </ItemGroup>
          305  +  <ItemGroup>
          306  +    <ProjectReference Include="zlibvc.vcxproj">
          307  +      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
          308  +    </ProjectReference>
          309  +  </ItemGroup>
          310  +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
          311  +  <ImportGroup Label="ExtensionTargets">
          312  +  </ImportGroup>
          313  +</Project>

Added jni/tcl/compat/zlib/contrib/vstudio/vc12/testzlib.vcxproj.

            1  +<?xml version="1.0" encoding="utf-8"?>
            2  +<Project DefaultTargets="Build" ToolsVersion="12.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  +    <PlatformToolset>v120</PlatformToolset>
           52  +  </PropertyGroup>
           53  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
           54  +    <ConfigurationType>Application</ConfigurationType>
           55  +    <CharacterSet>MultiByte</CharacterSet>
           56  +    <WholeProgramOptimization>true</WholeProgramOptimization>
           57  +    <PlatformToolset>v120</PlatformToolset>
           58  +  </PropertyGroup>
           59  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
           60  +    <ConfigurationType>Application</ConfigurationType>
           61  +    <CharacterSet>Unicode</CharacterSet>
           62  +    <PlatformToolset>v120</PlatformToolset>
           63  +  </PropertyGroup>
           64  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
           65  +    <ConfigurationType>Application</ConfigurationType>
           66  +    <CharacterSet>MultiByte</CharacterSet>
           67  +    <WholeProgramOptimization>true</WholeProgramOptimization>
           68  +    <PlatformToolset>v120</PlatformToolset>
           69  +  </PropertyGroup>
           70  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
           71  +    <ConfigurationType>Application</ConfigurationType>
           72  +    <CharacterSet>MultiByte</CharacterSet>
           73  +    <WholeProgramOptimization>true</WholeProgramOptimization>
           74  +    <PlatformToolset>v120</PlatformToolset>
           75  +  </PropertyGroup>
           76  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
           77  +    <ConfigurationType>Application</ConfigurationType>
           78  +    <CharacterSet>MultiByte</CharacterSet>
           79  +    <PlatformToolset>v120</PlatformToolset>
           80  +  </PropertyGroup>
           81  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
           82  +    <ConfigurationType>Application</ConfigurationType>
           83  +    <WholeProgramOptimization>true</WholeProgramOptimization>
           84  +    <PlatformToolset>v120</PlatformToolset>
           85  +  </PropertyGroup>
           86  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
           87  +    <ConfigurationType>Application</ConfigurationType>
           88  +    <WholeProgramOptimization>true</WholeProgramOptimization>
           89  +    <PlatformToolset>v120</PlatformToolset>
           90  +  </PropertyGroup>
           91  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
           92  +    <ConfigurationType>Application</ConfigurationType>
           93  +    <PlatformToolset>v120</PlatformToolset>
           94  +  </PropertyGroup>
           95  +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
           96  +  <ImportGroup Label="ExtensionSettings">
           97  +  </ImportGroup>
           98  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" 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|Win32'" 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|Win32'" 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|Itanium'" 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|Itanium'" 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|Itanium'" Label="PropertySheets">
          114  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          115  +  </ImportGroup>
          116  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
          117  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          118  +  </ImportGroup>
          119  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
          120  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          121  +  </ImportGroup>
          122  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
          123  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          124  +  </ImportGroup>
          125  +  <PropertyGroup Label="UserMacros" />
          126  +  <PropertyGroup>
          127  +    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
          128  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\</OutDir>
          129  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
          130  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
          131  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
          132  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\</OutDir>
          133  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
          134  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>
          135  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>
          136  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\</OutDir>
          137  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
          138  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
          139  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
          140  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\</OutDir>
          141  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
          142  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
          143  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
          144  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
          145  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
          146  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
          147  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\</OutDir>
          148  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
          149  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>
          150  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
          151  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
          152  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>
          153  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>
          154  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\</OutDir>
          155  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
          156  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
          157  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
          158  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
          159  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
          160  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
          161  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
          162  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
          163  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
          164  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
          165  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
          166  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
          167  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
          168  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
          169  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
          170  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
          171  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
          172  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
          173  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
          174  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
          175  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
          176  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
          177  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
          178  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
          179  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
          180  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
          181  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
          182  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
          183  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
          184  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
          185  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
          186  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
          187  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
          188  +  </PropertyGroup>
          189  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
          190  +    <ClCompile>
          191  +      <Optimization>Disabled</Optimization>
          192  +      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          193  +      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          194  +      <MinimalRebuild>true</MinimalRebuild>
          195  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          196  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          197  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          198  +      <PrecompiledHeader>
          199  +      </PrecompiledHeader>
          200  +      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
          201  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          202  +      <WarningLevel>Level3</WarningLevel>
          203  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          204  +    </ClCompile>
          205  +    <Link>
          206  +      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
          207  +      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
          208  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          209  +      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
          210  +      <SubSystem>Console</SubSystem>
          211  +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
          212  +      <DataExecutionPrevention>
          213  +      </DataExecutionPrevention>
          214  +      <TargetMachine>MachineX86</TargetMachine>
          215  +    </Link>
          216  +  </ItemDefinitionGroup>
          217  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
          218  +    <ClCompile>
          219  +      <Optimization>MaxSpeed</Optimization>
          220  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          221  +      <OmitFramePointers>true</OmitFramePointers>
          222  +      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          223  +      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          224  +      <StringPooling>true</StringPooling>
          225  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          226  +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
          227  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          228  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          229  +      <PrecompiledHeader>
          230  +      </PrecompiledHeader>
          231  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          232  +      <WarningLevel>Level3</WarningLevel>
          233  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          234  +    </ClCompile>
          235  +    <Link>
          236  +      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
          237  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          238  +      <SubSystem>Console</SubSystem>
          239  +      <OptimizeReferences>true</OptimizeReferences>
          240  +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
          241  +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
          242  +      <DataExecutionPrevention>
          243  +      </DataExecutionPrevention>
          244  +      <TargetMachine>MachineX86</TargetMachine>
          245  +    </Link>
          246  +  </ItemDefinitionGroup>
          247  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
          248  +    <ClCompile>
          249  +      <Optimization>MaxSpeed</Optimization>
          250  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          251  +      <OmitFramePointers>true</OmitFramePointers>
          252  +      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          253  +      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          254  +      <StringPooling>true</StringPooling>
          255  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          256  +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
          257  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          258  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          259  +      <PrecompiledHeader>
          260  +      </PrecompiledHeader>
          261  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          262  +      <WarningLevel>Level3</WarningLevel>
          263  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          264  +    </ClCompile>
          265  +    <Link>
          266  +      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
          267  +      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
          268  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          269  +      <SubSystem>Console</SubSystem>
          270  +      <OptimizeReferences>true</OptimizeReferences>
          271  +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
          272  +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
          273  +      <DataExecutionPrevention>
          274  +      </DataExecutionPrevention>
          275  +      <TargetMachine>MachineX86</TargetMachine>
          276  +      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
          277  +    </Link>
          278  +  </ItemDefinitionGroup>
          279  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
          280  +    <ClCompile>
          281  +      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          282  +      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          283  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          284  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          285  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          286  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          287  +    </ClCompile>
          288  +    <Link>
          289  +      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
          290  +    </Link>
          291  +  </ItemDefinitionGroup>
          292  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
          293  +    <Midl>
          294  +      <TargetEnvironment>Itanium</TargetEnvironment>
          295  +    </Midl>
          296  +    <ClCompile>
          297  +      <Optimization>Disabled</Optimization>
          298  +      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          299  +      <PreprocessorDefinitions>ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          300  +      <MinimalRebuild>true</MinimalRebuild>
          301  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          302  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          303  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          304  +      <PrecompiledHeader>
          305  +      </PrecompiledHeader>
          306  +      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
          307  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          308  +      <WarningLevel>Level3</WarningLevel>
          309  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          310  +    </ClCompile>
          311  +    <Link>
          312  +      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
          313  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          314  +      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
          315  +      <SubSystem>Console</SubSystem>
          316  +      <TargetMachine>MachineIA64</TargetMachine>
          317  +    </Link>
          318  +  </ItemDefinitionGroup>
          319  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
          320  +    <ClCompile>
          321  +      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          322  +      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          323  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          324  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          325  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          326  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          327  +    </ClCompile>
          328  +    <Link>
          329  +      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
          330  +    </Link>
          331  +  </ItemDefinitionGroup>
          332  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
          333  +    <Midl>
          334  +      <TargetEnvironment>Itanium</TargetEnvironment>
          335  +    </Midl>
          336  +    <ClCompile>
          337  +      <Optimization>MaxSpeed</Optimization>
          338  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          339  +      <OmitFramePointers>true</OmitFramePointers>
          340  +      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          341  +      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          342  +      <StringPooling>true</StringPooling>
          343  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          344  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          345  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          346  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          347  +      <PrecompiledHeader>
          348  +      </PrecompiledHeader>
          349  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          350  +      <WarningLevel>Level3</WarningLevel>
          351  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          352  +    </ClCompile>
          353  +    <Link>
          354  +      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
          355  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          356  +      <SubSystem>Console</SubSystem>
          357  +      <OptimizeReferences>true</OptimizeReferences>
          358  +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
          359  +      <TargetMachine>MachineIA64</TargetMachine>
          360  +    </Link>
          361  +  </ItemDefinitionGroup>
          362  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
          363  +    <ClCompile>
          364  +      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          365  +      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          366  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          367  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          368  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          369  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          370  +    </ClCompile>
          371  +    <Link>
          372  +      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
          373  +    </Link>
          374  +  </ItemDefinitionGroup>
          375  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
          376  +    <Midl>
          377  +      <TargetEnvironment>Itanium</TargetEnvironment>
          378  +    </Midl>
          379  +    <ClCompile>
          380  +      <Optimization>MaxSpeed</Optimization>
          381  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          382  +      <OmitFramePointers>true</OmitFramePointers>
          383  +      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          384  +      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          385  +      <StringPooling>true</StringPooling>
          386  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          387  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          388  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          389  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          390  +      <PrecompiledHeader>
          391  +      </PrecompiledHeader>
          392  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          393  +      <WarningLevel>Level3</WarningLevel>
          394  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          395  +    </ClCompile>
          396  +    <Link>
          397  +      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
          398  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          399  +      <SubSystem>Console</SubSystem>
          400  +      <OptimizeReferences>true</OptimizeReferences>
          401  +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
          402  +      <TargetMachine>MachineIA64</TargetMachine>
          403  +    </Link>
          404  +  </ItemDefinitionGroup>
          405  +  <ItemGroup>
          406  +    <ClCompile Include="..\..\..\adler32.c" />
          407  +    <ClCompile Include="..\..\..\compress.c" />
          408  +    <ClCompile Include="..\..\..\crc32.c" />
          409  +    <ClCompile Include="..\..\..\deflate.c" />
          410  +    <ClCompile Include="..\..\..\infback.c" />
          411  +    <ClCompile Include="..\..\masmx64\inffas8664.c">
          412  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
          413  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
          414  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
          415  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
          416  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
          417  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
          418  +    </ClCompile>
          419  +    <ClCompile Include="..\..\..\inffast.c" />
          420  +    <ClCompile Include="..\..\..\inflate.c" />
          421  +    <ClCompile Include="..\..\..\inftrees.c" />
          422  +    <ClCompile Include="..\..\testzlib\testzlib.c" />
          423  +    <ClCompile Include="..\..\..\trees.c" />
          424  +    <ClCompile Include="..\..\..\uncompr.c" />
          425  +    <ClCompile Include="..\..\..\zutil.c" />
          426  +  </ItemGroup>
          427  +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
          428  +  <ImportGroup Label="ExtensionTargets">
          429  +  </ImportGroup>
          430  +</Project>

Added jni/tcl/compat/zlib/contrib/vstudio/vc12/testzlibdll.vcxproj.

            1  +<?xml version="1.0" encoding="utf-8"?>
            2  +<Project DefaultTargets="Build" ToolsVersion="12.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  +    <PlatformToolset>v120</PlatformToolset>
           38  +  </PropertyGroup>
           39  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
           40  +    <ConfigurationType>Application</ConfigurationType>
           41  +    <CharacterSet>Unicode</CharacterSet>
           42  +    <PlatformToolset>v120</PlatformToolset>
           43  +  </PropertyGroup>
           44  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
           45  +    <ConfigurationType>Application</ConfigurationType>
           46  +    <CharacterSet>MultiByte</CharacterSet>
           47  +    <PlatformToolset>v120</PlatformToolset>
           48  +  </PropertyGroup>
           49  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
           50  +    <ConfigurationType>Application</ConfigurationType>
           51  +    <CharacterSet>MultiByte</CharacterSet>
           52  +    <PlatformToolset>v120</PlatformToolset>
           53  +  </PropertyGroup>
           54  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
           55  +    <ConfigurationType>Application</ConfigurationType>
           56  +    <CharacterSet>MultiByte</CharacterSet>
           57  +    <PlatformToolset>v120</PlatformToolset>
           58  +  </PropertyGroup>
           59  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
           60  +    <ConfigurationType>Application</ConfigurationType>
           61  +    <CharacterSet>MultiByte</CharacterSet>
           62  +    <PlatformToolset>v120</PlatformToolset>
           63  +  </PropertyGroup>
           64  +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
           65  +  <ImportGroup Label="ExtensionSettings">
           66  +  </ImportGroup>
           67  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" 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|Win32'" 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|Itanium'" 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|Itanium'" Label="PropertySheets">
           77  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
           78  +  </ImportGroup>
           79  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
           80  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
           81  +  </ImportGroup>
           82  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
           83  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
           84  +  </ImportGroup>
           85  +  <PropertyGroup Label="UserMacros" />
           86  +  <PropertyGroup>
           87  +    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
           88  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
           89  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
           90  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
           91  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
           92  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
           93  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
           94  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
           95  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
           96  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
           97  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
           98  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
           99  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
          100  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
          101  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
          102  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
          103  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
          104  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
          105  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
          106  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
          107  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
          108  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
          109  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
          110  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
          111  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
          112  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
          113  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
          114  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
          115  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
          116  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
          117  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
          118  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
          119  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
          120  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
          121  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
          122  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
          123  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
          124  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
          125  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
          126  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
          127  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
          128  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
          129  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
          130  +  </PropertyGroup>
          131  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
          132  +    <ClCompile>
          133  +      <Optimization>Disabled</Optimization>
          134  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          135  +      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          136  +      <MinimalRebuild>true</MinimalRebuild>
          137  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          138  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          139  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          140  +      <PrecompiledHeader>
          141  +      </PrecompiledHeader>
          142  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          143  +      <WarningLevel>Level3</WarningLevel>
          144  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          145  +    </ClCompile>
          146  +    <Link>
          147  +      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          148  +      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
          149  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          150  +      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
          151  +      <SubSystem>Console</SubSystem>
          152  +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
          153  +      <DataExecutionPrevention>
          154  +      </DataExecutionPrevention>
          155  +      <TargetMachine>MachineX86</TargetMachine>
          156  +    </Link>
          157  +  </ItemDefinitionGroup>
          158  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
          159  +    <ClCompile>
          160  +      <Optimization>MaxSpeed</Optimization>
          161  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          162  +      <OmitFramePointers>true</OmitFramePointers>
          163  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          164  +      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          165  +      <StringPooling>true</StringPooling>
          166  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          167  +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
          168  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          169  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          170  +      <PrecompiledHeader>
          171  +      </PrecompiledHeader>
          172  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          173  +      <WarningLevel>Level3</WarningLevel>
          174  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          175  +    </ClCompile>
          176  +    <Link>
          177  +      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          178  +      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
          179  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          180  +      <SubSystem>Console</SubSystem>
          181  +      <OptimizeReferences>true</OptimizeReferences>
          182  +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
          183  +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
          184  +      <DataExecutionPrevention>
          185  +      </DataExecutionPrevention>
          186  +      <TargetMachine>MachineX86</TargetMachine>
          187  +    </Link>
          188  +  </ItemDefinitionGroup>
          189  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
          190  +    <Midl>
          191  +      <TargetEnvironment>X64</TargetEnvironment>
          192  +    </Midl>
          193  +    <ClCompile>
          194  +      <Optimization>Disabled</Optimization>
          195  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          196  +      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          197  +      <MinimalRebuild>true</MinimalRebuild>
          198  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          199  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          200  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          201  +      <PrecompiledHeader>
          202  +      </PrecompiledHeader>
          203  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          204  +      <WarningLevel>Level3</WarningLevel>
          205  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          206  +    </ClCompile>
          207  +    <Link>
          208  +      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          209  +      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
          210  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          211  +      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
          212  +      <SubSystem>Console</SubSystem>
          213  +      <TargetMachine>MachineX64</TargetMachine>
          214  +    </Link>
          215  +  </ItemDefinitionGroup>
          216  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
          217  +    <Midl>
          218  +      <TargetEnvironment>Itanium</TargetEnvironment>
          219  +    </Midl>
          220  +    <ClCompile>
          221  +      <Optimization>Disabled</Optimization>
          222  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          223  +      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          224  +      <MinimalRebuild>true</MinimalRebuild>
          225  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          226  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          227  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          228  +      <PrecompiledHeader>
          229  +      </PrecompiledHeader>
          230  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          231  +      <WarningLevel>Level3</WarningLevel>
          232  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          233  +    </ClCompile>
          234  +    <Link>
          235  +      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          236  +      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
          237  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          238  +      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
          239  +      <SubSystem>Console</SubSystem>
          240  +      <TargetMachine>MachineIA64</TargetMachine>
          241  +    </Link>
          242  +  </ItemDefinitionGroup>
          243  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
          244  +    <Midl>
          245  +      <TargetEnvironment>X64</TargetEnvironment>
          246  +    </Midl>
          247  +    <ClCompile>
          248  +      <Optimization>MaxSpeed</Optimization>
          249  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          250  +      <OmitFramePointers>true</OmitFramePointers>
          251  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          252  +      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          253  +      <StringPooling>true</StringPooling>
          254  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          255  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          256  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          257  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          258  +      <PrecompiledHeader>
          259  +      </PrecompiledHeader>
          260  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          261  +      <WarningLevel>Level3</WarningLevel>
          262  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          263  +    </ClCompile>
          264  +    <Link>
          265  +      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          266  +      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
          267  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          268  +      <SubSystem>Console</SubSystem>
          269  +      <OptimizeReferences>true</OptimizeReferences>
          270  +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
          271  +      <TargetMachine>MachineX64</TargetMachine>
          272  +    </Link>
          273  +  </ItemDefinitionGroup>
          274  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
          275  +    <Midl>
          276  +      <TargetEnvironment>Itanium</TargetEnvironment>
          277  +    </Midl>
          278  +    <ClCompile>
          279  +      <Optimization>MaxSpeed</Optimization>
          280  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          281  +      <OmitFramePointers>true</OmitFramePointers>
          282  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          283  +      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          284  +      <StringPooling>true</StringPooling>
          285  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          286  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          287  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          288  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          289  +      <PrecompiledHeader>
          290  +      </PrecompiledHeader>
          291  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          292  +      <WarningLevel>Level3</WarningLevel>
          293  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          294  +    </ClCompile>
          295  +    <Link>
          296  +      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          297  +      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
          298  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          299  +      <SubSystem>Console</SubSystem>
          300  +      <OptimizeReferences>true</OptimizeReferences>
          301  +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
          302  +      <TargetMachine>MachineIA64</TargetMachine>
          303  +    </Link>
          304  +  </ItemDefinitionGroup>
          305  +  <ItemGroup>
          306  +    <ClCompile Include="..\..\testzlib\testzlib.c" />
          307  +  </ItemGroup>
          308  +  <ItemGroup>
          309  +    <ProjectReference Include="zlibvc.vcxproj">
          310  +      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
          311  +    </ProjectReference>
          312  +  </ItemGroup>
          313  +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
          314  +  <ImportGroup Label="ExtensionTargets">
          315  +  </ImportGroup>
          316  +</Project>

Added jni/tcl/compat/zlib/contrib/vstudio/vc12/zlib.rc.

            1  +#include <windows.h>
            2  +
            3  +#define IDR_VERSION1  1
            4  +IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
            5  +  FILEVERSION	 1, 2, 9, 0
            6  +  PRODUCTVERSION 1, 2, 9, 0
            7  +  FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
            8  +  FILEFLAGS	0
            9  +  FILEOS	VOS_DOS_WINDOWS32
           10  +  FILETYPE	VFT_DLL
           11  +  FILESUBTYPE	0	// not used
           12  +BEGIN
           13  +  BLOCK "StringFileInfo"
           14  +  BEGIN
           15  +    BLOCK "040904E4"
           16  +    //language ID = U.S. English, char set = Windows, Multilingual
           17  +
           18  +    BEGIN
           19  +      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
           20  +      VALUE "FileVersion",	"1.2.8.1\0"
           21  +      VALUE "InternalName",	"zlib\0"
           22  +      VALUE "OriginalFilename",	"zlibwapi.dll\0"
           23  +      VALUE "ProductName",	"ZLib.DLL\0"
           24  +      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
           25  +      VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
           26  +    END
           27  +  END
           28  +  BLOCK "VarFileInfo"
           29  +  BEGIN
           30  +    VALUE "Translation", 0x0409, 1252
           31  +  END
           32  +END

Added jni/tcl/compat/zlib/contrib/vstudio/vc12/zlibstat.vcxproj.

            1  +<?xml version="1.0" encoding="utf-8"?>
            2  +<Project DefaultTargets="Build" ToolsVersion="12.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  +    <PlatformToolset>v120</PlatformToolset>
           49  +  </PropertyGroup>
           50  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
           51  +    <ConfigurationType>StaticLibrary</ConfigurationType>
           52  +    <UseOfMfc>false</UseOfMfc>
           53  +    <PlatformToolset>v120</PlatformToolset>
           54  +  </PropertyGroup>
           55  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
           56  +    <ConfigurationType>StaticLibrary</ConfigurationType>
           57  +    <UseOfMfc>false</UseOfMfc>
           58  +    <PlatformToolset>v120</PlatformToolset>
           59  +    <CharacterSet>Unicode</CharacterSet>
           60  +  </PropertyGroup>
           61  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
           62  +    <ConfigurationType>StaticLibrary</ConfigurationType>
           63  +    <UseOfMfc>false</UseOfMfc>
           64  +    <PlatformToolset>v120</PlatformToolset>
           65  +  </PropertyGroup>
           66  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
           67  +    <ConfigurationType>StaticLibrary</ConfigurationType>
           68  +    <UseOfMfc>false</UseOfMfc>
           69  +    <PlatformToolset>v120</PlatformToolset>
           70  +  </PropertyGroup>
           71  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
           72  +    <ConfigurationType>StaticLibrary</ConfigurationType>
           73  +    <UseOfMfc>false</UseOfMfc>
           74  +    <PlatformToolset>v120</PlatformToolset>
           75  +  </PropertyGroup>
           76  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
           77  +    <ConfigurationType>StaticLibrary</ConfigurationType>
           78  +    <UseOfMfc>false</UseOfMfc>
           79  +    <PlatformToolset>v120</PlatformToolset>
           80  +  </PropertyGroup>
           81  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
           82  +    <ConfigurationType>StaticLibrary</ConfigurationType>
           83  +    <UseOfMfc>false</UseOfMfc>
           84  +    <PlatformToolset>v120</PlatformToolset>
           85  +  </PropertyGroup>
           86  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
           87  +    <ConfigurationType>StaticLibrary</ConfigurationType>
           88  +    <UseOfMfc>false</UseOfMfc>
           89  +    <PlatformToolset>v120</PlatformToolset>
           90  +  </PropertyGroup>
           91  +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
           92  +  <ImportGroup Label="ExtensionSettings">
           93  +  </ImportGroup>
           94  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
           95  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
           96  +  </ImportGroup>
           97  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
           98  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
           99  +  </ImportGroup>
          100  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
          101  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          102  +  </ImportGroup>
          103  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
          104  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          105  +  </ImportGroup>
          106  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
          107  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          108  +  </ImportGroup>
          109  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
          110  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          111  +  </ImportGroup>
          112  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
          113  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          114  +  </ImportGroup>
          115  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
          116  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          117  +  </ImportGroup>
          118  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
          119  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          120  +  </ImportGroup>
          121  +  <PropertyGroup Label="UserMacros" />
          122  +  <PropertyGroup>
          123  +    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
          124  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
          125  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
          126  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
          127  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
          128  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
          129  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
          130  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\</OutDir>
          131  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
          132  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
          133  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
          134  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\</OutDir>
          135  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
          136  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
          137  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
          138  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\</OutDir>
          139  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
          140  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
          141  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
          142  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
          143  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
          144  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
          145  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
          146  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
          147  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
          148  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
          149  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
          150  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
          151  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
          152  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
          153  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
          154  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
          155  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
          156  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
          157  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
          158  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
          159  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
          160  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
          161  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
          162  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
          163  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
          164  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
          165  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
          166  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
          167  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
          168  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
          169  +  </PropertyGroup>
          170  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
          171  +    <ClCompile>
          172  +      <Optimization>Disabled</Optimization>
          173  +      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          174  +      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          175  +      <ExceptionHandling>
          176  +      </ExceptionHandling>
          177  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          178  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          179  +      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
          180  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          181  +      <ObjectFileName>$(IntDir)</ObjectFileName>
          182  +      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
          183  +      <WarningLevel>Level3</WarningLevel>
          184  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          185  +      <DebugInformationFormat>OldStyle</DebugInformationFormat>
          186  +    </ClCompile>
          187  +    <ResourceCompile>
          188  +      <Culture>0x040c</Culture>
          189  +    </ResourceCompile>
          190  +    <Lib>
          191  +      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
          192  +      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
          193  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          194  +    </Lib>
          195  +  </ItemDefinitionGroup>
          196  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
          197  +    <ClCompile>
          198  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          199  +      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          200  +      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          201  +      <StringPooling>true</StringPooling>
          202  +      <ExceptionHandling>
          203  +      </ExceptionHandling>
          204  +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
          205  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          206  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          207  +      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
          208  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          209  +      <ObjectFileName>$(IntDir)</ObjectFileName>
          210  +      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
          211  +      <WarningLevel>Level3</WarningLevel>
          212  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          213  +    </ClCompile>
          214  +    <ResourceCompile>
          215  +      <Culture>0x040c</Culture>
          216  +    </ResourceCompile>
          217  +    <Lib>
          218  +      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
          219  +      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
          220  +      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
          221  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          222  +    </Lib>
          223  +  </ItemDefinitionGroup>
          224  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
          225  +    <ClCompile>
          226  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          227  +      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          228  +      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          229  +      <StringPooling>true</StringPooling>
          230  +      <ExceptionHandling>
          231  +      </ExceptionHandling>
          232  +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
          233  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          234  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          235  +      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
          236  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          237  +      <ObjectFileName>$(IntDir)</ObjectFileName>
          238  +      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
          239  +      <WarningLevel>Level3</WarningLevel>
          240  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          241  +    </ClCompile>
          242  +    <ResourceCompile>
          243  +      <Culture>0x040c</Culture>
          244  +    </ResourceCompile>
          245  +    <Lib>
          246  +      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
          247  +      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
          248  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          249  +    </Lib>
          250  +  </ItemDefinitionGroup>
          251  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
          252  +    <Midl>
          253  +      <TargetEnvironment>X64</TargetEnvironment>
          254  +    </Midl>
          255  +    <ClCompile>
          256  +      <Optimization>Disabled</Optimization>
          257  +      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          258  +      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          259  +      <ExceptionHandling>
          260  +      </ExceptionHandling>
          261  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          262  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          263  +      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
          264  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          265  +      <ObjectFileName>$(IntDir)</ObjectFileName>
          266  +      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
          267  +      <WarningLevel>Level3</WarningLevel>
          268  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          269  +      <DebugInformationFormat>OldStyle</DebugInformationFormat>
          270  +    </ClCompile>
          271  +    <ResourceCompile>
          272  +      <Culture>0x040c</Culture>
          273  +    </ResourceCompile>
          274  +    <Lib>
          275  +      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
          276  +      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
          277  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          278  +    </Lib>
          279  +  </ItemDefinitionGroup>
          280  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
          281  +    <Midl>
          282  +      <TargetEnvironment>Itanium</TargetEnvironment>
          283  +    </Midl>
          284  +    <ClCompile>
          285  +      <Optimization>Disabled</Optimization>
          286  +      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          287  +      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          288  +      <ExceptionHandling>
          289  +      </ExceptionHandling>
          290  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          291  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          292  +      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
          293  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          294  +      <ObjectFileName>$(IntDir)</ObjectFileName>
          295  +      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
          296  +      <WarningLevel>Level3</WarningLevel>
          297  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          298  +      <DebugInformationFormat>OldStyle</DebugInformationFormat>
          299  +    </ClCompile>
          300  +    <ResourceCompile>
          301  +      <Culture>0x040c</Culture>
          302  +    </ResourceCompile>
          303  +    <Lib>
          304  +      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
          305  +      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
          306  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          307  +    </Lib>
          308  +  </ItemDefinitionGroup>
          309  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
          310  +    <Midl>
          311  +      <TargetEnvironment>X64</TargetEnvironment>
          312  +    </Midl>
          313  +    <ClCompile>
          314  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          315  +      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          316  +      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          317  +      <StringPooling>true</StringPooling>
          318  +      <ExceptionHandling>
          319  +      </ExceptionHandling>
          320  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          321  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          322  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          323  +      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
          324  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          325  +      <ObjectFileName>$(IntDir)</ObjectFileName>
          326  +      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
          327  +      <WarningLevel>Level3</WarningLevel>
          328  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          329  +    </ClCompile>
          330  +    <ResourceCompile>
          331  +      <Culture>0x040c</Culture>
          332  +    </ResourceCompile>
          333  +    <Lib>
          334  +      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
          335  +      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
          336  +      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
          337  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          338  +    </Lib>
          339  +  </ItemDefinitionGroup>
          340  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
          341  +    <Midl>
          342  +      <TargetEnvironment>Itanium</TargetEnvironment>
          343  +    </Midl>
          344  +    <ClCompile>
          345  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          346  +      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          347  +      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          348  +      <StringPooling>true</StringPooling>
          349  +      <ExceptionHandling>
          350  +      </ExceptionHandling>
          351  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          352  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          353  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          354  +      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
          355  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          356  +      <ObjectFileName>$(IntDir)</ObjectFileName>
          357  +      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
          358  +      <WarningLevel>Level3</WarningLevel>
          359  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          360  +    </ClCompile>
          361  +    <ResourceCompile>
          362  +      <Culture>0x040c</Culture>
          363  +    </ResourceCompile>
          364  +    <Lib>
          365  +      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
          366  +      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
          367  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          368  +    </Lib>
          369  +  </ItemDefinitionGroup>
          370  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
          371  +    <Midl>
          372  +      <TargetEnvironment>X64</TargetEnvironment>
          373  +    </Midl>
          374  +    <ClCompile>
          375  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          376  +      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          377  +      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          378  +      <StringPooling>true</StringPooling>
          379  +      <ExceptionHandling>
          380  +      </ExceptionHandling>
          381  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          382  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          383  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          384  +      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
          385  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          386  +      <ObjectFileName>$(IntDir)</ObjectFileName>
          387  +      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
          388  +      <WarningLevel>Level3</WarningLevel>
          389  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          390  +    </ClCompile>
          391  +    <ResourceCompile>
          392  +      <Culture>0x040c</Culture>
          393  +    </ResourceCompile>
          394  +    <Lib>
          395  +      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
          396  +      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
          397  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          398  +    </Lib>
          399  +  </ItemDefinitionGroup>
          400  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
          401  +    <Midl>
          402  +      <TargetEnvironment>Itanium</TargetEnvironment>
          403  +    </Midl>
          404  +    <ClCompile>
          405  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          406  +      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          407  +      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          408  +      <StringPooling>true</StringPooling>
          409  +      <ExceptionHandling>
          410  +      </ExceptionHandling>
          411  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          412  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          413  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          414  +      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
          415  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          416  +      <ObjectFileName>$(IntDir)</ObjectFileName>
          417  +      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
          418  +      <WarningLevel>Level3</WarningLevel>
          419  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          420  +    </ClCompile>
          421  +    <ResourceCompile>
          422  +      <Culture>0x040c</Culture>
          423  +    </ResourceCompile>
          424  +    <Lib>
          425  +      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
          426  +      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
          427  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          428  +    </Lib>
          429  +  </ItemDefinitionGroup>
          430  +  <ItemGroup>
          431  +    <ClCompile Include="..\..\..\adler32.c" />
          432  +    <ClCompile Include="..\..\..\compress.c" />
          433  +    <ClCompile Include="..\..\..\crc32.c" />
          434  +    <ClCompile Include="..\..\..\deflate.c" />
          435  +    <ClCompile Include="..\..\..\gzclose.c" />
          436  +    <ClCompile Include="..\..\..\gzlib.c" />
          437  +    <ClCompile Include="..\..\..\gzread.c" />
          438  +    <ClCompile Include="..\..\..\gzwrite.c" />
          439  +    <ClCompile Include="..\..\..\infback.c" />
          440  +    <ClCompile Include="..\..\masmx64\inffas8664.c">
          441  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
          442  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
          443  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
          444  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
          445  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
          446  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
          447  +    </ClCompile>
          448  +    <ClCompile Include="..\..\..\inffast.c" />
          449  +    <ClCompile Include="..\..\..\inflate.c" />
          450  +    <ClCompile Include="..\..\..\inftrees.c" />
          451  +    <ClCompile Include="..\..\minizip\ioapi.c" />
          452  +    <ClCompile Include="..\..\..\trees.c" />
          453  +    <ClCompile Include="..\..\..\uncompr.c" />
          454  +    <ClCompile Include="..\..\minizip\unzip.c" />
          455  +    <ClCompile Include="..\..\minizip\zip.c" />
          456  +    <ClCompile Include="..\..\..\zutil.c" />
          457  +  </ItemGroup>
          458  +  <ItemGroup>
          459  +    <ResourceCompile Include="zlib.rc" />
          460  +  </ItemGroup>
          461  +  <ItemGroup>
          462  +    <None Include="zlibvc.def" />
          463  +  </ItemGroup>
          464  +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
          465  +  <ImportGroup Label="ExtensionTargets">
          466  +  </ImportGroup>
          467  +</Project>

Added jni/tcl/compat/zlib/contrib/vstudio/vc12/zlibvc.def.

            1  +LIBRARY
            2  +; zlib data compression and ZIP file I/O library
            3  +
            4  +VERSION		1.2
            5  +
            6  +EXPORTS
            7  +        adler32                                  @1
            8  +        compress                                 @2
            9  +        crc32                                    @3
           10  +        deflate                                  @4
           11  +        deflateCopy                              @5
           12  +        deflateEnd                               @6
           13  +        deflateInit2_                            @7
           14  +        deflateInit_                             @8
           15  +        deflateParams                            @9
           16  +        deflateReset                             @10
           17  +        deflateSetDictionary                     @11
           18  +        gzclose                                  @12
           19  +        gzdopen                                  @13
           20  +        gzerror                                  @14
           21  +        gzflush                                  @15
           22  +        gzopen                                   @16
           23  +        gzread                                   @17
           24  +        gzwrite                                  @18
           25  +        inflate                                  @19
           26  +        inflateEnd                               @20
           27  +        inflateInit2_                            @21
           28  +        inflateInit_                             @22
           29  +        inflateReset                             @23
           30  +        inflateSetDictionary                     @24
           31  +        inflateSync                              @25
           32  +        uncompress                               @26
           33  +        zlibVersion                              @27
           34  +        gzprintf                                 @28
           35  +        gzputc                                   @29
           36  +        gzgetc                                   @30
           37  +        gzseek                                   @31
           38  +        gzrewind                                 @32
           39  +        gztell                                   @33
           40  +        gzeof                                    @34
           41  +        gzsetparams                              @35
           42  +        zError                                   @36
           43  +        inflateSyncPoint                         @37
           44  +        get_crc_table                            @38
           45  +        compress2                                @39
           46  +        gzputs                                   @40
           47  +        gzgets                                   @41
           48  +        inflateCopy                              @42
           49  +        inflateBackInit_                         @43
           50  +        inflateBack                              @44
           51  +        inflateBackEnd                           @45
           52  +        compressBound                            @46
           53  +        deflateBound                             @47
           54  +        gzclearerr                               @48
           55  +        gzungetc                                 @49
           56  +        zlibCompileFlags                         @50
           57  +        deflatePrime                             @51
           58  +        deflatePending                           @52
           59  +
           60  +        unzOpen                                  @61
           61  +        unzClose                                 @62
           62  +        unzGetGlobalInfo                         @63
           63  +        unzGetCurrentFileInfo                    @64
           64  +        unzGoToFirstFile                         @65
           65  +        unzGoToNextFile                          @66
           66  +        unzOpenCurrentFile                       @67
           67  +        unzReadCurrentFile                       @68
           68  +        unzOpenCurrentFile3                      @69
           69  +        unztell                                  @70
           70  +        unzeof                                   @71
           71  +        unzCloseCurrentFile                      @72
           72  +        unzGetGlobalComment                      @73
           73  +        unzStringFileNameCompare                 @74
           74  +        unzLocateFile                            @75
           75  +        unzGetLocalExtrafield                    @76
           76  +        unzOpen2                                 @77
           77  +        unzOpenCurrentFile2                      @78
           78  +        unzOpenCurrentFilePassword               @79
           79  +
           80  +        zipOpen                                  @80
           81  +        zipOpenNewFileInZip                      @81
           82  +        zipWriteInFileInZip                      @82
           83  +        zipCloseFileInZip                        @83
           84  +        zipClose                                 @84
           85  +        zipOpenNewFileInZip2                     @86
           86  +        zipCloseFileInZipRaw                     @87
           87  +        zipOpen2                                 @88
           88  +        zipOpenNewFileInZip3                     @89
           89  +
           90  +        unzGetFilePos                            @100
           91  +        unzGoToFilePos                           @101
           92  +
           93  +        fill_win32_filefunc                      @110
           94  +
           95  +; zlibwapi v1.2.4 added:
           96  +        fill_win32_filefunc64                   @111
           97  +        fill_win32_filefunc64A                  @112
           98  +        fill_win32_filefunc64W                  @113
           99  +
          100  +        unzOpen64                               @120
          101  +        unzOpen2_64                             @121
          102  +        unzGetGlobalInfo64                      @122
          103  +        unzGetCurrentFileInfo64                 @124
          104  +        unzGetCurrentFileZStreamPos64           @125
          105  +        unztell64                               @126
          106  +        unzGetFilePos64                         @127
          107  +        unzGoToFilePos64                        @128
          108  +
          109  +        zipOpen64                               @130
          110  +        zipOpen2_64                             @131
          111  +        zipOpenNewFileInZip64                   @132
          112  +        zipOpenNewFileInZip2_64                 @133
          113  +        zipOpenNewFileInZip3_64                 @134
          114  +        zipOpenNewFileInZip4_64                 @135
          115  +        zipCloseFileInZipRaw64                  @136
          116  +
          117  +; zlib1 v1.2.4 added:
          118  +        adler32_combine                         @140
          119  +        crc32_combine                           @142
          120  +        deflateSetHeader                        @144
          121  +        deflateTune                             @145
          122  +        gzbuffer                                @146
          123  +        gzclose_r                               @147
          124  +        gzclose_w                               @148
          125  +        gzdirect                                @149
          126  +        gzoffset                                @150
          127  +        inflateGetHeader                        @156
          128  +        inflateMark                             @157
          129  +        inflatePrime                            @158
          130  +        inflateReset2                           @159
          131  +        inflateUndermine                        @160
          132  +
          133  +; zlib1 v1.2.6 added:
          134  +        gzgetc_                                 @161
          135  +        inflateResetKeep                        @163
          136  +        deflateResetKeep                        @164
          137  +
          138  +; zlib1 v1.2.7 added:
          139  +        gzopen_w                                @165
          140  +
          141  +; zlib1 v1.2.8 added:
          142  +        inflateGetDictionary                    @166
          143  +        gzvprintf                               @167
          144  +
          145  +; zlib1 v1.2.9 added:
          146  +        inflateCodesUsed                        @168
          147  +        inflateValidate                         @169
          148  +        uncompress2                             @170
          149  +        gzfread                                 @171
          150  +        gzfwrite                                @172
          151  +        deflateGetDictionary                    @173
          152  +        adler32_z                               @174
          153  +        crc32_z                                 @175

Added jni/tcl/compat/zlib/contrib/vstudio/vc12/zlibvc.sln.

            1  +
            2  +Microsoft Visual Studio Solution File, Format Version 12.00
            3  +# Visual Studio 2013
            4  +VisualStudioVersion = 12.0.40629.0
            5  +MinimumVisualStudioVersion = 10.0.40219.1
            6  +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
            7  +EndProject
            8  +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
            9  +EndProject
           10  +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcxproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
           11  +EndProject
           12  +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlibdll", "testzlibdll.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
           13  +EndProject
           14  +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcxproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
           15  +EndProject
           16  +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
           17  +EndProject
           18  +Global
           19  +	GlobalSection(SolutionConfigurationPlatforms) = preSolution
           20  +		Debug|Itanium = Debug|Itanium
           21  +		Debug|Win32 = Debug|Win32
           22  +		Debug|x64 = Debug|x64
           23  +		Release|Itanium = Release|Itanium
           24  +		Release|Win32 = Release|Win32
           25  +		Release|x64 = Release|x64
           26  +		ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium
           27  +		ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32
           28  +		ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64
           29  +	EndGlobalSection
           30  +	GlobalSection(ProjectConfigurationPlatforms) = postSolution
           31  +		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Win32
           32  +		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32
           33  +		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32
           34  +		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64
           35  +		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64
           36  +		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Win32
           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 = Release|x64
           40  +		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64
           41  +		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
           42  +		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
           43  +		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
           44  +		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
           45  +		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
           46  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Win32
           47  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32
           48  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32
           49  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64
           50  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64
           51  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Win32
           52  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32
           53  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32
           54  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64
           55  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64
           56  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
           57  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
           58  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
           59  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
           60  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
           61  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
           62  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
           63  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
           64  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
           65  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
           66  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
           67  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
           68  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
           69  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
           70  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
           71  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
           72  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
           73  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
           74  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
           75  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
           76  +		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Win32
           77  +		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32
           78  +		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32
           79  +		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64
           80  +		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64
           81  +		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Win32
           82  +		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32
           83  +		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32
           84  +		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64
           85  +		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64
           86  +		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
           87  +		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
           88  +		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
           89  +		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
           90  +		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
           91  +		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
           92  +		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
           93  +		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
           94  +		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
           95  +		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
           96  +		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
           97  +		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
           98  +		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
           99  +		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
          100  +		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
          101  +		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
          102  +		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Win32
          103  +		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32
          104  +		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32
          105  +		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64
          106  +		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64
          107  +		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Win32
          108  +		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32
          109  +		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32
          110  +		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64
          111  +		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64
          112  +		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
          113  +		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
          114  +		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
          115  +	EndGlobalSection
          116  +	GlobalSection(SolutionProperties) = preSolution
          117  +		HideSolutionNode = FALSE
          118  +	EndGlobalSection
          119  +EndGlobal

Added jni/tcl/compat/zlib/contrib/vstudio/vc12/zlibvc.vcxproj.

            1  +<?xml version="1.0" encoding="utf-8"?>
            2  +<Project DefaultTargets="Build" ToolsVersion="12.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  +    <PlatformToolset>v120</PlatformToolset>
           50  +  </PropertyGroup>
           51  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
           52  +    <ConfigurationType>DynamicLibrary</ConfigurationType>
           53  +    <UseOfMfc>false</UseOfMfc>
           54  +    <WholeProgramOptimization>true</WholeProgramOptimization>
           55  +    <PlatformToolset>v120</PlatformToolset>
           56  +  </PropertyGroup>
           57  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
           58  +    <ConfigurationType>DynamicLibrary</ConfigurationType>
           59  +    <UseOfMfc>false</UseOfMfc>
           60  +    <PlatformToolset>v120</PlatformToolset>
           61  +    <CharacterSet>Unicode</CharacterSet>
           62  +  </PropertyGroup>
           63  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
           64  +    <ConfigurationType>DynamicLibrary</ConfigurationType>
           65  +    <UseOfMfc>false</UseOfMfc>
           66  +    <WholeProgramOptimization>true</WholeProgramOptimization>
           67  +    <PlatformToolset>v120</PlatformToolset>
           68  +  </PropertyGroup>
           69  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
           70  +    <ConfigurationType>DynamicLibrary</ConfigurationType>
           71  +    <UseOfMfc>false</UseOfMfc>
           72  +    <WholeProgramOptimization>true</WholeProgramOptimization>
           73  +    <PlatformToolset>v120</PlatformToolset>
           74  +  </PropertyGroup>
           75  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
           76  +    <ConfigurationType>DynamicLibrary</ConfigurationType>
           77  +    <UseOfMfc>false</UseOfMfc>
           78  +    <PlatformToolset>v120</PlatformToolset>
           79  +  </PropertyGroup>
           80  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
           81  +    <ConfigurationType>DynamicLibrary</ConfigurationType>
           82  +    <UseOfMfc>false</UseOfMfc>
           83  +    <WholeProgramOptimization>true</WholeProgramOptimization>
           84  +    <PlatformToolset>v120</PlatformToolset>
           85  +  </PropertyGroup>
           86  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
           87  +    <ConfigurationType>DynamicLibrary</ConfigurationType>
           88  +    <UseOfMfc>false</UseOfMfc>
           89  +    <WholeProgramOptimization>true</WholeProgramOptimization>
           90  +    <PlatformToolset>v120</PlatformToolset>
           91  +  </PropertyGroup>
           92  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
           93  +    <ConfigurationType>DynamicLibrary</ConfigurationType>
           94  +    <UseOfMfc>false</UseOfMfc>
           95  +    <PlatformToolset>v120</PlatformToolset>
           96  +  </PropertyGroup>
           97  +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
           98  +  <ImportGroup Label="ExtensionSettings">
           99  +  </ImportGroup>
          100  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
          101  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          102  +  </ImportGroup>
          103  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
          104  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          105  +  </ImportGroup>
          106  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
          107  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          108  +  </ImportGroup>
          109  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
          110  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          111  +  </ImportGroup>
          112  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
          113  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          114  +  </ImportGroup>
          115  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
          116  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          117  +  </ImportGroup>
          118  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
          119  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          120  +  </ImportGroup>
          121  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
          122  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          123  +  </ImportGroup>
          124  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
          125  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          126  +  </ImportGroup>
          127  +  <PropertyGroup Label="UserMacros" />
          128  +  <PropertyGroup>
          129  +    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
          130  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
          131  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
          132  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
          133  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
          134  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
          135  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
          136  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>
          137  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>
          138  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\</OutDir>
          139  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibDll$(Configuration)\Tmp\</IntDir>
          140  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
          141  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
          142  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\</OutDir>
          143  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
          144  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
          145  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
          146  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
          147  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
          148  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
          149  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
          150  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\</OutDir>
          151  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
          152  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</LinkIncremental>
          153  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>
          154  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
          155  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
          156  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>
          157  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>
          158  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\</OutDir>
          159  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibDll$(Configuration)\Tmp\</IntDir>
          160  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
          161  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
          162  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\</OutDir>
          163  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibDll$(Configuration)\Tmp\</IntDir>
          164  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
          165  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
          166  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
          167  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
          168  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
          169  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
          170  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
          171  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
          172  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
          173  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
          174  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
          175  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
          176  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
          177  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
          178  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
          179  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
          180  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
          181  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
          182  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
          183  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
          184  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
          185  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
          186  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
          187  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
          188  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
          189  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
          190  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
          191  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
          192  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
          193  +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">zlibwapi</TargetName>
          194  +    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">zlibwapi</TargetName>
          195  +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">zlibwapi</TargetName>
          196  +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">zlibwapi</TargetName>
          197  +    <TargetName Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">zlibwapi</TargetName>
          198  +    <TargetName Condition="'$(Configuration)|$(Platform)'=='Release|x64'">zlibwapi</TargetName>
          199  +  </PropertyGroup>
          200  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
          201  +    <Midl>
          202  +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          203  +      <MkTypLibCompatible>true</MkTypLibCompatible>
          204  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          205  +      <TargetEnvironment>Win32</TargetEnvironment>
          206  +      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
          207  +    </Midl>
          208  +    <ClCompile>
          209  +      <Optimization>Disabled</Optimization>
          210  +      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          211  +      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          212  +      <ExceptionHandling>
          213  +      </ExceptionHandling>
          214  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          215  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          216  +      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
          217  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          218  +      <ObjectFileName>$(IntDir)</ObjectFileName>
          219  +      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
          220  +      <BrowseInformation>
          221  +      </BrowseInformation>
          222  +      <WarningLevel>Level3</WarningLevel>
          223  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          224  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          225  +    </ClCompile>
          226  +    <ResourceCompile>
          227  +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          228  +      <Culture>0x040c</Culture>
          229  +    </ResourceCompile>
          230  +    <Link>
          231  +      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
          232  +      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
          233  +      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
          234  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          235  +      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
          236  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          237  +      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
          238  +      <GenerateMapFile>true</GenerateMapFile>
          239  +      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
          240  +      <SubSystem>Windows</SubSystem>
          241  +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
          242  +      <DataExecutionPrevention>
          243  +      </DataExecutionPrevention>
          244  +      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
          245  +    </Link>
          246  +    <PreBuildEvent>
          247  +      <Command>cd ..\..\masmx86
          248  +bld_ml32.bat</Command>
          249  +    </PreBuildEvent>
          250  +  </ItemDefinitionGroup>
          251  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
          252  +    <Midl>
          253  +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          254  +      <MkTypLibCompatible>true</MkTypLibCompatible>
          255  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          256  +      <TargetEnvironment>Win32</TargetEnvironment>
          257  +      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
          258  +    </Midl>
          259  +    <ClCompile>
          260  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          261  +      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          262  +      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          263  +      <StringPooling>true</StringPooling>
          264  +      <ExceptionHandling>
          265  +      </ExceptionHandling>
          266  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          267  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          268  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          269  +      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
          270  +      <AssemblerOutput>All</AssemblerOutput>
          271  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          272  +      <ObjectFileName>$(IntDir)</ObjectFileName>
          273  +      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
          274  +      <BrowseInformation>
          275  +      </BrowseInformation>
          276  +      <WarningLevel>Level3</WarningLevel>
          277  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          278  +    </ClCompile>
          279  +    <ResourceCompile>
          280  +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          281  +      <Culture>0x040c</Culture>
          282  +    </ResourceCompile>
          283  +    <Link>
          284  +      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
          285  +      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
          286  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          287  +      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
          288  +      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
          289  +      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
          290  +      <GenerateMapFile>true</GenerateMapFile>
          291  +      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
          292  +      <SubSystem>Windows</SubSystem>
          293  +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
          294  +      <DataExecutionPrevention>
          295  +      </DataExecutionPrevention>
          296  +      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
          297  +    </Link>
          298  +  </ItemDefinitionGroup>
          299  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
          300  +    <Midl>
          301  +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          302  +      <MkTypLibCompatible>true</MkTypLibCompatible>
          303  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          304  +      <TargetEnvironment>Win32</TargetEnvironment>
          305  +      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
          306  +    </Midl>
          307  +    <ClCompile>
          308  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          309  +      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          310  +      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          311  +      <StringPooling>true</StringPooling>
          312  +      <ExceptionHandling>
          313  +      </ExceptionHandling>
          314  +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
          315  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          316  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          317  +      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
          318  +      <AssemblerOutput>All</AssemblerOutput>
          319  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          320  +      <ObjectFileName>$(IntDir)</ObjectFileName>
          321  +      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
          322  +      <BrowseInformation>
          323  +      </BrowseInformation>
          324  +      <WarningLevel>Level3</WarningLevel>
          325  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          326  +    </ClCompile>
          327  +    <ResourceCompile>
          328  +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          329  +      <Culture>0x040c</Culture>
          330  +    </ResourceCompile>
          331  +    <Link>
          332  +      <AdditionalOptions>/MACHINE:I386 %(AdditionalOptions)</AdditionalOptions>
          333  +      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
          334  +      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
          335  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          336  +      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
          337  +      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
          338  +      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
          339  +      <GenerateMapFile>true</GenerateMapFile>
          340  +      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
          341  +      <SubSystem>Windows</SubSystem>
          342  +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
          343  +      <DataExecutionPrevention>
          344  +      </DataExecutionPrevention>
          345  +      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
          346  +      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
          347  +    </Link>
          348  +    <PreBuildEvent>
          349  +      <Command>cd ..\..\masmx86
          350  +bld_ml32.bat</Command>
          351  +    </PreBuildEvent>
          352  +  </ItemDefinitionGroup>
          353  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
          354  +    <Midl>
          355  +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          356  +      <MkTypLibCompatible>true</MkTypLibCompatible>
          357  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          358  +      <TargetEnvironment>X64</TargetEnvironment>
          359  +      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
          360  +    </Midl>
          361  +    <ClCompile>
          362  +      <Optimization>Disabled</Optimization>
          363  +      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          364  +      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          365  +      <ExceptionHandling>
          366  +      </ExceptionHandling>
          367  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          368  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          369  +      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
          370  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          371  +      <ObjectFileName>$(IntDir)</ObjectFileName>
          372  +      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
          373  +      <BrowseInformation>
          374  +      </BrowseInformation>
          375  +      <WarningLevel>Level3</WarningLevel>
          376  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          377  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          378  +    </ClCompile>
          379  +    <ResourceCompile>
          380  +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          381  +      <Culture>0x040c</Culture>
          382  +    </ResourceCompile>
          383  +    <Link>
          384  +      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
          385  +      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
          386  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          387  +      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
          388  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          389  +      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
          390  +      <GenerateMapFile>true</GenerateMapFile>
          391  +      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
          392  +      <SubSystem>Windows</SubSystem>
          393  +      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
          394  +      <TargetMachine>MachineX64</TargetMachine>
          395  +    </Link>
          396  +    <PreBuildEvent>
          397  +      <Command>cd ..\..\contrib\masmx64
          398  +bld_ml64.bat</Command>
          399  +    </PreBuildEvent>
          400  +  </ItemDefinitionGroup>
          401  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
          402  +    <Midl>
          403  +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          404  +      <MkTypLibCompatible>true</MkTypLibCompatible>
          405  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          406  +      <TargetEnvironment>Itanium</TargetEnvironment>
          407  +      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
          408  +    </Midl>
          409  +    <ClCompile>
          410  +      <Optimization>Disabled</Optimization>
          411  +      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          412  +      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          413  +      <ExceptionHandling>
          414  +      </ExceptionHandling>
          415  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          416  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          417  +      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
          418  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          419  +      <ObjectFileName>$(IntDir)</ObjectFileName>
          420  +      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
          421  +      <BrowseInformation>
          422  +      </BrowseInformation>
          423  +      <WarningLevel>Level3</WarningLevel>
          424  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          425  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          426  +    </ClCompile>
          427  +    <ResourceCompile>
          428  +      <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          429  +      <Culture>0x040c</Culture>
          430  +    </ResourceCompile>
          431  +    <Link>
          432  +      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
          433  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          434  +      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
          435  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          436  +      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
          437  +      <GenerateMapFile>true</GenerateMapFile>
          438  +      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
          439  +      <SubSystem>Windows</SubSystem>
          440  +      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
          441  +      <TargetMachine>MachineIA64</TargetMachine>
          442  +    </Link>
          443  +  </ItemDefinitionGroup>
          444  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
          445  +    <Midl>
          446  +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          447  +      <MkTypLibCompatible>true</MkTypLibCompatible>
          448  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          449  +      <TargetEnvironment>X64</TargetEnvironment>
          450  +      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
          451  +    </Midl>
          452  +    <ClCompile>
          453  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          454  +      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          455  +      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          456  +      <StringPooling>true</StringPooling>
          457  +      <ExceptionHandling>
          458  +      </ExceptionHandling>
          459  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          460  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          461  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          462  +      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
          463  +      <AssemblerOutput>All</AssemblerOutput>
          464  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          465  +      <ObjectFileName>$(IntDir)</ObjectFileName>
          466  +      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
          467  +      <BrowseInformation>
          468  +      </BrowseInformation>
          469  +      <WarningLevel>Level3</WarningLevel>
          470  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          471  +    </ClCompile>
          472  +    <ResourceCompile>
          473  +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          474  +      <Culture>0x040c</Culture>
          475  +    </ResourceCompile>
          476  +    <Link>
          477  +      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
          478  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          479  +      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
          480  +      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
          481  +      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
          482  +      <GenerateMapFile>true</GenerateMapFile>
          483  +      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
          484  +      <SubSystem>Windows</SubSystem>
          485  +      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
          486  +      <TargetMachine>MachineX64</TargetMachine>
          487  +    </Link>
          488  +  </ItemDefinitionGroup>
          489  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
          490  +    <Midl>
          491  +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          492  +      <MkTypLibCompatible>true</MkTypLibCompatible>
          493  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          494  +      <TargetEnvironment>Itanium</TargetEnvironment>
          495  +      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
          496  +    </Midl>
          497  +    <ClCompile>
          498  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          499  +      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          500  +      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          501  +      <StringPooling>true</StringPooling>
          502  +      <ExceptionHandling>
          503  +      </ExceptionHandling>
          504  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          505  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          506  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          507  +      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
          508  +      <AssemblerOutput>All</AssemblerOutput>
          509  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          510  +      <ObjectFileName>$(IntDir)</ObjectFileName>
          511  +      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
          512  +      <BrowseInformation>
          513  +      </BrowseInformation>
          514  +      <WarningLevel>Level3</WarningLevel>
          515  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          516  +    </ClCompile>
          517  +    <ResourceCompile>
          518  +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          519  +      <Culture>0x040c</Culture>
          520  +    </ResourceCompile>
          521  +    <Link>
          522  +      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
          523  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          524  +      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
          525  +      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
          526  +      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
          527  +      <GenerateMapFile>true</GenerateMapFile>
          528  +      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
          529  +      <SubSystem>Windows</SubSystem>
          530  +      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
          531  +      <TargetMachine>MachineIA64</TargetMachine>
          532  +    </Link>
          533  +  </ItemDefinitionGroup>
          534  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
          535  +    <Midl>
          536  +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          537  +      <MkTypLibCompatible>true</MkTypLibCompatible>
          538  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          539  +      <TargetEnvironment>X64</TargetEnvironment>
          540  +      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
          541  +    </Midl>
          542  +    <ClCompile>
          543  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          544  +      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          545  +      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          546  +      <StringPooling>true</StringPooling>
          547  +      <ExceptionHandling>
          548  +      </ExceptionHandling>
          549  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          550  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          551  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          552  +      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
          553  +      <AssemblerOutput>All</AssemblerOutput>
          554  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          555  +      <ObjectFileName>$(IntDir)</ObjectFileName>
          556  +      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
          557  +      <BrowseInformation>
          558  +      </BrowseInformation>
          559  +      <WarningLevel>Level3</WarningLevel>
          560  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          561  +    </ClCompile>
          562  +    <ResourceCompile>
          563  +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          564  +      <Culture>0x040c</Culture>
          565  +    </ResourceCompile>
          566  +    <Link>
          567  +      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
          568  +      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
          569  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          570  +      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
          571  +      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
          572  +      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
          573  +      <GenerateMapFile>true</GenerateMapFile>
          574  +      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
          575  +      <SubSystem>Windows</SubSystem>
          576  +      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
          577  +      <TargetMachine>MachineX64</TargetMachine>
          578  +    </Link>
          579  +    <PreBuildEvent>
          580  +      <Command>cd ..\..\masmx64
          581  +bld_ml64.bat</Command>
          582  +    </PreBuildEvent>
          583  +  </ItemDefinitionGroup>
          584  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
          585  +    <Midl>
          586  +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          587  +      <MkTypLibCompatible>true</MkTypLibCompatible>
          588  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          589  +      <TargetEnvironment>Itanium</TargetEnvironment>
          590  +      <TypeLibraryName>$(OutDir)zlibvc.tlb</TypeLibraryName>
          591  +    </Midl>
          592  +    <ClCompile>
          593  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          594  +      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          595  +      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ZLIB_WINAPI;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          596  +      <StringPooling>true</StringPooling>
          597  +      <ExceptionHandling>
          598  +      </ExceptionHandling>
          599  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          600  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          601  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          602  +      <PrecompiledHeaderOutputFile>$(IntDir)zlibvc.pch</PrecompiledHeaderOutputFile>
          603  +      <AssemblerOutput>All</AssemblerOutput>
          604  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          605  +      <ObjectFileName>$(IntDir)</ObjectFileName>
          606  +      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
          607  +      <BrowseInformation>
          608  +      </BrowseInformation>
          609  +      <WarningLevel>Level3</WarningLevel>
          610  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          611  +    </ClCompile>
          612  +    <ResourceCompile>
          613  +      <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          614  +      <Culture>0x040c</Culture>
          615  +    </ResourceCompile>
          616  +    <Link>
          617  +      <OutputFile>$(OutDir)zlibwapi.dll</OutputFile>
          618  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          619  +      <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
          620  +      <ModuleDefinitionFile>.\zlibvc.def</ModuleDefinitionFile>
          621  +      <ProgramDatabaseFile>$(OutDir)zlibwapi.pdb</ProgramDatabaseFile>
          622  +      <GenerateMapFile>true</GenerateMapFile>
          623  +      <MapFileName>$(OutDir)zlibwapi.map</MapFileName>
          624  +      <SubSystem>Windows</SubSystem>
          625  +      <ImportLibrary>$(OutDir)zlibwapi.lib</ImportLibrary>
          626  +      <TargetMachine>MachineIA64</TargetMachine>
          627  +    </Link>
          628  +  </ItemDefinitionGroup>
          629  +  <ItemGroup>
          630  +    <ClCompile Include="..\..\..\adler32.c" />
          631  +    <ClCompile Include="..\..\..\compress.c" />
          632  +    <ClCompile Include="..\..\..\crc32.c" />
          633  +    <ClCompile Include="..\..\..\deflate.c" />
          634  +    <ClCompile Include="..\..\..\gzclose.c" />
          635  +    <ClCompile Include="..\..\..\gzlib.c" />
          636  +    <ClCompile Include="..\..\..\gzread.c" />
          637  +    <ClCompile Include="..\..\..\gzwrite.c" />
          638  +    <ClCompile Include="..\..\..\infback.c" />
          639  +    <ClCompile Include="..\..\masmx64\inffas8664.c">
          640  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
          641  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
          642  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
          643  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
          644  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
          645  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
          646  +    </ClCompile>
          647  +    <ClCompile Include="..\..\..\inffast.c" />
          648  +    <ClCompile Include="..\..\..\inflate.c" />
          649  +    <ClCompile Include="..\..\..\inftrees.c" />
          650  +    <ClCompile Include="..\..\minizip\ioapi.c" />
          651  +    <ClCompile Include="..\..\minizip\iowin32.c" />
          652  +    <ClCompile Include="..\..\..\trees.c" />
          653  +    <ClCompile Include="..\..\..\uncompr.c" />
          654  +    <ClCompile Include="..\..\minizip\unzip.c">
          655  +      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          656  +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          657  +      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          658  +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          659  +      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          660  +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          661  +    </ClCompile>
          662  +    <ClCompile Include="..\..\minizip\zip.c">
          663  +      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          664  +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          665  +      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          666  +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          667  +      <AdditionalIncludeDirectories Condition="'$(Configuration)|$(Platform)'=='Release|x64'">%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          668  +      <PreprocessorDefinitions Condition="'$(Configuration)|$(Platform)'=='Release|x64'">ZLIB_INTERNAL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          669  +    </ClCompile>
          670  +    <ClCompile Include="..\..\..\zutil.c" />
          671  +  </ItemGroup>
          672  +  <ItemGroup>
          673  +    <ResourceCompile Include="zlib.rc" />
          674  +  </ItemGroup>
          675  +  <ItemGroup>
          676  +    <None Include="zlibvc.def" />
          677  +  </ItemGroup>
          678  +  <ItemGroup>
          679  +    <ClInclude Include="..\..\..\deflate.h" />
          680  +    <ClInclude Include="..\..\..\infblock.h" />
          681  +    <ClInclude Include="..\..\..\infcodes.h" />
          682  +    <ClInclude Include="..\..\..\inffast.h" />
          683  +    <ClInclude Include="..\..\..\inftrees.h" />
          684  +    <ClInclude Include="..\..\..\infutil.h" />
          685  +    <ClInclude Include="..\..\..\zconf.h" />
          686  +    <ClInclude Include="..\..\..\zlib.h" />
          687  +    <ClInclude Include="..\..\..\zutil.h" />
          688  +  </ItemGroup>
          689  +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
          690  +  <ImportGroup Label="ExtensionTargets">
          691  +  </ImportGroup>
          692  +</Project>

Added jni/tcl/compat/zlib/contrib/vstudio/vc14/miniunz.vcxproj.

            1  +<?xml version="1.0" encoding="utf-8"?>
            2  +<Project DefaultTargets="Build" ToolsVersion="14.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  +    <PlatformToolset>v140</PlatformToolset>
           38  +  </PropertyGroup>
           39  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
           40  +    <ConfigurationType>Application</ConfigurationType>
           41  +    <CharacterSet>Unicode</CharacterSet>
           42  +    <PlatformToolset>v140</PlatformToolset>
           43  +  </PropertyGroup>
           44  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
           45  +    <ConfigurationType>Application</ConfigurationType>
           46  +    <CharacterSet>MultiByte</CharacterSet>
           47  +    <PlatformToolset>v140</PlatformToolset>
           48  +  </PropertyGroup>
           49  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
           50  +    <ConfigurationType>Application</ConfigurationType>
           51  +    <CharacterSet>MultiByte</CharacterSet>
           52  +    <PlatformToolset>v140</PlatformToolset>
           53  +  </PropertyGroup>
           54  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
           55  +    <ConfigurationType>Application</ConfigurationType>
           56  +    <CharacterSet>MultiByte</CharacterSet>
           57  +    <PlatformToolset>v140</PlatformToolset>
           58  +  </PropertyGroup>
           59  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
           60  +    <ConfigurationType>Application</ConfigurationType>
           61  +    <CharacterSet>MultiByte</CharacterSet>
           62  +    <PlatformToolset>v140</PlatformToolset>
           63  +  </PropertyGroup>
           64  +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
           65  +  <ImportGroup Label="ExtensionSettings">
           66  +  </ImportGroup>
           67  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" 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|Win32'" 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|Itanium'" 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|Itanium'" Label="PropertySheets">
           77  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
           78  +  </ImportGroup>
           79  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
           80  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
           81  +  </ImportGroup>
           82  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
           83  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
           84  +  </ImportGroup>
           85  +  <PropertyGroup Label="UserMacros" />
           86  +  <PropertyGroup>
           87  +    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
           88  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>
           89  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>
           90  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
           91  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
           92  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\</OutDir>
           93  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniUnzip$(Configuration)\Tmp\</IntDir>
           94  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
           95  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
           96  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\</OutDir>
           97  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>
           98  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
           99  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
          100  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>
          101  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>
          102  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
          103  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
          104  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\</OutDir>
          105  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\MiniUnzip$(Configuration)\Tmp\</IntDir>
          106  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
          107  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
          108  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\</OutDir>
          109  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\MiniUnzip$(Configuration)\Tmp\</IntDir>
          110  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
          111  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
          112  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
          113  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
          114  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
          115  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
          116  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
          117  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
          118  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
          119  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
          120  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
          121  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
          122  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
          123  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
          124  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
          125  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
          126  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
          127  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
          128  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
          129  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
          130  +  </PropertyGroup>
          131  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
          132  +    <ClCompile>
          133  +      <Optimization>Disabled</Optimization>
          134  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          135  +      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          136  +      <MinimalRebuild>true</MinimalRebuild>
          137  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          138  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          139  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          140  +      <PrecompiledHeader>
          141  +      </PrecompiledHeader>
          142  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          143  +      <WarningLevel>Level3</WarningLevel>
          144  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          145  +    </ClCompile>
          146  +    <Link>
          147  +      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          148  +      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
          149  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          150  +      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
          151  +      <SubSystem>Console</SubSystem>
          152  +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
          153  +      <DataExecutionPrevention>
          154  +      </DataExecutionPrevention>
          155  +      <TargetMachine>MachineX86</TargetMachine>
          156  +    </Link>
          157  +  </ItemDefinitionGroup>
          158  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
          159  +    <ClCompile>
          160  +      <Optimization>MaxSpeed</Optimization>
          161  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          162  +      <OmitFramePointers>true</OmitFramePointers>
          163  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          164  +      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          165  +      <StringPooling>true</StringPooling>
          166  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          167  +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
          168  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          169  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          170  +      <PrecompiledHeader>
          171  +      </PrecompiledHeader>
          172  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          173  +      <WarningLevel>Level3</WarningLevel>
          174  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          175  +    </ClCompile>
          176  +    <Link>
          177  +      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          178  +      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
          179  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          180  +      <SubSystem>Console</SubSystem>
          181  +      <OptimizeReferences>true</OptimizeReferences>
          182  +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
          183  +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
          184  +      <DataExecutionPrevention>
          185  +      </DataExecutionPrevention>
          186  +      <TargetMachine>MachineX86</TargetMachine>
          187  +    </Link>
          188  +  </ItemDefinitionGroup>
          189  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
          190  +    <Midl>
          191  +      <TargetEnvironment>X64</TargetEnvironment>
          192  +    </Midl>
          193  +    <ClCompile>
          194  +      <Optimization>Disabled</Optimization>
          195  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          196  +      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          197  +      <MinimalRebuild>true</MinimalRebuild>
          198  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          199  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          200  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          201  +      <PrecompiledHeader>
          202  +      </PrecompiledHeader>
          203  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          204  +      <WarningLevel>Level3</WarningLevel>
          205  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          206  +    </ClCompile>
          207  +    <Link>
          208  +      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          209  +      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
          210  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          211  +      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
          212  +      <SubSystem>Console</SubSystem>
          213  +      <TargetMachine>MachineX64</TargetMachine>
          214  +    </Link>
          215  +  </ItemDefinitionGroup>
          216  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
          217  +    <Midl>
          218  +      <TargetEnvironment>Itanium</TargetEnvironment>
          219  +    </Midl>
          220  +    <ClCompile>
          221  +      <Optimization>Disabled</Optimization>
          222  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          223  +      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          224  +      <MinimalRebuild>true</MinimalRebuild>
          225  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          226  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          227  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          228  +      <PrecompiledHeader>
          229  +      </PrecompiledHeader>
          230  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          231  +      <WarningLevel>Level3</WarningLevel>
          232  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          233  +    </ClCompile>
          234  +    <Link>
          235  +      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          236  +      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
          237  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          238  +      <ProgramDatabaseFile>$(OutDir)miniunz.pdb</ProgramDatabaseFile>
          239  +      <SubSystem>Console</SubSystem>
          240  +      <TargetMachine>MachineIA64</TargetMachine>
          241  +    </Link>
          242  +  </ItemDefinitionGroup>
          243  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
          244  +    <Midl>
          245  +      <TargetEnvironment>X64</TargetEnvironment>
          246  +    </Midl>
          247  +    <ClCompile>
          248  +      <Optimization>MaxSpeed</Optimization>
          249  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          250  +      <OmitFramePointers>true</OmitFramePointers>
          251  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          252  +      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          253  +      <StringPooling>true</StringPooling>
          254  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          255  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          256  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          257  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          258  +      <PrecompiledHeader>
          259  +      </PrecompiledHeader>
          260  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          261  +      <WarningLevel>Level3</WarningLevel>
          262  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          263  +    </ClCompile>
          264  +    <Link>
          265  +      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          266  +      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
          267  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          268  +      <SubSystem>Console</SubSystem>
          269  +      <OptimizeReferences>true</OptimizeReferences>
          270  +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
          271  +      <TargetMachine>MachineX64</TargetMachine>
          272  +    </Link>
          273  +  </ItemDefinitionGroup>
          274  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
          275  +    <Midl>
          276  +      <TargetEnvironment>Itanium</TargetEnvironment>
          277  +    </Midl>
          278  +    <ClCompile>
          279  +      <Optimization>MaxSpeed</Optimization>
          280  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          281  +      <OmitFramePointers>true</OmitFramePointers>
          282  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          283  +      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          284  +      <StringPooling>true</StringPooling>
          285  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          286  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          287  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          288  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          289  +      <PrecompiledHeader>
          290  +      </PrecompiledHeader>
          291  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          292  +      <WarningLevel>Level3</WarningLevel>
          293  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          294  +    </ClCompile>
          295  +    <Link>
          296  +      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          297  +      <OutputFile>$(OutDir)miniunz.exe</OutputFile>
          298  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          299  +      <SubSystem>Console</SubSystem>
          300  +      <OptimizeReferences>true</OptimizeReferences>
          301  +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
          302  +      <TargetMachine>MachineIA64</TargetMachine>
          303  +    </Link>
          304  +  </ItemDefinitionGroup>
          305  +  <ItemGroup>
          306  +    <ClCompile Include="..\..\minizip\miniunz.c" />
          307  +  </ItemGroup>
          308  +  <ItemGroup>
          309  +    <ProjectReference Include="zlibvc.vcxproj">
          310  +      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
          311  +    </ProjectReference>
          312  +  </ItemGroup>
          313  +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
          314  +  <ImportGroup Label="ExtensionTargets">
          315  +  </ImportGroup>
          316  +</Project>

Added jni/tcl/compat/zlib/contrib/vstudio/vc14/miniunz.vcxproj.user.

            1  +<?xml version="1.0" encoding="utf-8"?>
            2  +<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
            3  +  <PropertyGroup />
            4  +</Project>

Added jni/tcl/compat/zlib/contrib/vstudio/vc14/minizip.vcxproj.

            1  +<?xml version="1.0" encoding="utf-8"?>
            2  +<Project DefaultTargets="Build" ToolsVersion="14.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  +    <PlatformToolset>v140</PlatformToolset>
           38  +  </PropertyGroup>
           39  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
           40  +    <ConfigurationType>Application</ConfigurationType>
           41  +    <CharacterSet>Unicode</CharacterSet>
           42  +    <PlatformToolset>v140</PlatformToolset>
           43  +  </PropertyGroup>
           44  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
           45  +    <ConfigurationType>Application</ConfigurationType>
           46  +    <CharacterSet>MultiByte</CharacterSet>
           47  +    <PlatformToolset>v140</PlatformToolset>
           48  +  </PropertyGroup>
           49  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
           50  +    <ConfigurationType>Application</ConfigurationType>
           51  +    <CharacterSet>MultiByte</CharacterSet>
           52  +    <PlatformToolset>v140</PlatformToolset>
           53  +  </PropertyGroup>
           54  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
           55  +    <ConfigurationType>Application</ConfigurationType>
           56  +    <CharacterSet>MultiByte</CharacterSet>
           57  +    <PlatformToolset>v140</PlatformToolset>
           58  +  </PropertyGroup>
           59  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
           60  +    <ConfigurationType>Application</ConfigurationType>
           61  +    <CharacterSet>MultiByte</CharacterSet>
           62  +    <PlatformToolset>v140</PlatformToolset>
           63  +  </PropertyGroup>
           64  +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
           65  +  <ImportGroup Label="ExtensionSettings">
           66  +  </ImportGroup>
           67  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" 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|Win32'" 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|Itanium'" 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|Itanium'" Label="PropertySheets">
           77  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
           78  +  </ImportGroup>
           79  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
           80  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
           81  +  </ImportGroup>
           82  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
           83  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
           84  +  </ImportGroup>
           85  +  <PropertyGroup Label="UserMacros" />
           86  +  <PropertyGroup>
           87  +    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
           88  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\</OutDir>
           89  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>
           90  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
           91  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
           92  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\</OutDir>
           93  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\MiniZip$(Configuration)\Tmp\</IntDir>
           94  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
           95  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</OutDir>
           96  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\$(Configuration)\</IntDir>
           97  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
           98  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
           99  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</OutDir>
          100  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\$(Configuration)\</IntDir>
          101  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
          102  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
          103  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</OutDir>
          104  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\$(Configuration)\</IntDir>
          105  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
          106  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</OutDir>
          107  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\$(Configuration)\</IntDir>
          108  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
          109  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
          110  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
          111  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
          112  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
          113  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
          114  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
          115  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
          116  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
          117  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
          118  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
          119  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
          120  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
          121  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
          122  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
          123  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
          124  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
          125  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
          126  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
          127  +  </PropertyGroup>
          128  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
          129  +    <ClCompile>
          130  +      <Optimization>Disabled</Optimization>
          131  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          132  +      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          133  +      <MinimalRebuild>true</MinimalRebuild>
          134  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          135  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          136  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          137  +      <PrecompiledHeader>
          138  +      </PrecompiledHeader>
          139  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          140  +      <WarningLevel>Level3</WarningLevel>
          141  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          142  +    </ClCompile>
          143  +    <Link>
          144  +      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          145  +      <OutputFile>$(OutDir)minizip.exe</OutputFile>
          146  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          147  +      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
          148  +      <SubSystem>Console</SubSystem>
          149  +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
          150  +      <DataExecutionPrevention>
          151  +      </DataExecutionPrevention>
          152  +      <TargetMachine>MachineX86</TargetMachine>
          153  +    </Link>
          154  +  </ItemDefinitionGroup>
          155  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
          156  +    <ClCompile>
          157  +      <Optimization>MaxSpeed</Optimization>
          158  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          159  +      <OmitFramePointers>true</OmitFramePointers>
          160  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          161  +      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          162  +      <StringPooling>true</StringPooling>
          163  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          164  +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
          165  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          166  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          167  +      <PrecompiledHeader>
          168  +      </PrecompiledHeader>
          169  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          170  +      <WarningLevel>Level3</WarningLevel>
          171  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          172  +    </ClCompile>
          173  +    <Link>
          174  +      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          175  +      <OutputFile>$(OutDir)minizip.exe</OutputFile>
          176  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          177  +      <SubSystem>Console</SubSystem>
          178  +      <OptimizeReferences>true</OptimizeReferences>
          179  +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
          180  +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
          181  +      <DataExecutionPrevention>
          182  +      </DataExecutionPrevention>
          183  +      <TargetMachine>MachineX86</TargetMachine>
          184  +    </Link>
          185  +  </ItemDefinitionGroup>
          186  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
          187  +    <Midl>
          188  +      <TargetEnvironment>X64</TargetEnvironment>
          189  +    </Midl>
          190  +    <ClCompile>
          191  +      <Optimization>Disabled</Optimization>
          192  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          193  +      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          194  +      <MinimalRebuild>true</MinimalRebuild>
          195  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          196  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          197  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          198  +      <PrecompiledHeader>
          199  +      </PrecompiledHeader>
          200  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          201  +      <WarningLevel>Level3</WarningLevel>
          202  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          203  +    </ClCompile>
          204  +    <Link>
          205  +      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          206  +      <OutputFile>$(OutDir)minizip.exe</OutputFile>
          207  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          208  +      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
          209  +      <SubSystem>Console</SubSystem>
          210  +      <TargetMachine>MachineX64</TargetMachine>
          211  +    </Link>
          212  +  </ItemDefinitionGroup>
          213  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
          214  +    <Midl>
          215  +      <TargetEnvironment>Itanium</TargetEnvironment>
          216  +    </Midl>
          217  +    <ClCompile>
          218  +      <Optimization>Disabled</Optimization>
          219  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          220  +      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          221  +      <MinimalRebuild>true</MinimalRebuild>
          222  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          223  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          224  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          225  +      <PrecompiledHeader>
          226  +      </PrecompiledHeader>
          227  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          228  +      <WarningLevel>Level3</WarningLevel>
          229  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          230  +    </ClCompile>
          231  +    <Link>
          232  +      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          233  +      <OutputFile>$(OutDir)minizip.exe</OutputFile>
          234  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          235  +      <ProgramDatabaseFile>$(OutDir)minizip.pdb</ProgramDatabaseFile>
          236  +      <SubSystem>Console</SubSystem>
          237  +      <TargetMachine>MachineIA64</TargetMachine>
          238  +    </Link>
          239  +  </ItemDefinitionGroup>
          240  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
          241  +    <Midl>
          242  +      <TargetEnvironment>X64</TargetEnvironment>
          243  +    </Midl>
          244  +    <ClCompile>
          245  +      <Optimization>MaxSpeed</Optimization>
          246  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          247  +      <OmitFramePointers>true</OmitFramePointers>
          248  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          249  +      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          250  +      <StringPooling>true</StringPooling>
          251  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          252  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          253  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          254  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          255  +      <PrecompiledHeader>
          256  +      </PrecompiledHeader>
          257  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          258  +      <WarningLevel>Level3</WarningLevel>
          259  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          260  +    </ClCompile>
          261  +    <Link>
          262  +      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          263  +      <OutputFile>$(OutDir)minizip.exe</OutputFile>
          264  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          265  +      <SubSystem>Console</SubSystem>
          266  +      <OptimizeReferences>true</OptimizeReferences>
          267  +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
          268  +      <TargetMachine>MachineX64</TargetMachine>
          269  +    </Link>
          270  +  </ItemDefinitionGroup>
          271  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
          272  +    <Midl>
          273  +      <TargetEnvironment>Itanium</TargetEnvironment>
          274  +    </Midl>
          275  +    <ClCompile>
          276  +      <Optimization>MaxSpeed</Optimization>
          277  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          278  +      <OmitFramePointers>true</OmitFramePointers>
          279  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          280  +      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          281  +      <StringPooling>true</StringPooling>
          282  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          283  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          284  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          285  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          286  +      <PrecompiledHeader>
          287  +      </PrecompiledHeader>
          288  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          289  +      <WarningLevel>Level3</WarningLevel>
          290  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          291  +    </ClCompile>
          292  +    <Link>
          293  +      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          294  +      <OutputFile>$(OutDir)minizip.exe</OutputFile>
          295  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          296  +      <SubSystem>Console</SubSystem>
          297  +      <OptimizeReferences>true</OptimizeReferences>
          298  +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
          299  +      <TargetMachine>MachineIA64</TargetMachine>
          300  +    </Link>
          301  +  </ItemDefinitionGroup>
          302  +  <ItemGroup>
          303  +    <ClCompile Include="..\..\minizip\minizip.c" />
          304  +  </ItemGroup>
          305  +  <ItemGroup>
          306  +    <ProjectReference Include="zlibvc.vcxproj">
          307  +      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
          308  +    </ProjectReference>
          309  +  </ItemGroup>
          310  +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
          311  +  <ImportGroup Label="ExtensionTargets">
          312  +  </ImportGroup>
          313  +</Project>

Added jni/tcl/compat/zlib/contrib/vstudio/vc14/minizip.vcxproj.user.

            1  +<?xml version="1.0" encoding="utf-8"?>
            2  +<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
            3  +  <PropertyGroup />
            4  +</Project>

Added jni/tcl/compat/zlib/contrib/vstudio/vc14/testzlib.vcxproj.

            1  +<?xml version="1.0" encoding="utf-8"?>
            2  +<Project DefaultTargets="Build" ToolsVersion="14.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  +    <PlatformToolset>v140</PlatformToolset>
           52  +  </PropertyGroup>
           53  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
           54  +    <ConfigurationType>Application</ConfigurationType>
           55  +    <CharacterSet>MultiByte</CharacterSet>
           56  +    <WholeProgramOptimization>true</WholeProgramOptimization>
           57  +    <PlatformToolset>v140</PlatformToolset>
           58  +  </PropertyGroup>
           59  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
           60  +    <ConfigurationType>Application</ConfigurationType>
           61  +    <CharacterSet>Unicode</CharacterSet>
           62  +    <PlatformToolset>v140</PlatformToolset>
           63  +  </PropertyGroup>
           64  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
           65  +    <ConfigurationType>Application</ConfigurationType>
           66  +    <CharacterSet>MultiByte</CharacterSet>
           67  +    <WholeProgramOptimization>true</WholeProgramOptimization>
           68  +    <PlatformToolset>v140</PlatformToolset>
           69  +  </PropertyGroup>
           70  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
           71  +    <ConfigurationType>Application</ConfigurationType>
           72  +    <CharacterSet>MultiByte</CharacterSet>
           73  +    <WholeProgramOptimization>true</WholeProgramOptimization>
           74  +    <PlatformToolset>v140</PlatformToolset>
           75  +  </PropertyGroup>
           76  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
           77  +    <ConfigurationType>Application</ConfigurationType>
           78  +    <CharacterSet>MultiByte</CharacterSet>
           79  +    <PlatformToolset>v140</PlatformToolset>
           80  +  </PropertyGroup>
           81  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
           82  +    <ConfigurationType>Application</ConfigurationType>
           83  +    <WholeProgramOptimization>true</WholeProgramOptimization>
           84  +    <PlatformToolset>v140</PlatformToolset>
           85  +  </PropertyGroup>
           86  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
           87  +    <ConfigurationType>Application</ConfigurationType>
           88  +    <WholeProgramOptimization>true</WholeProgramOptimization>
           89  +    <PlatformToolset>v140</PlatformToolset>
           90  +  </PropertyGroup>
           91  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
           92  +    <ConfigurationType>Application</ConfigurationType>
           93  +    <PlatformToolset>v140</PlatformToolset>
           94  +  </PropertyGroup>
           95  +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
           96  +  <ImportGroup Label="ExtensionSettings">
           97  +  </ImportGroup>
           98  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" 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|Win32'" 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|Win32'" 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|Itanium'" 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|Itanium'" 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|Itanium'" Label="PropertySheets">
          114  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          115  +  </ImportGroup>
          116  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
          117  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          118  +  </ImportGroup>
          119  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
          120  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          121  +  </ImportGroup>
          122  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
          123  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          124  +  </ImportGroup>
          125  +  <PropertyGroup Label="UserMacros" />
          126  +  <PropertyGroup>
          127  +    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
          128  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\</OutDir>
          129  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
          130  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
          131  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
          132  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\</OutDir>
          133  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
          134  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</LinkIncremental>
          135  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">false</GenerateManifest>
          136  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\</OutDir>
          137  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlib$(Configuration)\Tmp\</IntDir>
          138  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
          139  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
          140  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\</OutDir>
          141  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
          142  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
          143  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
          144  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
          145  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
          146  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
          147  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\</OutDir>
          148  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
          149  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">false</GenerateManifest>
          150  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
          151  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
          152  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</LinkIncremental>
          153  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">false</GenerateManifest>
          154  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\</OutDir>
          155  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlib$(Configuration)\Tmp\</IntDir>
          156  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
          157  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\</OutDir>
          158  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlib$(Configuration)\Tmp\</IntDir>
          159  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
          160  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
          161  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
          162  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
          163  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
          164  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
          165  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
          166  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
          167  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
          168  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
          169  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
          170  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
          171  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
          172  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
          173  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
          174  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
          175  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
          176  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
          177  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
          178  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
          179  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
          180  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
          181  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
          182  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
          183  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
          184  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
          185  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
          186  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
          187  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
          188  +  </PropertyGroup>
          189  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
          190  +    <ClCompile>
          191  +      <Optimization>Disabled</Optimization>
          192  +      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          193  +      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          194  +      <MinimalRebuild>true</MinimalRebuild>
          195  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          196  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          197  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          198  +      <PrecompiledHeader>
          199  +      </PrecompiledHeader>
          200  +      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
          201  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          202  +      <WarningLevel>Level3</WarningLevel>
          203  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          204  +    </ClCompile>
          205  +    <Link>
          206  +      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
          207  +      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
          208  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          209  +      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
          210  +      <SubSystem>Console</SubSystem>
          211  +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
          212  +      <DataExecutionPrevention>
          213  +      </DataExecutionPrevention>
          214  +      <TargetMachine>MachineX86</TargetMachine>
          215  +    </Link>
          216  +  </ItemDefinitionGroup>
          217  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
          218  +    <ClCompile>
          219  +      <Optimization>MaxSpeed</Optimization>
          220  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          221  +      <OmitFramePointers>true</OmitFramePointers>
          222  +      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          223  +      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          224  +      <StringPooling>true</StringPooling>
          225  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          226  +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
          227  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          228  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          229  +      <PrecompiledHeader>
          230  +      </PrecompiledHeader>
          231  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          232  +      <WarningLevel>Level3</WarningLevel>
          233  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          234  +    </ClCompile>
          235  +    <Link>
          236  +      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
          237  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          238  +      <SubSystem>Console</SubSystem>
          239  +      <OptimizeReferences>true</OptimizeReferences>
          240  +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
          241  +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
          242  +      <DataExecutionPrevention>
          243  +      </DataExecutionPrevention>
          244  +      <TargetMachine>MachineX86</TargetMachine>
          245  +    </Link>
          246  +  </ItemDefinitionGroup>
          247  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
          248  +    <ClCompile>
          249  +      <Optimization>MaxSpeed</Optimization>
          250  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          251  +      <OmitFramePointers>true</OmitFramePointers>
          252  +      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          253  +      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          254  +      <StringPooling>true</StringPooling>
          255  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          256  +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
          257  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          258  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          259  +      <PrecompiledHeader>
          260  +      </PrecompiledHeader>
          261  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          262  +      <WarningLevel>Level3</WarningLevel>
          263  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          264  +    </ClCompile>
          265  +    <Link>
          266  +      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
          267  +      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
          268  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          269  +      <SubSystem>Console</SubSystem>
          270  +      <OptimizeReferences>true</OptimizeReferences>
          271  +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
          272  +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
          273  +      <DataExecutionPrevention>
          274  +      </DataExecutionPrevention>
          275  +      <TargetMachine>MachineX86</TargetMachine>
          276  +      <ImageHasSafeExceptionHandlers>false</ImageHasSafeExceptionHandlers>
          277  +    </Link>
          278  +  </ItemDefinitionGroup>
          279  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
          280  +    <ClCompile>
          281  +      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          282  +      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          283  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          284  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          285  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          286  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          287  +    </ClCompile>
          288  +    <Link>
          289  +      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
          290  +    </Link>
          291  +  </ItemDefinitionGroup>
          292  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
          293  +    <Midl>
          294  +      <TargetEnvironment>Itanium</TargetEnvironment>
          295  +    </Midl>
          296  +    <ClCompile>
          297  +      <Optimization>Disabled</Optimization>
          298  +      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          299  +      <PreprocessorDefinitions>ZLIB_WINAPI;_DEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          300  +      <MinimalRebuild>true</MinimalRebuild>
          301  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          302  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          303  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          304  +      <PrecompiledHeader>
          305  +      </PrecompiledHeader>
          306  +      <AssemblerOutput>AssemblyAndSourceCode</AssemblerOutput>
          307  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          308  +      <WarningLevel>Level3</WarningLevel>
          309  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          310  +    </ClCompile>
          311  +    <Link>
          312  +      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
          313  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          314  +      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
          315  +      <SubSystem>Console</SubSystem>
          316  +      <TargetMachine>MachineIA64</TargetMachine>
          317  +    </Link>
          318  +  </ItemDefinitionGroup>
          319  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
          320  +    <ClCompile>
          321  +      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          322  +      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          323  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          324  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          325  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          326  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          327  +    </ClCompile>
          328  +    <Link>
          329  +      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
          330  +    </Link>
          331  +  </ItemDefinitionGroup>
          332  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
          333  +    <Midl>
          334  +      <TargetEnvironment>Itanium</TargetEnvironment>
          335  +    </Midl>
          336  +    <ClCompile>
          337  +      <Optimization>MaxSpeed</Optimization>
          338  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          339  +      <OmitFramePointers>true</OmitFramePointers>
          340  +      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          341  +      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          342  +      <StringPooling>true</StringPooling>
          343  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          344  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          345  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          346  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          347  +      <PrecompiledHeader>
          348  +      </PrecompiledHeader>
          349  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          350  +      <WarningLevel>Level3</WarningLevel>
          351  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          352  +    </ClCompile>
          353  +    <Link>
          354  +      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
          355  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          356  +      <SubSystem>Console</SubSystem>
          357  +      <OptimizeReferences>true</OptimizeReferences>
          358  +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
          359  +      <TargetMachine>MachineIA64</TargetMachine>
          360  +    </Link>
          361  +  </ItemDefinitionGroup>
          362  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
          363  +    <ClCompile>
          364  +      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          365  +      <PreprocessorDefinitions>ASMV;ASMINF;WIN32;ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          366  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          367  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          368  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          369  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          370  +    </ClCompile>
          371  +    <Link>
          372  +      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
          373  +    </Link>
          374  +  </ItemDefinitionGroup>
          375  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
          376  +    <Midl>
          377  +      <TargetEnvironment>Itanium</TargetEnvironment>
          378  +    </Midl>
          379  +    <ClCompile>
          380  +      <Optimization>MaxSpeed</Optimization>
          381  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          382  +      <OmitFramePointers>true</OmitFramePointers>
          383  +      <AdditionalIncludeDirectories>..\..\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          384  +      <PreprocessorDefinitions>ZLIB_WINAPI;NDEBUG;_CONSOLE;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          385  +      <StringPooling>true</StringPooling>
          386  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          387  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          388  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          389  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          390  +      <PrecompiledHeader>
          391  +      </PrecompiledHeader>
          392  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          393  +      <WarningLevel>Level3</WarningLevel>
          394  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          395  +    </ClCompile>
          396  +    <Link>
          397  +      <OutputFile>$(OutDir)testzlib.exe</OutputFile>
          398  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          399  +      <SubSystem>Console</SubSystem>
          400  +      <OptimizeReferences>true</OptimizeReferences>
          401  +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
          402  +      <TargetMachine>MachineIA64</TargetMachine>
          403  +    </Link>
          404  +  </ItemDefinitionGroup>
          405  +  <ItemGroup>
          406  +    <ClCompile Include="..\..\..\adler32.c" />
          407  +    <ClCompile Include="..\..\..\compress.c" />
          408  +    <ClCompile Include="..\..\..\crc32.c" />
          409  +    <ClCompile Include="..\..\..\deflate.c" />
          410  +    <ClCompile Include="..\..\..\infback.c" />
          411  +    <ClCompile Include="..\..\masmx64\inffas8664.c">
          412  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
          413  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
          414  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
          415  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
          416  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
          417  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
          418  +    </ClCompile>
          419  +    <ClCompile Include="..\..\..\inffast.c" />
          420  +    <ClCompile Include="..\..\..\inflate.c" />
          421  +    <ClCompile Include="..\..\..\inftrees.c" />
          422  +    <ClCompile Include="..\..\testzlib\testzlib.c" />
          423  +    <ClCompile Include="..\..\..\trees.c" />
          424  +    <ClCompile Include="..\..\..\uncompr.c" />
          425  +    <ClCompile Include="..\..\..\zutil.c" />
          426  +  </ItemGroup>
          427  +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
          428  +  <ImportGroup Label="ExtensionTargets">
          429  +  </ImportGroup>
          430  +</Project>

Added jni/tcl/compat/zlib/contrib/vstudio/vc14/testzlib.vcxproj.user.

            1  +<?xml version="1.0" encoding="utf-8"?>
            2  +<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
            3  +  <PropertyGroup />
            4  +</Project>

Added jni/tcl/compat/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj.

            1  +<?xml version="1.0" encoding="utf-8"?>
            2  +<Project DefaultTargets="Build" ToolsVersion="14.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  +    <PlatformToolset>v140</PlatformToolset>
           38  +  </PropertyGroup>
           39  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
           40  +    <ConfigurationType>Application</ConfigurationType>
           41  +    <CharacterSet>Unicode</CharacterSet>
           42  +    <PlatformToolset>v140</PlatformToolset>
           43  +  </PropertyGroup>
           44  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
           45  +    <ConfigurationType>Application</ConfigurationType>
           46  +    <CharacterSet>MultiByte</CharacterSet>
           47  +    <PlatformToolset>v140</PlatformToolset>
           48  +  </PropertyGroup>
           49  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
           50  +    <ConfigurationType>Application</ConfigurationType>
           51  +    <CharacterSet>MultiByte</CharacterSet>
           52  +    <PlatformToolset>v140</PlatformToolset>
           53  +  </PropertyGroup>
           54  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
           55  +    <ConfigurationType>Application</ConfigurationType>
           56  +    <CharacterSet>MultiByte</CharacterSet>
           57  +    <PlatformToolset>v140</PlatformToolset>
           58  +  </PropertyGroup>
           59  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
           60  +    <ConfigurationType>Application</ConfigurationType>
           61  +    <CharacterSet>MultiByte</CharacterSet>
           62  +    <PlatformToolset>v140</PlatformToolset>
           63  +  </PropertyGroup>
           64  +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
           65  +  <ImportGroup Label="ExtensionSettings">
           66  +  </ImportGroup>
           67  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" 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|Win32'" 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|Itanium'" 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|Itanium'" Label="PropertySheets">
           77  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
           78  +  </ImportGroup>
           79  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
           80  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
           81  +  </ImportGroup>
           82  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
           83  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
           84  +  </ImportGroup>
           85  +  <PropertyGroup Label="UserMacros" />
           86  +  <PropertyGroup>
           87  +    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
           88  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
           89  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
           90  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
           91  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</GenerateManifest>
           92  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\</OutDir>
           93  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\TestZlibDll$(Configuration)\Tmp\</IntDir>
           94  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
           95  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</GenerateManifest>
           96  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
           97  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
           98  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
           99  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</GenerateManifest>
          100  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
          101  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
          102  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</LinkIncremental>
          103  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">false</GenerateManifest>
          104  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\</OutDir>
          105  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\TestZlibDll$(Configuration)\Tmp\</IntDir>
          106  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
          107  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</GenerateManifest>
          108  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\</OutDir>
          109  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\TestZlibDll$(Configuration)\Tmp\</IntDir>
          110  +    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</LinkIncremental>
          111  +    <GenerateManifest Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">false</GenerateManifest>
          112  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
          113  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
          114  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
          115  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
          116  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
          117  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
          118  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
          119  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
          120  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
          121  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
          122  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
          123  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
          124  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
          125  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
          126  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
          127  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
          128  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
          129  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
          130  +  </PropertyGroup>
          131  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
          132  +    <ClCompile>
          133  +      <Optimization>Disabled</Optimization>
          134  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          135  +      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          136  +      <MinimalRebuild>true</MinimalRebuild>
          137  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          138  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          139  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          140  +      <PrecompiledHeader>
          141  +      </PrecompiledHeader>
          142  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          143  +      <WarningLevel>Level3</WarningLevel>
          144  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          145  +    </ClCompile>
          146  +    <Link>
          147  +      <AdditionalDependencies>x86\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          148  +      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
          149  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          150  +      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
          151  +      <SubSystem>Console</SubSystem>
          152  +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
          153  +      <DataExecutionPrevention>
          154  +      </DataExecutionPrevention>
          155  +      <TargetMachine>MachineX86</TargetMachine>
          156  +    </Link>
          157  +  </ItemDefinitionGroup>
          158  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
          159  +    <ClCompile>
          160  +      <Optimization>MaxSpeed</Optimization>
          161  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          162  +      <OmitFramePointers>true</OmitFramePointers>
          163  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          164  +      <PreprocessorDefinitions>WIN32;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          165  +      <StringPooling>true</StringPooling>
          166  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          167  +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
          168  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          169  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          170  +      <PrecompiledHeader>
          171  +      </PrecompiledHeader>
          172  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          173  +      <WarningLevel>Level3</WarningLevel>
          174  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          175  +    </ClCompile>
          176  +    <Link>
          177  +      <AdditionalDependencies>x86\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          178  +      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
          179  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          180  +      <SubSystem>Console</SubSystem>
          181  +      <OptimizeReferences>true</OptimizeReferences>
          182  +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
          183  +      <RandomizedBaseAddress>false</RandomizedBaseAddress>
          184  +      <DataExecutionPrevention>
          185  +      </DataExecutionPrevention>
          186  +      <TargetMachine>MachineX86</TargetMachine>
          187  +    </Link>
          188  +  </ItemDefinitionGroup>
          189  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
          190  +    <Midl>
          191  +      <TargetEnvironment>X64</TargetEnvironment>
          192  +    </Midl>
          193  +    <ClCompile>
          194  +      <Optimization>Disabled</Optimization>
          195  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          196  +      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          197  +      <MinimalRebuild>true</MinimalRebuild>
          198  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          199  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          200  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          201  +      <PrecompiledHeader>
          202  +      </PrecompiledHeader>
          203  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          204  +      <WarningLevel>Level3</WarningLevel>
          205  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          206  +    </ClCompile>
          207  +    <Link>
          208  +      <AdditionalDependencies>x64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          209  +      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
          210  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          211  +      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
          212  +      <SubSystem>Console</SubSystem>
          213  +      <TargetMachine>MachineX64</TargetMachine>
          214  +    </Link>
          215  +  </ItemDefinitionGroup>
          216  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
          217  +    <Midl>
          218  +      <TargetEnvironment>Itanium</TargetEnvironment>
          219  +    </Midl>
          220  +    <ClCompile>
          221  +      <Optimization>Disabled</Optimization>
          222  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          223  +      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;_DEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          224  +      <MinimalRebuild>true</MinimalRebuild>
          225  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          226  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          227  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          228  +      <PrecompiledHeader>
          229  +      </PrecompiledHeader>
          230  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          231  +      <WarningLevel>Level3</WarningLevel>
          232  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          233  +    </ClCompile>
          234  +    <Link>
          235  +      <AdditionalDependencies>ia64\ZlibDllDebug\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          236  +      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
          237  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          238  +      <ProgramDatabaseFile>$(OutDir)testzlib.pdb</ProgramDatabaseFile>
          239  +      <SubSystem>Console</SubSystem>
          240  +      <TargetMachine>MachineIA64</TargetMachine>
          241  +    </Link>
          242  +  </ItemDefinitionGroup>
          243  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
          244  +    <Midl>
          245  +      <TargetEnvironment>X64</TargetEnvironment>
          246  +    </Midl>
          247  +    <ClCompile>
          248  +      <Optimization>MaxSpeed</Optimization>
          249  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          250  +      <OmitFramePointers>true</OmitFramePointers>
          251  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          252  +      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          253  +      <StringPooling>true</StringPooling>
          254  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          255  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          256  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          257  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          258  +      <PrecompiledHeader>
          259  +      </PrecompiledHeader>
          260  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          261  +      <WarningLevel>Level3</WarningLevel>
          262  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          263  +    </ClCompile>
          264  +    <Link>
          265  +      <AdditionalDependencies>x64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          266  +      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
          267  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          268  +      <SubSystem>Console</SubSystem>
          269  +      <OptimizeReferences>true</OptimizeReferences>
          270  +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
          271  +      <TargetMachine>MachineX64</TargetMachine>
          272  +    </Link>
          273  +  </ItemDefinitionGroup>
          274  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
          275  +    <Midl>
          276  +      <TargetEnvironment>Itanium</TargetEnvironment>
          277  +    </Midl>
          278  +    <ClCompile>
          279  +      <Optimization>MaxSpeed</Optimization>
          280  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          281  +      <OmitFramePointers>true</OmitFramePointers>
          282  +      <AdditionalIncludeDirectories>..\..\..;..\..\minizip;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          283  +      <PreprocessorDefinitions>_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;ZLIB_WINAPI;NDEBUG;_CONSOLE;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          284  +      <StringPooling>true</StringPooling>
          285  +      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
          286  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          287  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          288  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          289  +      <PrecompiledHeader>
          290  +      </PrecompiledHeader>
          291  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          292  +      <WarningLevel>Level3</WarningLevel>
          293  +      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
          294  +    </ClCompile>
          295  +    <Link>
          296  +      <AdditionalDependencies>ia64\ZlibDllRelease\zlibwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
          297  +      <OutputFile>$(OutDir)testzlibdll.exe</OutputFile>
          298  +      <GenerateDebugInformation>true</GenerateDebugInformation>
          299  +      <SubSystem>Console</SubSystem>
          300  +      <OptimizeReferences>true</OptimizeReferences>
          301  +      <EnableCOMDATFolding>true</EnableCOMDATFolding>
          302  +      <TargetMachine>MachineIA64</TargetMachine>
          303  +    </Link>
          304  +  </ItemDefinitionGroup>
          305  +  <ItemGroup>
          306  +    <ClCompile Include="..\..\testzlib\testzlib.c" />
          307  +  </ItemGroup>
          308  +  <ItemGroup>
          309  +    <ProjectReference Include="zlibvc.vcxproj">
          310  +      <Project>{8fd826f8-3739-44e6-8cc8-997122e53b8d}</Project>
          311  +    </ProjectReference>
          312  +  </ItemGroup>
          313  +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
          314  +  <ImportGroup Label="ExtensionTargets">
          315  +  </ImportGroup>
          316  +</Project>

Added jni/tcl/compat/zlib/contrib/vstudio/vc14/testzlibdll.vcxproj.user.

            1  +<?xml version="1.0" encoding="utf-8"?>
            2  +<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
            3  +  <PropertyGroup />
            4  +</Project>

Added jni/tcl/compat/zlib/contrib/vstudio/vc14/zlib.rc.

            1  +#include <windows.h>
            2  +
            3  +#define IDR_VERSION1  1
            4  +IDR_VERSION1	VERSIONINFO	MOVEABLE IMPURE LOADONCALL DISCARDABLE
            5  +  FILEVERSION	 1, 2, 9, 0
            6  +  PRODUCTVERSION 1, 2, 9, 0
            7  +  FILEFLAGSMASK	VS_FFI_FILEFLAGSMASK
            8  +  FILEFLAGS	0
            9  +  FILEOS	VOS_DOS_WINDOWS32
           10  +  FILETYPE	VFT_DLL
           11  +  FILESUBTYPE	0	// not used
           12  +BEGIN
           13  +  BLOCK "StringFileInfo"
           14  +  BEGIN
           15  +    BLOCK "040904E4"
           16  +    //language ID = U.S. English, char set = Windows, Multilingual
           17  +
           18  +    BEGIN
           19  +      VALUE "FileDescription", "zlib data compression and ZIP file I/O library\0"
           20  +      VALUE "FileVersion",	"1.2.8.1\0"
           21  +      VALUE "InternalName",	"zlib\0"
           22  +      VALUE "OriginalFilename",	"zlibwapi.dll\0"
           23  +      VALUE "ProductName",	"ZLib.DLL\0"
           24  +      VALUE "Comments","DLL support by Alessandro Iacopetti & Gilles Vollant\0"
           25  +      VALUE "LegalCopyright", "(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
           26  +    END
           27  +  END
           28  +  BLOCK "VarFileInfo"
           29  +  BEGIN
           30  +    VALUE "Translation", 0x0409, 1252
           31  +  END
           32  +END

Added jni/tcl/compat/zlib/contrib/vstudio/vc14/zlibstat.vcxproj.

            1  +<?xml version="1.0" encoding="utf-8"?>
            2  +<Project DefaultTargets="Build" ToolsVersion="14.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  +    <PlatformToolset>v140</PlatformToolset>
           49  +  </PropertyGroup>
           50  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
           51  +    <ConfigurationType>StaticLibrary</ConfigurationType>
           52  +    <UseOfMfc>false</UseOfMfc>
           53  +    <PlatformToolset>v140</PlatformToolset>
           54  +  </PropertyGroup>
           55  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
           56  +    <ConfigurationType>StaticLibrary</ConfigurationType>
           57  +    <UseOfMfc>false</UseOfMfc>
           58  +    <PlatformToolset>v140</PlatformToolset>
           59  +    <CharacterSet>Unicode</CharacterSet>
           60  +  </PropertyGroup>
           61  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
           62  +    <ConfigurationType>StaticLibrary</ConfigurationType>
           63  +    <UseOfMfc>false</UseOfMfc>
           64  +    <PlatformToolset>v140</PlatformToolset>
           65  +  </PropertyGroup>
           66  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
           67  +    <ConfigurationType>StaticLibrary</ConfigurationType>
           68  +    <UseOfMfc>false</UseOfMfc>
           69  +    <PlatformToolset>v140</PlatformToolset>
           70  +  </PropertyGroup>
           71  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
           72  +    <ConfigurationType>StaticLibrary</ConfigurationType>
           73  +    <UseOfMfc>false</UseOfMfc>
           74  +    <PlatformToolset>v140</PlatformToolset>
           75  +  </PropertyGroup>
           76  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="Configuration">
           77  +    <ConfigurationType>StaticLibrary</ConfigurationType>
           78  +    <UseOfMfc>false</UseOfMfc>
           79  +    <PlatformToolset>v140</PlatformToolset>
           80  +  </PropertyGroup>
           81  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
           82  +    <ConfigurationType>StaticLibrary</ConfigurationType>
           83  +    <UseOfMfc>false</UseOfMfc>
           84  +    <PlatformToolset>v140</PlatformToolset>
           85  +  </PropertyGroup>
           86  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
           87  +    <ConfigurationType>StaticLibrary</ConfigurationType>
           88  +    <UseOfMfc>false</UseOfMfc>
           89  +    <PlatformToolset>v140</PlatformToolset>
           90  +  </PropertyGroup>
           91  +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
           92  +  <ImportGroup Label="ExtensionSettings">
           93  +  </ImportGroup>
           94  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="PropertySheets">
           95  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
           96  +  </ImportGroup>
           97  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
           98  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
           99  +  </ImportGroup>
          100  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
          101  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          102  +  </ImportGroup>
          103  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="PropertySheets">
          104  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          105  +  </ImportGroup>
          106  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="PropertySheets">
          107  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          108  +  </ImportGroup>
          109  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="PropertySheets">
          110  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          111  +  </ImportGroup>
          112  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" Label="PropertySheets">
          113  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          114  +  </ImportGroup>
          115  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
          116  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          117  +  </ImportGroup>
          118  +  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
          119  +    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
          120  +  </ImportGroup>
          121  +  <PropertyGroup Label="UserMacros" />
          122  +  <PropertyGroup>
          123  +    <_ProjectFileVersion>10.0.30128.1</_ProjectFileVersion>
          124  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
          125  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
          126  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
          127  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
          128  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\</OutDir>
          129  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">x86\ZlibStat$(Configuration)\Tmp\</IntDir>
          130  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\</OutDir>
          131  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
          132  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
          133  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
          134  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\</OutDir>
          135  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
          136  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
          137  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
          138  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\</OutDir>
          139  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">x64\ZlibStat$(Configuration)\Tmp\</IntDir>
          140  +    <OutDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\</OutDir>
          141  +    <IntDir Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">ia64\ZlibStat$(Configuration)\Tmp\</IntDir>
          142  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
          143  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
          144  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" />
          145  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
          146  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
          147  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" />
          148  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
          149  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
          150  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
          151  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
          152  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
          153  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" />
          154  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
          155  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
          156  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" />
          157  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
          158  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
          159  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'" />
          160  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">AllRules.ruleset</CodeAnalysisRuleSet>
          161  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
          162  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" />
          163  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">AllRules.ruleset</CodeAnalysisRuleSet>
          164  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
          165  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
          166  +    <CodeAnalysisRuleSet Condition="'$(Configuration)|$(Platform)'=='Release|x64'">AllRules.ruleset</CodeAnalysisRuleSet>
          167  +    <CodeAnalysisRules Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
          168  +    <CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />
          169  +  </PropertyGroup>
          170  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
          171  +    <ClCompile>
          172  +      <Optimization>Disabled</Optimization>
          173  +      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          174  +      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          175  +      <ExceptionHandling>
          176  +      </ExceptionHandling>
          177  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          178  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          179  +      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
          180  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          181  +      <ObjectFileName>$(IntDir)</ObjectFileName>
          182  +      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
          183  +      <WarningLevel>Level3</WarningLevel>
          184  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          185  +      <DebugInformationFormat>OldStyle</DebugInformationFormat>
          186  +    </ClCompile>
          187  +    <ResourceCompile>
          188  +      <Culture>0x040c</Culture>
          189  +    </ResourceCompile>
          190  +    <Lib>
          191  +      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
          192  +      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
          193  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          194  +    </Lib>
          195  +  </ItemDefinitionGroup>
          196  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
          197  +    <ClCompile>
          198  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          199  +      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          200  +      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          201  +      <StringPooling>true</StringPooling>
          202  +      <ExceptionHandling>
          203  +      </ExceptionHandling>
          204  +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
          205  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          206  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          207  +      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
          208  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          209  +      <ObjectFileName>$(IntDir)</ObjectFileName>
          210  +      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
          211  +      <WarningLevel>Level3</WarningLevel>
          212  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          213  +    </ClCompile>
          214  +    <ResourceCompile>
          215  +      <Culture>0x040c</Culture>
          216  +    </ResourceCompile>
          217  +    <Lib>
          218  +      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
          219  +      <AdditionalDependencies>..\..\masmx86\match686.obj;..\..\masmx86\inffas32.obj;%(AdditionalDependencies)</AdditionalDependencies>
          220  +      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
          221  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          222  +    </Lib>
          223  +  </ItemDefinitionGroup>
          224  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">
          225  +    <ClCompile>
          226  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          227  +      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          228  +      <PreprocessorDefinitions>WIN32;ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          229  +      <StringPooling>true</StringPooling>
          230  +      <ExceptionHandling>
          231  +      </ExceptionHandling>
          232  +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
          233  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          234  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          235  +      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
          236  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          237  +      <ObjectFileName>$(IntDir)</ObjectFileName>
          238  +      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
          239  +      <WarningLevel>Level3</WarningLevel>
          240  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          241  +    </ClCompile>
          242  +    <ResourceCompile>
          243  +      <Culture>0x040c</Culture>
          244  +    </ResourceCompile>
          245  +    <Lib>
          246  +      <AdditionalOptions>/MACHINE:X86 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
          247  +      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
          248  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          249  +    </Lib>
          250  +  </ItemDefinitionGroup>
          251  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
          252  +    <Midl>
          253  +      <TargetEnvironment>X64</TargetEnvironment>
          254  +    </Midl>
          255  +    <ClCompile>
          256  +      <Optimization>Disabled</Optimization>
          257  +      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          258  +      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          259  +      <ExceptionHandling>
          260  +      </ExceptionHandling>
          261  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          262  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          263  +      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
          264  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          265  +      <ObjectFileName>$(IntDir)</ObjectFileName>
          266  +      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
          267  +      <WarningLevel>Level3</WarningLevel>
          268  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          269  +      <DebugInformationFormat>OldStyle</DebugInformationFormat>
          270  +    </ClCompile>
          271  +    <ResourceCompile>
          272  +      <Culture>0x040c</Culture>
          273  +    </ResourceCompile>
          274  +    <Lib>
          275  +      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
          276  +      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
          277  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          278  +    </Lib>
          279  +  </ItemDefinitionGroup>
          280  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">
          281  +    <Midl>
          282  +      <TargetEnvironment>Itanium</TargetEnvironment>
          283  +    </Midl>
          284  +    <ClCompile>
          285  +      <Optimization>Disabled</Optimization>
          286  +      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          287  +      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          288  +      <ExceptionHandling>
          289  +      </ExceptionHandling>
          290  +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
          291  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          292  +      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
          293  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          294  +      <ObjectFileName>$(IntDir)</ObjectFileName>
          295  +      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
          296  +      <WarningLevel>Level3</WarningLevel>
          297  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          298  +      <DebugInformationFormat>OldStyle</DebugInformationFormat>
          299  +    </ClCompile>
          300  +    <ResourceCompile>
          301  +      <Culture>0x040c</Culture>
          302  +    </ResourceCompile>
          303  +    <Lib>
          304  +      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
          305  +      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
          306  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          307  +    </Lib>
          308  +  </ItemDefinitionGroup>
          309  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
          310  +    <Midl>
          311  +      <TargetEnvironment>X64</TargetEnvironment>
          312  +    </Midl>
          313  +    <ClCompile>
          314  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          315  +      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          316  +      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;ASMV;ASMINF;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          317  +      <StringPooling>true</StringPooling>
          318  +      <ExceptionHandling>
          319  +      </ExceptionHandling>
          320  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          321  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          322  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          323  +      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
          324  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          325  +      <ObjectFileName>$(IntDir)</ObjectFileName>
          326  +      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
          327  +      <WarningLevel>Level3</WarningLevel>
          328  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          329  +    </ClCompile>
          330  +    <ResourceCompile>
          331  +      <Culture>0x040c</Culture>
          332  +    </ResourceCompile>
          333  +    <Lib>
          334  +      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
          335  +      <AdditionalDependencies>..\..\masmx64\gvmat64.obj;..\..\masmx64\inffasx64.obj;%(AdditionalDependencies)</AdditionalDependencies>
          336  +      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
          337  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          338  +    </Lib>
          339  +  </ItemDefinitionGroup>
          340  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">
          341  +    <Midl>
          342  +      <TargetEnvironment>Itanium</TargetEnvironment>
          343  +    </Midl>
          344  +    <ClCompile>
          345  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          346  +      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          347  +      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          348  +      <StringPooling>true</StringPooling>
          349  +      <ExceptionHandling>
          350  +      </ExceptionHandling>
          351  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          352  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          353  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          354  +      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
          355  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          356  +      <ObjectFileName>$(IntDir)</ObjectFileName>
          357  +      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
          358  +      <WarningLevel>Level3</WarningLevel>
          359  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          360  +    </ClCompile>
          361  +    <ResourceCompile>
          362  +      <Culture>0x040c</Culture>
          363  +    </ResourceCompile>
          364  +    <Lib>
          365  +      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
          366  +      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
          367  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          368  +    </Lib>
          369  +  </ItemDefinitionGroup>
          370  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|x64'">
          371  +    <Midl>
          372  +      <TargetEnvironment>X64</TargetEnvironment>
          373  +    </Midl>
          374  +    <ClCompile>
          375  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          376  +      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          377  +      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          378  +      <StringPooling>true</StringPooling>
          379  +      <ExceptionHandling>
          380  +      </ExceptionHandling>
          381  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          382  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          383  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          384  +      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
          385  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          386  +      <ObjectFileName>$(IntDir)</ObjectFileName>
          387  +      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
          388  +      <WarningLevel>Level3</WarningLevel>
          389  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          390  +    </ClCompile>
          391  +    <ResourceCompile>
          392  +      <Culture>0x040c</Culture>
          393  +    </ResourceCompile>
          394  +    <Lib>
          395  +      <AdditionalOptions>/MACHINE:AMD64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
          396  +      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
          397  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          398  +    </Lib>
          399  +  </ItemDefinitionGroup>
          400  +  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">
          401  +    <Midl>
          402  +      <TargetEnvironment>Itanium</TargetEnvironment>
          403  +    </Midl>
          404  +    <ClCompile>
          405  +      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
          406  +      <AdditionalIncludeDirectories>..\..\..;..\..\masmx86;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
          407  +      <PreprocessorDefinitions>ZLIB_WINAPI;_CRT_NONSTDC_NO_DEPRECATE;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;WIN64;%(PreprocessorDefinitions)</PreprocessorDefinitions>
          408  +      <StringPooling>true</StringPooling>
          409  +      <ExceptionHandling>
          410  +      </ExceptionHandling>
          411  +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
          412  +      <BufferSecurityCheck>false</BufferSecurityCheck>
          413  +      <FunctionLevelLinking>true</FunctionLevelLinking>
          414  +      <PrecompiledHeaderOutputFile>$(IntDir)zlibstat.pch</PrecompiledHeaderOutputFile>
          415  +      <AssemblerListingLocation>$(IntDir)</AssemblerListingLocation>
          416  +      <ObjectFileName>$(IntDir)</ObjectFileName>
          417  +      <ProgramDataBaseFileName>$(OutDir)</ProgramDataBaseFileName>
          418  +      <WarningLevel>Level3</WarningLevel>
          419  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          420  +    </ClCompile>
          421  +    <ResourceCompile>
          422  +      <Culture>0x040c</Culture>
          423  +    </ResourceCompile>
          424  +    <Lib>
          425  +      <AdditionalOptions>/MACHINE:IA64 /NODEFAULTLIB %(AdditionalOptions)</AdditionalOptions>
          426  +      <OutputFile>$(OutDir)zlibstat.lib</OutputFile>
          427  +      <SuppressStartupBanner>true</SuppressStartupBanner>
          428  +    </Lib>
          429  +  </ItemDefinitionGroup>
          430  +  <ItemGroup>
          431  +    <ClCompile Include="..\..\..\adler32.c" />
          432  +    <ClCompile Include="..\..\..\compress.c" />
          433  +    <ClCompile Include="..\..\..\crc32.c" />
          434  +    <ClCompile Include="..\..\..\deflate.c" />
          435  +    <ClCompile Include="..\..\..\gzclose.c" />
          436  +    <ClCompile Include="..\..\..\gzlib.c" />
          437  +    <ClCompile Include="..\..\..\gzread.c" />
          438  +    <ClCompile Include="..\..\..\gzwrite.c" />
          439  +    <ClCompile Include="..\..\..\infback.c" />
          440  +    <ClCompile Include="..\..\masmx64\inffas8664.c">
          441  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'">true</ExcludedFromBuild>
          442  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
          443  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'">true</ExcludedFromBuild>
          444  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'">true</ExcludedFromBuild>
          445  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'">true</ExcludedFromBuild>
          446  +      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
          447  +    </ClCompile>
          448  +    <ClCompile Include="..\..\..\inffast.c" />
          449  +    <ClCompile Include="..\..\..\inflate.c" />
          450  +    <ClCompile Include="..\..\..\inftrees.c" />
          451  +    <ClCompile Include="..\..\minizip\ioapi.c" />
          452  +    <ClCompile Include="..\..\..\trees.c" />
          453  +    <ClCompile Include="..\..\..\uncompr.c" />
          454  +    <ClCompile Include="..\..\minizip\unzip.c" />
          455  +    <ClCompile Include="..\..\minizip\zip.c" />
          456  +    <ClCompile Include="..\..\..\zutil.c" />
          457  +  </ItemGroup>
          458  +  <ItemGroup>
          459  +    <ResourceCompile Include="zlib.rc" />
          460  +  </ItemGroup>
          461  +  <ItemGroup>
          462  +    <None Include="zlibvc.def" />
          463  +  </ItemGroup>
          464  +  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
          465  +  <ImportGroup Label="ExtensionTargets">
          466  +  </ImportGroup>
          467  +</Project>

Added jni/tcl/compat/zlib/contrib/vstudio/vc14/zlibstat.vcxproj.user.

            1  +<?xml version="1.0" encoding="utf-8"?>
            2  +<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
            3  +  <PropertyGroup />
            4  +</Project>

Added jni/tcl/compat/zlib/contrib/vstudio/vc14/zlibvc.def.

            1  +LIBRARY
            2  +; zlib data compression and ZIP file I/O library
            3  +
            4  +VERSION		1.2
            5  +
            6  +EXPORTS
            7  +        adler32                                  @1
            8  +        compress                                 @2
            9  +        crc32                                    @3
           10  +        deflate                                  @4
           11  +        deflateCopy                              @5
           12  +        deflateEnd                               @6
           13  +        deflateInit2_                            @7
           14  +        deflateInit_                             @8
           15  +        deflateParams                            @9
           16  +        deflateReset                             @10
           17  +        deflateSetDictionary                     @11
           18  +        gzclose                                  @12
           19  +        gzdopen                                  @13
           20  +        gzerror                                  @14
           21  +        gzflush                                  @15
           22  +        gzopen                                   @16
           23  +        gzread                                   @17
           24  +        gzwrite                                  @18
           25  +        inflate                                  @19
           26  +        inflateEnd                               @20
           27  +        inflateInit2_                            @21
           28  +        inflateInit_                             @22
           29  +        inflateReset                             @23
           30  +        inflateSetDictionary                     @24
           31  +        inflateSync                              @25
           32  +        uncompress                               @26
           33  +        zlibVersion                              @27
           34  +        gzprintf                                 @28
           35  +        gzputc                                   @29
           36  +        gzgetc                                   @30
           37  +        gzseek                                   @31
           38  +        gzrewind                                 @32
           39  +        gztell                                   @33
           40  +        gzeof                                    @34
           41  +        gzsetparams                              @35
           42  +        zError                                   @36
           43  +        inflateSyncPoint                         @37
           44  +        get_crc_table                            @38
           45  +        compress2                                @39
           46  +        gzputs                                   @40
           47  +        gzgets                                   @41
           48  +        inflateCopy                              @42
           49  +        inflateBackInit_                         @43
           50  +        inflateBack                              @44
           51  +        inflateBackEnd                           @45
           52  +        compressBound                            @46
           53  +        deflateBound                             @47
           54  +        gzclearerr                               @48
           55  +        gzungetc                                 @49
           56  +        zlibCompileFlags                         @50
           57  +        deflatePrime                             @51
           58  +        deflatePending                           @52
           59  +
           60  +        unzOpen                                  @61
           61  +        unzClose                                 @62
           62  +        unzGetGlobalInfo                         @63
           63  +        unzGetCurrentFileInfo                    @64
           64  +        unzGoToFirstFile                         @65
           65  +        unzGoToNextFile                          @66
           66  +        unzOpenCurrentFile                       @67
           67  +        unzReadCurrentFile                       @68
           68  +        unzOpenCurrentFile3                      @69
           69  +        unztell                                  @70
           70  +        unzeof                                   @71
           71  +        unzCloseCurrentFile                      @72
           72  +        unzGetGlobalComment                      @73
           73  +        unzStringFileNameCompare                 @74
           74  +        unzLocateFile                            @75
           75  +        unzGetLocalExtrafield                    @76
           76  +        unzOpen2                                 @77
           77  +        unzOpenCurrentFile2                      @78
           78  +        unzOpenCurrentFilePassword               @79
           79  +
           80  +        zipOpen                                  @80
           81  +        zipOpenNewFileInZip                      @81
           82  +        zipWriteInFileInZip                      @82
           83  +        zipCloseFileInZip                        @83
           84  +        zipClose                                 @84
           85  +        zipOpenNewFileInZip2                     @86
           86  +        zipCloseFileInZipRaw                     @87
           87  +        zipOpen2                                 @88
           88  +        zipOpenNewFileInZip3                     @89
           89  +
           90  +        unzGetFilePos                            @100
           91  +        unzGoToFilePos                           @101
           92  +
           93  +        fill_win32_filefunc                      @110
           94  +
           95  +; zlibwapi v1.2.4 added:
           96  +        fill_win32_filefunc64                   @111
           97  +        fill_win32_filefunc64A                  @112
           98  +        fill_win32_filefunc64W                  @113
           99  +
          100  +        unzOpen64                               @120
          101  +        unzOpen2_64                             @121
          102  +        unzGetGlobalInfo64                      @122
          103  +        unzGetCurrentFileInfo64                 @124
          104  +        unzGetCurrentFileZStreamPos64           @125
          105  +        unztell64                               @126
          106  +        unzGetFilePos64                         @127
          107  +        unzGoToFilePos64                        @128
          108  +
          109  +        zipOpen64                               @130
          110  +        zipOpen2_64                             @131
          111  +        zipOpenNewFileInZip64                   @132
          112  +        zipOpenNewFileInZip2_64                 @133
          113  +        zipOpenNewFileInZip3_64                 @134
          114  +        zipOpenNewFileInZip4_64                 @135
          115  +        zipCloseFileInZipRaw64                  @136
          116  +
          117  +; zlib1 v1.2.4 added:
          118  +        adler32_combine                         @140
          119  +        crc32_combine                           @142
          120  +        deflateSetHeader                        @144
          121  +        deflateTune                             @145
          122  +        gzbuffer                                @146
          123  +        gzclose_r                               @147
          124  +        gzclose_w                               @148
          125  +        gzdirect                                @149
          126  +        gzoffset                                @150
          127  +        inflateGetHeader                        @156
          128  +        inflateMark                             @157
          129  +        inflatePrime                            @158
          130  +        inflateReset2                           @159
          131  +        inflateUndermine                        @160
          132  +
          133  +; zlib1 v1.2.6 added:
          134  +        gzgetc_                                 @161
          135  +        inflateResetKeep                        @163
          136  +        deflateResetKeep                        @164
          137  +
          138  +; zlib1 v1.2.7 added:
          139  +        gzopen_w                                @165
          140  +
          141  +; zlib1 v1.2.8 added:
          142  +        inflateGetDictionary                    @166
          143  +        gzvprintf                               @167
          144  +
          145  +; zlib1 v1.2.9 added:
          146  +        inflateCodesUsed                        @168
          147  +        inflateValidate                         @169
          148  +        uncompress2                             @170
          149  +        gzfread                                 @171
          150  +        gzfwrite                                @172
          151  +        deflateGetDictionary                    @173
          152  +        adler32_z                               @174
          153  +        crc32_z                                 @175

Added jni/tcl/compat/zlib/contrib/vstudio/vc14/zlibvc.sln.

            1  +
            2  +Microsoft Visual Studio Solution File, Format Version 12.00
            3  +# Visual Studio 14
            4  +VisualStudioVersion = 14.0.25420.1
            5  +MinimumVisualStudioVersion = 10.0.40219.1
            6  +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibvc", "zlibvc.vcxproj", "{8FD826F8-3739-44E6-8CC8-997122E53B8D}"
            7  +EndProject
            8  +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlibstat", "zlibstat.vcxproj", "{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}"
            9  +EndProject
           10  +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlib", "testzlib.vcxproj", "{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}"
           11  +EndProject
           12  +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testzlibdll", "testzlibdll.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694366A}"
           13  +EndProject
           14  +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "minizip", "minizip.vcxproj", "{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}"
           15  +EndProject
           16  +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "miniunz", "miniunz.vcxproj", "{C52F9E7B-498A-42BE-8DB4-85A15694382A}"
           17  +EndProject
           18  +Global
           19  +	GlobalSection(SolutionConfigurationPlatforms) = preSolution
           20  +		Debug|Itanium = Debug|Itanium
           21  +		Debug|Win32 = Debug|Win32
           22  +		Debug|x64 = Debug|x64
           23  +		Release|Itanium = Release|Itanium
           24  +		Release|Win32 = Release|Win32
           25  +		Release|x64 = Release|x64
           26  +		ReleaseWithoutAsm|Itanium = ReleaseWithoutAsm|Itanium
           27  +		ReleaseWithoutAsm|Win32 = ReleaseWithoutAsm|Win32
           28  +		ReleaseWithoutAsm|x64 = ReleaseWithoutAsm|x64
           29  +	EndGlobalSection
           30  +	GlobalSection(ProjectConfigurationPlatforms) = postSolution
           31  +		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Itanium.ActiveCfg = Debug|Win32
           32  +		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.ActiveCfg = Debug|Win32
           33  +		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|Win32.Build.0 = Debug|Win32
           34  +		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.ActiveCfg = Debug|x64
           35  +		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Debug|x64.Build.0 = Debug|x64
           36  +		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|Itanium.ActiveCfg = Release|Win32
           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 = Release|x64
           40  +		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.Release|x64.Build.0 = Release|x64
           41  +		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
           42  +		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
           43  +		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
           44  +		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
           45  +		{8FD826F8-3739-44E6-8CC8-997122E53B8D}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
           46  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Itanium.ActiveCfg = Debug|Win32
           47  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.ActiveCfg = Debug|Win32
           48  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|Win32.Build.0 = Debug|Win32
           49  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.ActiveCfg = Debug|x64
           50  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Debug|x64.Build.0 = Debug|x64
           51  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Itanium.ActiveCfg = Release|Win32
           52  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.ActiveCfg = Release|Win32
           53  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|Win32.Build.0 = Release|Win32
           54  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.ActiveCfg = Release|x64
           55  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.Release|x64.Build.0 = Release|x64
           56  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
           57  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
           58  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
           59  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
           60  +		{745DEC58-EBB3-47A9-A9B8-4C6627C01BF8}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
           61  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
           62  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
           63  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
           64  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
           65  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
           66  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
           67  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
           68  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
           69  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
           70  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
           71  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = ReleaseWithoutAsm|Win32
           72  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = ReleaseWithoutAsm|Win32
           73  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.Build.0 = ReleaseWithoutAsm|Win32
           74  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = ReleaseWithoutAsm|x64
           75  +		{AA6666AA-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.Build.0 = ReleaseWithoutAsm|x64
           76  +		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Itanium.ActiveCfg = Debug|Win32
           77  +		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.ActiveCfg = Debug|Win32
           78  +		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|Win32.Build.0 = Debug|Win32
           79  +		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.ActiveCfg = Debug|x64
           80  +		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Debug|x64.Build.0 = Debug|x64
           81  +		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Itanium.ActiveCfg = Release|Win32
           82  +		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.ActiveCfg = Release|Win32
           83  +		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|Win32.Build.0 = Release|Win32
           84  +		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.ActiveCfg = Release|x64
           85  +		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.Release|x64.Build.0 = Release|x64
           86  +		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
           87  +		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
           88  +		{C52F9E7B-498A-42BE-8DB4-85A15694366A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
           89  +		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Itanium.ActiveCfg = Debug|Win32
           90  +		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.ActiveCfg = Debug|Win32
           91  +		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|Win32.Build.0 = Debug|Win32
           92  +		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.ActiveCfg = Debug|x64
           93  +		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Debug|x64.Build.0 = Debug|x64
           94  +		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Itanium.ActiveCfg = Release|Win32
           95  +		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.ActiveCfg = Release|Win32
           96  +		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|Win32.Build.0 = Release|Win32
           97  +		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.ActiveCfg = Release|x64
           98  +		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.Release|x64.Build.0 = Release|x64
           99  +		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
          100  +		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
          101  +		{48CDD9DC-E09F-4135-9C0C-4FE50C3C654B}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
          102  +		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Itanium.ActiveCfg = Debug|Win32
          103  +		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.ActiveCfg = Debug|Win32
          104  +		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|Win32.Build.0 = Debug|Win32
          105  +		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.ActiveCfg = Debug|x64
          106  +		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Debug|x64.Build.0 = Debug|x64
          107  +		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Itanium.ActiveCfg = Release|Win32
          108  +		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.ActiveCfg = Release|Win32
          109  +		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|Win32.Build.0 = Release|Win32
          110  +		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.ActiveCfg = Release|x64
          111  +		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.Release|x64.Build.0 = Release|x64
          112  +		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Itanium.ActiveCfg = Release|Win32
          113  +		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|Win32.ActiveCfg = Release|Win32
          114  +		{C52F9E7B-498A-42BE-8DB4-85A15694382A}.ReleaseWithoutAsm|x64.ActiveCfg = Release|x64
          115  +	EndGlobalSection
          116  +	GlobalSection(SolutionProperties) = preSolution
          117  +		HideSolutionNode = FALSE
          118  +	EndGlobalSection
          119  +EndGlobal

Added jni/tcl/compat/zlib/contrib/vstudio/vc14/zlibvc.vcxproj.

            1  +<?xml version="1.0" encoding="utf-8"?>
            2  +<Project DefaultTargets="Build" ToolsVersion="14.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  +    <PlatformToolset>v140</PlatformToolset>
           50  +  </PropertyGroup>
           51  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Win32'" Label="Configuration">
           52  +    <ConfigurationType>DynamicLibrary</ConfigurationType>
           53  +    <UseOfMfc>false</UseOfMfc>
           54  +    <WholeProgramOptimization>true</WholeProgramOptimization>
           55  +    <PlatformToolset>v140</PlatformToolset>
           56  +  </PropertyGroup>
           57  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
           58  +    <ConfigurationType>DynamicLibrary</ConfigurationType>
           59  +    <UseOfMfc>false</UseOfMfc>
           60  +    <PlatformToolset>v140</PlatformToolset>
           61  +    <CharacterSet>Unicode</CharacterSet>
           62  +  </PropertyGroup>
           63  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Itanium'" Label="Configuration">
           64  +    <ConfigurationType>DynamicLibrary</ConfigurationType>
           65  +    <UseOfMfc>false</UseOfMfc>
           66  +    <WholeProgramOptimization>true</WholeProgramOptimization>
           67  +    <PlatformToolset>v140</PlatformToolset>
           68  +  </PropertyGroup>
           69  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWithoutAsm|Itanium'" Label="Configuration">
           70  +    <ConfigurationType>DynamicLibrary</ConfigurationType>
           71  +    <UseOfMfc>false</UseOfMfc>
           72  +    <WholeProgramOptimization>true</WholeProgramOptimization>
           73  +    <PlatformToolset>v140</PlatformToolset>
           74  +  </PropertyGroup>
           75  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Itanium'" Label="Configuration">
           76  +    <ConfigurationType>DynamicLibrary</ConfigurationType>
           77  +    <UseOfMfc>false</UseOfMfc>
           78  +    <PlatformToolset>v140</PlatformToolset>
           79  +  </PropertyGroup>
           80  +  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
           81  +    <ConfigurationType>DynamicLibrary</ConfigurationType>
           82  +    <UseOfMfc>false</UseOfMfc>
           83  +    <WholeProgramOptimization>true</WholeProgramOptimization>