diff --git a/ANNOUNCE b/ANNOUNCE
index cbee840fb..d1b9d77bf 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,101 +1,10 @@
 
-Libpng 1.0.8beta2 - July 10, 2000
+Libpng 1.0.8beta3 - July 11, 2000
 
 This is a public release of libpng, intended for use in production codes.
 
-Changes since the last public release (1.0.6):
+Changes since the last public release (1.0.7):
 
-  Changed sprintf() to strcpy() in png_write_sCAL_s() to work without STDIO
-  Added data_length parameter to png_decompress_chunk() function
-  Revised documentation to remove reference to abandoned png_free_chnk functions
-  Fixed an error in png_rgb_to_gray_fixed()
-  Revised example.c, usage of png_destroy_write_struct().
-  Renamed makefile.ibmvac3 to makefile.ibmc, added libpng.icc IBM project file
-  Added a check for info_ptr->free_me&PNG_FREE_TEXT when free'ing text in png.c
-  Simplify png_sig_bytes() function to remove use of non-ISO-C strdup().
-  Added png_data_freer() function.
-  In the code that checks for over-length tRNS chunks, added check of
-    info_ptr->num_trans as well as png_ptr->num_trans (Matthias Benckmann)
-  Check for existing data and free it if the free_me flag is set, in png_set_*()
-    and png_handle_*().
-  Only define PNG_WEIGHTED_FILTERS_SUPPORTED when PNG_FLOATING_POINT_SUPPORTED
-    is defined.
-  Changed several instances of PNG_NO_CONSOLE_ID to PNG_NO_STDIO in pngrutil.c
-    and mentioned the purposes of the two macros in libpng.txt/libpng.3.
-  Revised png_set_iCCP() and png_set_rows() to avoid prematurely freeing data.
-  Add checks in png_set_text() for NULL members of the input text structure.
-  Removed superfluous prototype for png_set_itxt from png.h
-  Removed "else" from pngread.c, after png_error(), and changed "0" to "length".
-  Changed several png_errors about malformed ancillary chunks to png_warnings.
-  Added png_pass-* arrays to pnggccrd.c when PNG_USE_LOCAL_ARRAYS is defined.
-  Relocated paragraph about png_set_background() in libpng.3/libpng.txt
-    and other revisions (Matthias Benckmann)
-  Relocated info_ptr->free_me to restore binary compatibility with libpng-1.0.5
-    (breaks compatibility with libpng-1.0.6).
-  Relocated info_ptr->free_me, png_ptr->free_me, and other info_ptr and
-    png_ptr members to restore binary compatibility with libpng-1.0.5
-    (breaks compatibility with libpng-1.0.6).
-  Rearranged some members at the end of png_info and png_struct, to put
-    unknown_chunks_num and free_me within the original size of the png_structs
-    and free_me, png_read_user_fn, and png_free_fn within the original png_info,
-    because some old applications allocate the structs directly instead of
-    using png_create_*().
-  Added documentation of user memory functions in libpng.txt/libpng.3
-  Modified png_read_png so that it will use user_allocated row_pointers
-    if present, unless free_me directs that it be freed, and added description
-    of the use of png_set_rows() and png_get_rows() in libpng.txt/libpng.3.
-  Added PNG_LEGACY_SUPPORTED macro, and #ifdef out all new (since version
-    1.00) members of png_struct and png_info, to regain binary compatibility
-    when you define this macro.  Capabilities lost in this event
-    are user transforms (new in version 1.0.0),the user transform pointer
-    (new in version 1.0.2), rgb_to_gray (new in 1.0.5), iCCP, sCAL, sPLT,
-    the high-level interface, and unknown chunks support (all new in 1.0.6).
-    This was necessary because of old applications that allocate the structs
-    directly as authors were instructed to do in libpng-0.88 and earlier,
-    instead of using png_create_*(). 
-  Added makefile.intel and updated makefile.watcom (Pawel Mrochen)
-  Overloaded png_read_init() and png_write_init() with macros that convert
-    calls to png_read_init_2() or png_write_init_2() that check the version
-    and structure sizes.
-  Made PNG_NO_ITXT_SUPPORTED the default setting, to avoid memory overrun
-    when old applications fill the info_ptr->text structure directly.
-  Added PNGAPI macro, and added it to the definitions of all exported functions.
-  Relocated version macro definitions ahead of the includes of zlib.h and
-    pngconf.h in png.h.
-  Made PNG_NO_CONSOLE_IO the default condition when PNG_BUILD_DLL is defined.
-  Use MSC _RPTn debugging instead of fprintf if _MSC_VER is defined.
-  Added png_access_version_number() function.
-  Check for mask&PNG_FREE_CHNK (for TEXT, SCAL, PCAL) in png_free_data().
-  Expanded libpng.3/libpng.txt information about png_data_freer().
-  Changed pnggccrd.c and pngvcrd.c to handle bad adaptive filter types as
-    warnings instead of errors, as pngrutil.c does.
-  Set the PNG_INFO_IDAT valid flag in png_set_rows() so png_write_png()
-    will actually write IDATs.
-  Made the default PNG_USE_LOCAL_ARRAYS depend on PNG_DLL instead of WIN32.
-  Make png_free_data() ignore its final parameter when freeing data that can
-    have multiple instances (text, sPLT, unknowns).
-  Removed info_ptr->valid tests from png_free_data(), as in version 1.0.5.
-  Added png_set_invalid() function.
-  Fixed incorrect illustrations of png_destroy_write_struct() in example.c.
-  Revised the deliberately erroneous Linux setjmp code in pngconf.h to produce
-    fewer error messages.
-  Set each pointer to NULL after freeing it in png_free_data().
-  Worked around a problem in pngconf.h; AIX's strings.h defines an "index"
-    macro that conflicts with libpng's png_color_16.index. (Dimitri Papadapoulos)
-  Added PNG_NO_POINTER_INDEXING macro to use array-indexing instead of pointer
-    indexing in pngrutil.c and pngwutil.c to accommodate a buggy compiler.
-  Added a check for overlength PLTE chunk in pngrutil.c.
-  Added PNG_NO_POINTER_INDEXING macro to use array-indexing instead of pointer
-    indexing in pngrutil.c and pngwutil.c to accommodate a buggy compiler.
-  Added a warning in png_decompress_chunk() when it runs out of data.
-  Revised the copyright/disclaimer/license notice.
-  Corrected the definition of PNG_TRANSFORM_INVERT_ALPHA  (0x0400 not 0x0200)
-  Added PNG_USE_DLL macro.
-  Added "msvc" and contrib/msvctest directories with MSVC++ project files
-    (Simon-Pierre Cadieux) and contrib/visupng directory (Willem van Schaik).
-  Removed leading underscores from "_PNG_H" and "_PNG_SAVE_BSD_SOURCE" macros.
-  Fixed bugs in pngwrite.c and pngwutil.c that prevented writing iCCP chunks.
-  Revised the definition of "trans_values" in libpng.3/libpng.txt
   Added png_free(png_ptr, key) two places in pngpread.c to stop memory leaks.
   Changed PNG_NO_STDIO to PNG_NO_CONSOLE_IO, several places in pngrutil.c and
      pngwutil.c.
@@ -103,7 +12,9 @@ Changes since the last public release (1.0.6):
   Removed unused "#include <assert.h>" from png.c
   Added WindowsCE support.
   Revised pnggccrd.c to work with gcc-2.95.2 and in the Cygwin environment.
-
+  Only set the PNG_FLAG_FREE_TRNS or PNG_FREE_TRNS flag in png_handle_tRNS()
+     for indexed-color input files to avoid potential double-freeing trans array
+     under some unusual conditions; problem was introduced in version 1.0.7.
 
 Send comments/corrections/commendations to
 png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu
diff --git a/CHANGES b/CHANGES
index d06cb50d3..4e75e438f 100644
--- a/CHANGES
+++ b/CHANGES
@@ -797,7 +797,7 @@ version 1.0.7rc2 [June 28, 2000]
   Fixed "DJBPP" typo in pnggccrd.c introduced in beta18.
 version 1.0.7 [July 1, 2000]
   Revised the definition of "trans_values" in libpng.3/libpng.txt
-version 1.0.8beta2 [July 10, 2000]
+version 1.0.8beta3 [July 11, 2000]
 version 1.0.8beta1 [July 8, 2000]
   Added png_free(png_ptr, key) two places in pngpread.c to stop memory leaks.
   Changed PNG_NO_STDIO to PNG_NO_CONSOLE_IO, several places in pngrutil.c and
@@ -809,6 +809,11 @@ version 1.0.8beta1 [July 8, 2000]
 version 1.0.8beta2 [July 10, 2000]
   Added project files to the wince directory and made further revisions
      of pngtest.c, pngrio.c, and pngwio.c in support of WindowsCE.
+version 1.0.8beta3 [July 11, 2000]
+  Only set the PNG_FLAG_FREE_TRNS or PNG_FREE_TRNS flag in png_handle_tRNS()
+     for indexed-color input files to avoid potential double-freeing trans array
+     under some unusual conditions; problem was introduced in version 1.0.6f.
+  Further revisions to pngtest.c and files in the wince subdirectory.
 
 Send comments/corrections/commendations to
 png-implement@ccrc.wustl.edu or to randeg@alum.rpi.edu
diff --git a/INSTALL b/INSTALL
index 3d7ec877d..8bf47bf8a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
 
-Installing libpng version 1.0.8beta2 - July 10, 2000
+Installing libpng version 1.0.8beta3 - July 11, 2000
 
 Before installing libpng, you must first install zlib.  zlib
 can usually be found wherever you got libpng.  zlib can be
@@ -10,7 +10,7 @@ zlib.h and zconf.h include files that correspond to the
 version of zlib that's installed.
 
 You can rename the directories that you downloaded (they
-might be called "libpng-1.0.8beta2" or "lpng107" and "zlib-1.1.3"
+might be called "libpng-1.0.8beta3" or "lpng107" and "zlib-1.1.3"
 or "zlib113") so that you have directories called "zlib" and "libpng".
 
 Your directory structure should look like this:
@@ -57,8 +57,8 @@ The files that are presently available in the scripts directory
 include
 
  makefile.std      =>  Generic UNIX makefile (cc, creates static libpng.a)
- makefile.linux    =>  Linux/ELF makefile (gcc, creates libpng.so.2.1.0.8beta2)
- makefile.gcmmx    =>  Linux/ELF makefile (gcc, creates libpng.so.2.1.0.8beta2,
+ makefile.linux    =>  Linux/ELF makefile (gcc, creates libpng.so.2.1.0.8beta3)
+ makefile.gcmmx    =>  Linux/ELF makefile (gcc, creates libpng.so.2.1.0.8beta3,
                        uses assembler code tuned for Intel MMX platform)
  makefile.gcc      =>  Generic makefile (gcc, creates static libpng.a)
  makefile.knr      =>  Archaic UNIX Makefile that converts files with
@@ -70,9 +70,9 @@ include
  makefile.intel    =>  Intel C/C++ version 4.0 and later
  libpng.icc        =>  Project file for IBM VisualAge/C++ version 4.0 or later
  makefile.sgi      =>  Silicon Graphics IRIX makefile (cc, creates static lib)
- makefile.sggcc    =>  Silicon Graphics (gcc, creates libpng.so.2.1.0.8beta2)
+ makefile.sggcc    =>  Silicon Graphics (gcc, creates libpng.so.2.1.0.8beta3)
  makefile.sunos    =>  Sun makefile
- makefile.solaris  =>  Solaris 2.X makefile (gcc, creates libpng.so.2.1.0.8beta2)
+ makefile.solaris  =>  Solaris 2.X makefile (gcc, creates libpng.so.2.1.0.8beta3)
  makefile.sco      =>  For SCO OSr5  ELF and Unixware 7 with Native cc
  makefile.mips     =>  MIPS makefile
  makefile.acorn    =>  Acorn makefile
diff --git a/LICENSE b/LICENSE
index 1ede268dd..bd2a72069 100644
--- a/LICENSE
+++ b/LICENSE
@@ -4,7 +4,7 @@ COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
 If you modify libpng you may insert additional notices immediately following
 this sentence.
 
-libpng version 1.0.8beta2, July 10, 2000 is Copyright (c) 2000 Glenn Randers-Pehrson
+libpng version 1.0.8beta3, July 11, 2000 is Copyright (c) 2000 Glenn Randers-Pehrson
 Distributed according to the same disclaimer and license as libpng-1.0.6
 with the following individuals added to the list of Contributing Authors
 
@@ -94,4 +94,4 @@ certification mark of the Open Source Initiative.
 
 Glenn Randers-Pehrson
 randeg@alum.rpi.edu
-July 10, 2000
+July 11, 2000
diff --git a/README b/README
index bc2cbc8fb..b5efe433a 100644
--- a/README
+++ b/README
@@ -1,4 +1,4 @@
-README for libpng 1.0.8beta2 - July 10, 2000 (shared library 2.1)
+README for libpng 1.0.8beta3 - July 11, 2000 (shared library 2.1)
 See the note about version numbers near the top of png.h
 
 See INSTALL for instructions on how to install libpng.
@@ -176,9 +176,9 @@ Files in this distribution:
        descrip.mms      =>  VMS makefile for MMS or MMK
        makefile.std     =>  Generic UNIX makefile (cc, creates static libpng.a)
        makefile.linux   =>  Linux/ELF makefile
-                            (gcc, creates libpng.so.2.1.0.8beta2)
+                            (gcc, creates libpng.so.2.1.0.8beta3)
        makefile.gcmmx   =>  Linux/ELF makefile (gcc, creates
-                            libpng.so.2.1.0.8beta2, uses assembler code
+                            libpng.so.2.1.0.8beta3, uses assembler code
                             tuned for Intel MMX platform)
        makefile.gcc     =>  Generic makefile (gcc, creates static libpng.a)
        makefile.knr     =>  Archaic UNIX Makefile that converts files with
@@ -190,10 +190,10 @@ Files in this distribution:
        makefile.intel   =>  Intel C/C++ version 4.0 and later
        libpng.icc       =>  Project file, IBM VisualAge/C++ 4.0 or later
        makefile.sgi     =>  Silicon Graphics IRIX (cc, creates static lib)
-       makefile.sggcc   =>  Silicon Graphics (gcc, creates libpng.so.2.1.0.8beta2)
+       makefile.sggcc   =>  Silicon Graphics (gcc, creates libpng.so.2.1.0.8beta3)
        makefile.sunos   =>  Sun makefile
        makefile.solaris =>  Solaris 2.X makefile
-                            (gcc, creates libpng.so.2.1.0.8beta2)
+                            (gcc, creates libpng.so.2.1.0.8beta3)
        makefile.sco     =>  For SCO OSr5  ELF and Unixware 7 with Native cc
        makefile.mips    =>  MIPS makefile
        makefile.acorn   =>  Acorn makefile
diff --git a/Y2KINFO b/Y2KINFO
index cf45eb885..caa4c1d5c 100644
--- a/Y2KINFO
+++ b/Y2KINFO
@@ -1,13 +1,13 @@
    Y2K compliance in libpng:
    =========================
 
-      July 10, 2000
+      July 11, 2000
 
       Since the PNG Development group is an ad-hoc body, we can't make
       an official declaration.
 
       This is your unofficial assurance that libpng from version 0.71 and
-      upward through 1.0.8beta2 are Y2K compliant.  It is my belief that earlier
+      upward through 1.0.8beta3 are Y2K compliant.  It is my belief that earlier
       versions were also Y2K compliant.
 
       Libpng only has three year fields.  One is a 2-byte unsigned integer
diff --git a/configure b/configure
index 2abef9d34..e18041a34 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 echo "
-  There is no \"configure\" script for Libpng-1.0.8beta2.  Instead, please
+  There is no \"configure\" script for Libpng-1.0.8beta3.  Instead, please
   copy the appropriate makefile for your system from the \"scripts\"
   directory.  Read the INSTALL file for more details.
 "
diff --git a/libpng.3 b/libpng.3
index d754a1c2a..2e55112f2 100644
--- a/libpng.3
+++ b/libpng.3
@@ -1,6 +1,6 @@
-.TH LIBPNG 3 "July 10, 2000"
+.TH LIBPNG 3 "July 11, 2000"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.0.8beta2
+libpng \- Portable Network Graphics (PNG) Reference Library 1.0.8beta3
 .SH SYNOPSIS
 \fI\fB
 
@@ -747,7 +747,7 @@ Following is a copy of the libpng.txt file that accompanies libpng.
 .SH LIBPNG.TXT
 libpng.txt - A description on how to use and modify libpng
 
- libpng version 1.0.8beta2 - July 10, 2000
+ libpng version 1.0.8beta3 - July 11, 2000
  Updated and distributed by Glenn Randers-Pehrson
  <randeg@alum.rpi.edu>
  Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
@@ -3381,13 +3381,13 @@ application:
 
 .SH VII. Y2K Compliance in libpng
 
-July 10, 2000
+July 11, 2000
 
 Since the PNG Development group is an ad-hoc body, we can't make
 an official declaration.
 
 This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.0.8beta2 are Y2K compliant.  It is my belief that earlier
+upward through 1.0.8beta3 are Y2K compliant.  It is my belief that earlier
 versions were also Y2K compliant.
 
 Libpng only has three year fields.  One is a 2-byte unsigned integer that
@@ -3528,7 +3528,7 @@ possible without all of you.
 
 Thanks to Frank J. T. Wojcik for helping with the documentation.
 
-Libpng version 1.0.8beta2 - July 10, 2000:
+Libpng version 1.0.8beta3 - July 11, 2000:
 Initially created in 1995 by Guy Eric Schalnat, then of Group 42, Inc.
 Currently maintained by Glenn Randers-Pehrson (randeg@alum.rpi.edu).
 
@@ -3541,7 +3541,7 @@ Supported by the PNG development group
 If you modify libpng you may insert additional notices immediately following
 this sentence.
 
-libpng version 1.0.8beta2, July 10, 2000 is
+libpng version 1.0.8beta3, July 11, 2000 is
 Copyright (c) 2000 Glenn Randers-Pehrson
 Distributed according to the same disclaimer and license as libpng-1.0.6
 with the following individuals added to the list of Contributing Authors
@@ -3632,7 +3632,7 @@ certification mark of the Open Source Initiative.
 
 Glenn Randers-Pehrson
 randeg@alum.rpi.edu
-July 10, 2000
+July 11, 2000
 
 .\" end of man page
 
diff --git a/libpng.txt b/libpng.txt
index 2354e563b..088abc071 100644
--- a/libpng.txt
+++ b/libpng.txt
@@ -1,6 +1,6 @@
 libpng.txt - A description on how to use and modify libpng
 
- libpng version 1.0.8beta2 - July 10, 2000
+ libpng version 1.0.8beta3 - July 11, 2000
  Updated and distributed by Glenn Randers-Pehrson
  <randeg@alum.rpi.edu>
  Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
@@ -2634,13 +2634,13 @@ application:
 
 VII. Y2K Compliance in libpng
 
-July 10, 2000
+July 11, 2000
 
 Since the PNG Development group is an ad-hoc body, we can't make
 an official declaration.
 
 This is your unofficial assurance that libpng from version 0.71 and
-upward through 1.0.8beta2 are Y2K compliant.  It is my belief that earlier
+upward through 1.0.8beta3 are Y2K compliant.  It is my belief that earlier
 versions were also Y2K compliant.
 
 Libpng only has three year fields.  One is a 2-byte unsigned integer that
diff --git a/libpngpf.3 b/libpngpf.3
index 5785171cc..db5a55658 100644
--- a/libpngpf.3
+++ b/libpngpf.3
@@ -1,6 +1,6 @@
-.TH LIBPNGPF 3 "July 10, 2000"
+.TH LIBPNGPF 3 "July 11, 2000"
 .SH NAME
-libpng \- Portable Network Graphics (PNG) Reference Library 1.0.8beta2
+libpng \- Portable Network Graphics (PNG) Reference Library 1.0.8beta3
 (private functions)
 .SH SYNOPSIS
 \fB#include <png.h>\fP
diff --git a/msvc/README.txt b/msvc/README.txt
index 40224cdcf..eb258de49 100644
--- a/msvc/README.txt
+++ b/msvc/README.txt
@@ -1,5 +1,5 @@
 Microsoft Developer Studio Build File, Format Version 6.00 for
-libpng 1.0.8beta2 (July 10, 2000) and zlib
+libpng 1.0.8beta3 (July 11, 2000) and zlib
 
 Copyright (C) 2000 Simon-Pierre Cadieux
 For conditions of distribution and use, see copyright notice in png.h
diff --git a/msvc/png32ms.def b/msvc/png32ms.def
index 9fba000a3..79765c2c6 100644
--- a/msvc/png32ms.def
+++ b/msvc/png32ms.def
@@ -6,7 +6,7 @@ LIBRARY
 DESCRIPTION "PNG image compression library for Windows"
 
 EXPORTS
-;Version 1.0.8beta2
+;Version 1.0.8beta3
   png_build_grayscale_palette  @1
   png_check_sig        @2
   png_chunk_error      @3
diff --git a/png.5 b/png.5
index 80943a8b9..d039a1f4d 100644
--- a/png.5
+++ b/png.5
@@ -1,4 +1,4 @@
-.TH PNG 5 "July 10, 2000"
+.TH PNG 5 "July 11, 2000"
 .SH NAME
 png \- Portable Network Graphics (PNG) format
 .SH DESCRIPTION
diff --git a/png.c b/png.c
index d2f3c02d4..aea0f98ea 100644
--- a/png.c
+++ b/png.c
@@ -1,7 +1,7 @@
 
 /* png.c - location for general purpose libpng functions
  *
- * libpng version 1.0.8beta2 - July 10, 2000
+ * libpng version 1.0.8beta3 - July 11, 2000
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -13,14 +13,14 @@
 #include "png.h"
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_0_8beta2 Your_png_h_is_not_version_1_0_8beta2;
+typedef version_1_0_8beta3 Your_png_h_is_not_version_1_0_8beta3;
 
 /* Version information for C files.  This had better match the version
  * string defined in png.h.  */
 
 #ifdef PNG_USE_GLOBAL_ARRAYS
 /* png_libpng_ver was changed to a function in version 1.0.5c */
-char png_libpng_ver[12] = "1.0.8beta2";
+char png_libpng_ver[12] = "1.0.8beta3";
 
 /* png_sig was changed to a function in version 1.0.5c */
 /* Place to hold the signature string for a PNG file. */
@@ -616,7 +616,7 @@ png_charp PNGAPI
 png_get_copyright(png_structp png_ptr)
 {
    if (png_ptr != NULL || png_ptr == NULL)  /* silence compiler warning */
-   return ("\n libpng version 1.0.8beta2 - July 10, 2000\n\
+   return ("\n libpng version 1.0.8beta3 - July 11, 2000\n\
    Copyright (c) 1998-2000 Glenn Randers-Pehrson\n\
    Copyright (c) 1996, 1997 Andreas Dilger\n\
    Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.\n");
@@ -634,8 +634,8 @@ png_get_libpng_ver(png_structp png_ptr)
 {
    /* Version of *.c files used when building libpng */
    if(png_ptr != NULL) /* silence compiler warning about unused png_ptr */
-      return("1.0.8beta2");
-   return("1.0.8beta2");
+      return("1.0.8beta3");
+   return("1.0.8beta3");
 }
 
 png_charp PNGAPI
diff --git a/png.h b/png.h
index 08ae05ee5..442125bcd 100644
--- a/png.h
+++ b/png.h
@@ -1,7 +1,7 @@
 
 /* png.h - header file for PNG reference library
  *
- * libpng version 1.0.8beta2 - July 10, 2000
+ * libpng version 1.0.8beta3 - July 11, 2000
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
  * (Version 0.88 Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.)
@@ -9,7 +9,7 @@
  * Authors and maintainers:
  *  libpng versions 0.71, May 1995, through 0.88, January 1996: Guy Schalnat
  *  libpng versions 0.89c, June 1996, through 0.96, May 1997: Andreas Dilger
- *  libpng versions 0.97, January 1998, through 1.0.8beta2 - July 10, 2000: Glenn
+ *  libpng versions 0.97, January 1998, through 1.0.8beta3 - July 11, 2000: Glenn
  *  See also "Contributing Authors", below.
  *
  * Note about libpng version numbers:
@@ -82,7 +82,7 @@
  * If you modify libpng you may insert additional notices immediately following
  * this sentence.
  *
- * libpng version 1.0.8beta2, July 10, 2000, is
+ * libpng version 1.0.8beta3, July 11, 2000, is
  * Copyright (c) 2000 Glenn Randers-Pehrson
  * Distributed according to the same disclaimer and license as libpng-1.0.6
  * with the following individuals added to the list of Contributing Authors
@@ -187,13 +187,13 @@
  * Y2K compliance in libpng:
  * =========================
  *
- *    July 10, 2000
+ *    July 11, 2000
  *
  *    Since the PNG Development group is an ad-hoc body, we can't make
  *    an official declaration.
  *
  *    This is your unofficial assurance that libpng from version 0.71 and
- *    upward through 1.0.8beta2 are Y2K compliant.  It is my belief that earlier
+ *    upward through 1.0.8beta3 are Y2K compliant.  It is my belief that earlier
  *    versions were also Y2K compliant.
  *
  *    Libpng only has three year fields.  One is a 2-byte unsigned integer
@@ -249,7 +249,7 @@
  */
 
 /* Version information for png.h - this should match the version in png.c */
-#define PNG_LIBPNG_VER_STRING "1.0.8beta2"
+#define PNG_LIBPNG_VER_STRING "1.0.8beta3"
 
 #define PNG_LIBPNG_VER_SONUM   2
 
@@ -259,7 +259,7 @@
 #define PNG_LIBPNG_VER_RELEASE 8
 /* This should match the numeric part of the final component of
  * PNG_LIBPNG_VER_STRING, omitting any leading zero: */
-#define PNG_LIBPNG_VER_BUILD   2
+#define PNG_LIBPNG_VER_BUILD   3
 
 /* Careful here.  At one time, Guy wanted to use 082, but that would be octal.
  * We must not include leading zeros.
@@ -664,11 +664,10 @@ defined(PNG_READ_BACKGROUND_SUPPORTED)
     * range given by [pcal_X0, pcal_X1], and are further transformed by a
     * (possibly non-linear) transformation function given by "pcal_type"
     * and "pcal_params" into "pcal_units".  Please see the PNG_EQUATION_
-    * defines below, and the PNG-Group's Scientific Visualization extension
-    * chunks document png-scivis-19970203 for a complete description of the
-    * transformations and how they should be implemented, as well as the
-    * png-extensions document for a description of the ASCII parameter
-    * strings.  Data values are valid if (valid & PNG_INFO_pCAL) non-zero.
+    * defines below, and the PNG-Group's PNG extensions document for a
+    * complete description of the transformations and how they should be
+    * implemented, and for a description of the ASCII parameter strings.
+    * Data values are valid if (valid & PNG_INFO_pCAL) non-zero.
     */
    png_charp pcal_purpose;  /* pCAL chunk description string */
    png_int_32 pcal_X0;      /* minimum value */
@@ -1148,9 +1147,9 @@ struct png_struct_def
 };
 
 /* This prevents a compiler error in png_get_copyright() in png.c if png.c
-and png.h are both at * version 1.0.8beta2
+and png.h are both at * version 1.0.8beta3
  */
-typedef png_structp version_1_0_8beta2;
+typedef png_structp version_1_0_8beta3;
 
 typedef png_struct FAR * FAR * png_structpp;
 
@@ -2172,7 +2171,7 @@ extern PNG_EXPORT(png_charp,png_get_header_version) PNGARG((png_structp png_ptr)
 extern PNG_EXPORT(png_charp,png_get_libpng_ver) PNGARG((png_structp png_ptr));
 
 #define PNG_HEADER_VERSION_STRING \
-   " libpng version 1.0.8beta2 - July 10, 2000 (header)\n"
+   " libpng version 1.0.8beta3 - July 11, 2000 (header)\n"
 
 #ifdef PNG_READ_COMPOSITE_NODIV_SUPPORTED
 /* With these routines we avoid an integer divide, which will be slower on
diff --git a/pngasmrd.h b/pngasmrd.h
index efab7088c..9c8d13c59 100644
--- a/pngasmrd.h
+++ b/pngasmrd.h
@@ -1,6 +1,6 @@
 /* pngasmrd.h - assembler version of utilities to read a PNG file
  *
- * libpng 1.0.8beta2 - July 10, 2000
+ * libpng 1.0.8beta3 - July 11, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1999, 2000 Glenn Randers-Pehrson
  *
diff --git a/pngconf.h b/pngconf.h
index 8f4aff8b0..6dbd5430b 100644
--- a/pngconf.h
+++ b/pngconf.h
@@ -1,6 +1,6 @@
 /* pngconf.h - machine configurable file for libpng
  *
- * libpng 1.0.8beta2 - July 10, 2000
+ * libpng 1.0.8beta3 - July 11, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngerror.c b/pngerror.c
index 21fe3673a..5dd1c317d 100644
--- a/pngerror.c
+++ b/pngerror.c
@@ -1,7 +1,7 @@
 
 /* pngerror.c - stub functions for i/o and memory allocation
  *
- * libpng 1.0.8beta2 - July 10, 2000
+ * libpng 1.0.8beta3 - July 11, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pnggccrd.c b/pnggccrd.c
index 99be59c77..32efb51e2 100644
--- a/pnggccrd.c
+++ b/pnggccrd.c
@@ -6,7 +6,7 @@
  *     and http://www.intel.com/drg/pentiumII/appnotes/923/923.htm
  *     for Intel's performance analysis of the MMX vs. non-MMX code.
  *
- * libpng version 1.0.8beta2 - July 10, 2000
+ * libpng version 1.0.8beta3 - July 11, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * Copyright (c) 1998, Intel Corporation
diff --git a/pngget.c b/pngget.c
index e1f569191..b5df47b1c 100644
--- a/pngget.c
+++ b/pngget.c
@@ -1,7 +1,7 @@
 
 /* pngget.c - retrieval of values from info struct
  *
- * libpng 1.0.8beta2 - July 10, 2000
+ * libpng 1.0.8beta3 - July 11, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngmem.c b/pngmem.c
index 614b093de..2b2bd524c 100644
--- a/pngmem.c
+++ b/pngmem.c
@@ -1,7 +1,7 @@
 
 /* pngmem.c - stub functions for memory allocation
  *
- * libpng 1.0.8beta2 - July 10, 2000
+ * libpng 1.0.8beta3 - July 11, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngpread.c b/pngpread.c
index 0f81cac48..32dbca1f0 100644
--- a/pngpread.c
+++ b/pngpread.c
@@ -1,7 +1,7 @@
 
 /* pngpread.c - read a png file in push mode
  *
- * libpng 1.0.8beta2 - July 10, 2000
+ * libpng 1.0.8beta3 - July 11, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngread.c b/pngread.c
index 123ed8ab0..1c4e33c48 100644
--- a/pngread.c
+++ b/pngread.c
@@ -1,7 +1,7 @@
 
 /* pngread.c - read a PNG file
  *
- * libpng 1.0.8beta2 - July 10, 2000
+ * libpng 1.0.8beta3 - July 11, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -697,7 +697,7 @@ png_read_row(png_structp png_ptr, png_bytep row, png_bytep dsp_row)
  * not called png_set_interlace_handling(), the display_row buffer will
  * be ignored, so pass NULL to it.
  *
- * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.8beta2
+ * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.8beta3
  */
 
 void PNGAPI
@@ -746,7 +746,7 @@ png_read_rows(png_structp png_ptr, png_bytepp row,
  * only call this function once.  If you desire to have an image for
  * each pass of a interlaced image, use png_read_rows() instead.
  *
- * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.8beta2
+ * [*] png_handle_alpha() does not exist yet, as of libpng version 1.0.8beta3
  */
 void PNGAPI
 png_read_image(png_structp png_ptr, png_bytepp image)
diff --git a/pngrio.c b/pngrio.c
index e94c02d70..7dbee1086 100644
--- a/pngrio.c
+++ b/pngrio.c
@@ -1,7 +1,7 @@
 
 /* pngrio.c - functions for data input
  *
- * libpng 1.0.8beta2 - July 10, 2000
+ * libpng 1.0.8beta3 - July 11, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngrtran.c b/pngrtran.c
index 153ef6a54..52b73aa9b 100644
--- a/pngrtran.c
+++ b/pngrtran.c
@@ -1,7 +1,7 @@
 
 /* pngrtran.c - transforms the data in a row for PNG readers
  *
- * libpng 1.0.8beta2 - July 10, 2000
+ * libpng 1.0.8beta3 - July 11, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngrutil.c b/pngrutil.c
index e7c7d4efd..6551124e2 100644
--- a/pngrutil.c
+++ b/pngrutil.c
@@ -1,7 +1,7 @@
 
 /* pngrutil.c - utilities to read a PNG file
  *
- * libpng 1.0.8beta2 - July 10, 2000
+ * libpng 1.0.8beta3 - July 11, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -1264,9 +1264,11 @@ png_handle_tRNS(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 
 #ifdef PNG_FREE_ME_SUPPORTED
    png_free_data(png_ptr, info_ptr, PNG_FREE_TRNS, 0);
-   png_ptr->free_me |= PNG_FREE_TRNS;
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      png_ptr->free_me |= PNG_FREE_TRNS;
 #else
-   png_ptr->flags |= PNG_FLAG_FREE_TRNS;
+   if (png_ptr->color_type == PNG_COLOR_TYPE_PALETTE)
+      png_ptr->flags |= PNG_FLAG_FREE_TRNS;
 #endif
    png_set_tRNS(png_ptr, info_ptr, png_ptr->trans, png_ptr->num_trans,
       &(png_ptr->trans_values));
@@ -1510,7 +1512,7 @@ png_handle_oFFs(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 #endif
 
 #if defined(PNG_READ_pCAL_SUPPORTED)
-/* read the pCAL chunk (png-scivis-19970203) */
+/* read the pCAL chunk (described in the PNG Extensions document) */
 void /* PRIVATE */
 png_handle_pCAL(png_structp png_ptr, png_infop info_ptr, png_uint_32 length)
 {
diff --git a/pngset.c b/pngset.c
index 6a52cefc2..fc236ebc5 100644
--- a/pngset.c
+++ b/pngset.c
@@ -1,7 +1,7 @@
 
 /* pngset.c - storage of image information into info struct
  *
- * libpng 1.0.8beta2 - July 10, 2000
+ * libpng 1.0.8beta3 - July 11, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngtest.c b/pngtest.c
index e8e5fad01..aa235db3b 100644
--- a/pngtest.c
+++ b/pngtest.c
@@ -1,7 +1,7 @@
 
 /* pngtest.c - a simple test program to test libpng
  *
- * libpng 1.0.8beta2 - July 10, 2000
+ * libpng 1.0.8beta3 - July 11, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -557,20 +557,33 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
 #endif
 #endif
 
+#if defined(_WIN32_WCE)
+   TCHAR path[MAX_PATH];
+#endif
    char inbuf[256], outbuf[256];
 
    row_buf = (png_bytep)NULL;
 
+#if defined(_WIN32_WCE)
+   MultiByteToWideChar(CP_ACP, 0, inname, -1, path, MAX_PATH);
+   if ((fpin = CreateFile(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL)) == INVALID_HANDLE_VALUE)
+#else
    if ((fpin = fopen(inname, "rb")) == NULL)
+#endif
    {
       fprintf(STDERR, "Could not find input file %s\n", inname);
       return (1);
    }
 
+#if defined(_WIN32_WCE)
+   MultiByteToWideChar(CP_ACP, 0, outname, -1, path, MAX_PATH);
+   if ((fpout = CreateFile(path, GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL)) == INVALID_HANDLE_VALUE)
+#else
    if ((fpout = fopen(outname, "wb")) == NULL)
+#endif
    {
       fprintf(STDERR, "Could not open output file %s\n", outname);
-      fclose(fpin);
+      FCLOSE(fpin);
       return (1);
    }
 
@@ -619,8 +632,8 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
       png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);
       png_destroy_info_struct(write_ptr, &write_end_info_ptr);
       png_destroy_write_struct(&write_ptr, &write_info_ptr);
-      fclose(fpin);
-      fclose(fpout);
+      FCLOSE(fpin);
+      FCLOSE(fpout);
       return (1);
    }
 #ifdef USE_FAR_KEYWORD
@@ -638,8 +651,8 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
       png_destroy_read_struct(&read_ptr, &read_info_ptr, &end_info_ptr);
       png_destroy_info_struct(write_ptr, &write_end_info_ptr);
       png_destroy_write_struct(&write_ptr, &write_info_ptr);
-      fclose(fpin);
-      fclose(fpout);
+      FCLOSE(fpin);
+      FCLOSE(fpout);
       return (1);
    }
 #ifdef USE_FAR_KEYWORD
@@ -965,8 +978,8 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
       png_destroy_read_struct(&read_ptr, &read_info_ptr, (png_infopp)NULL);
       png_destroy_info_struct(write_ptr, &write_end_info_ptr);
       png_destroy_write_struct(&write_ptr, &write_info_ptr);
-      fclose(fpin);
-      fclose(fpout);
+      FCLOSE(fpin);
+      FCLOSE(fpout);
       return (1);
    }
    png_debug(0, "Writing row data\n");
@@ -1082,20 +1095,30 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
    png_destroy_info_struct(write_ptr, &write_end_info_ptr);
    png_destroy_write_struct(&write_ptr, &write_info_ptr);
 
-   fclose(fpin);
-   fclose(fpout);
+   FCLOSE(fpin);
+   FCLOSE(fpout);
 
    png_debug(0, "Opening files for comparison\n");
+#if defined(_WIN32_WCE)
+   MultiByteToWideChar(CP_ACP, 0, inname, -1, path, MAX_PATH);
+   if ((fpin = CreateFile(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL)) == INVALID_HANDLE_VALUE)
+#else
    if ((fpin = fopen(inname, "rb")) == NULL)
+#endif
    {
       fprintf(STDERR, "Could not find file %s\n", inname);
       return (1);
    }
 
+#if defined(_WIN32_WCE)
+   MultiByteToWideChar(CP_ACP, 0, outname, -1, path, MAX_PATH);
+   if ((fpout = CreateFile(path, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL)) == INVALID_HANDLE_VALUE)
+#else
    if ((fpout = fopen(outname, "rb")) == NULL)
+#endif
    {
       fprintf(STDERR, "Could not find file %s\n", outname);
-      fclose(fpin);
+      FCLOSE(fpin);
       return (1);
    }
 
@@ -1122,8 +1145,8 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
               ZLIB_VERSION);
             wrote_question=1;
          }
-         fclose(fpin);
-         fclose(fpout);
+         FCLOSE(fpin);
+         FCLOSE(fpout);
          return (0);
       }
 
@@ -1145,14 +1168,14 @@ test_one_file(PNG_CONST char *inname, PNG_CONST char *outname)
               ZLIB_VERSION);
             wrote_question=1;
          }
-         fclose(fpin);
-         fclose(fpout);
+         FCLOSE(fpin);
+         FCLOSE(fpout);
          return (0);
       }
    }
 
-   fclose(fpin);
-   fclose(fpout);
+   FCLOSE(fpin);
+   FCLOSE(fpout);
 
    return (0);
 }
@@ -1412,4 +1435,4 @@ main(int argc, char *argv[])
 }
 
 /* Generate a compiler error if there is an old png.h in the search path. */
-typedef version_1_0_8beta2 your_png_h_is_not_version_1_0_8beta2;
+typedef version_1_0_8beta3 your_png_h_is_not_version_1_0_8beta3;
diff --git a/pngtrans.c b/pngtrans.c
index 7bba2e302..ae9083221 100644
--- a/pngtrans.c
+++ b/pngtrans.c
@@ -1,7 +1,7 @@
 
 /* pngtrans.c - transforms the data in a row (used by both readers and writers)
  *
- * libpng 1.0.8beta2 - July 10, 2000
+ * libpng 1.0.8beta3 - July 11, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngvcrd.c b/pngvcrd.c
index d200752b0..639c37841 100644
--- a/pngvcrd.c
+++ b/pngvcrd.c
@@ -2,7 +2,7 @@
  *
  * For Intel x86 CPU and Microsoft Visual C++ compiler
  *
- * libpng 1.0.8beta2 - July 10, 2000
+ * libpng 1.0.8beta3 - July 11, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * Copyright (c) 1998, Intel Corporation
diff --git a/pngwio.c b/pngwio.c
index cc06d5888..22f8bd4e9 100644
--- a/pngwio.c
+++ b/pngwio.c
@@ -1,7 +1,7 @@
 
 /* pngwio.c - functions for data output
  *
- * libpng 1.0.8beta2 - July 10, 2000
+ * libpng 1.0.8beta3 - July 11, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngwrite.c b/pngwrite.c
index 7ad34cdfd..dc1246e37 100644
--- a/pngwrite.c
+++ b/pngwrite.c
@@ -1,7 +1,7 @@
 
 /* pngwrite.c - general routines to write a PNG file
  *
- * libpng 1.0.8beta2 - July 10, 2000
+ * libpng 1.0.8beta3 - July 11, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngwtran.c b/pngwtran.c
index 63b715f79..674c0adf7 100644
--- a/pngwtran.c
+++ b/pngwtran.c
@@ -1,7 +1,7 @@
 
 /* pngwtran.c - transforms the data in a row for PNG writers
  *
- * libpng 1.0.8beta2 - July 10, 2000
+ * libpng 1.0.8beta3 - July 11, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
diff --git a/pngwutil.c b/pngwutil.c
index 0251c50c8..1640a2d09 100644
--- a/pngwutil.c
+++ b/pngwutil.c
@@ -1,7 +1,7 @@
 
 /* pngwutil.c - utilities to write a PNG file
  *
- * libpng 1.0.8beta2 - July 10, 2000
+ * libpng 1.0.8beta3 - July 11, 2000
  * For conditions of distribution and use, see copyright notice in png.h
  * Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson
  * (Version 0.96 Copyright (c) 1996, 1997 Andreas Dilger)
@@ -1368,7 +1368,7 @@ png_write_oFFs(png_structp png_ptr, png_uint_32 x_offset,
 #endif
 
 #if defined(PNG_WRITE_pCAL_SUPPORTED)
-/* write the pCAL chunk (png-scivis-19970203) */
+/* write the pCAL chunk (described in the PNG extensions document) */
 void /* PRIVATE */
 png_write_pCAL(png_structp png_ptr, png_charp purpose, png_int_32 X0,
    png_int_32 X1, int type, int nparams, png_charp units, png_charpp params)
diff --git a/scripts/makefile.beos b/scripts/makefile.beos
index dab112b6f..3163354e9 100644
--- a/scripts/makefile.beos
+++ b/scripts/makefile.beos
@@ -31,7 +31,7 @@ RANLIB=ranlib
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.8beta2
+PNGMIN = 1.0.8beta3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 # where make install puts libpng.a, libpng.so*, and png.h
diff --git a/scripts/makefile.dec b/scripts/makefile.dec
index 710a89442..20d4876fc 100644
--- a/scripts/makefile.dec
+++ b/scripts/makefile.dec
@@ -14,7 +14,7 @@ ZLIBINC=../zlib
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.8beta2
+PNGMIN = 1.0.8beta3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 CC=cc
diff --git a/scripts/makefile.gcmmx b/scripts/makefile.gcmmx
index dc0ab26a7..3103fd843 100644
--- a/scripts/makefile.gcmmx
+++ b/scripts/makefile.gcmmx
@@ -34,7 +34,7 @@ RANLIB=ranlib
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.8beta2
+PNGMIN = 1.0.8beta3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 INCPATH=$(prefix)/include
diff --git a/scripts/makefile.linux b/scripts/makefile.linux
index 1d40d5d9c..74f0163c9 100644
--- a/scripts/makefile.linux
+++ b/scripts/makefile.linux
@@ -34,7 +34,7 @@ RANLIB=ranlib
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.8beta2
+PNGMIN = 1.0.8beta3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 INCPATH=$(prefix)/include
diff --git a/scripts/makefile.sco b/scripts/makefile.sco
index eddedebf4..d58f83225 100644
--- a/scripts/makefile.sco
+++ b/scripts/makefile.sco
@@ -25,7 +25,7 @@ RANLIB=echo
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.8beta2
+PNGMIN = 1.0.8beta3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 INCPATH=$(prefix)/include
diff --git a/scripts/makefile.sggcc b/scripts/makefile.sggcc
index 9cf8ae0ad..cdc200f53 100644
--- a/scripts/makefile.sggcc
+++ b/scripts/makefile.sggcc
@@ -19,8 +19,8 @@ CFLAGS=-I$(ZLIBINC) -O2 $(WARNMORE) -fPIC -mabi=n32 # -g -DPNG_DEBUG=5
 LDFLAGS=-L. -L$(ZLIBLIB) -lpng -lz -lm
 LDSHARED=gcc -shared
 
-VER=1.0.8beta2
-LIBS=libpng.so.1.0.8beta2
+VER=1.0.8beta3
+LIBS=libpng.so.1.0.8beta3
 SHAREDLIB=libpng.so
 libdir=$(prefix)/lib32
 
diff --git a/scripts/makefile.solaris b/scripts/makefile.solaris
index 6fda6d0e7..613c72d5b 100644
--- a/scripts/makefile.solaris
+++ b/scripts/makefile.solaris
@@ -31,7 +31,7 @@ RANLIB=echo
 # read libpng.txt or png.h to see why PNGMAJ is 2.  You should not
 # have to change it.
 PNGMAJ = 2
-PNGMIN = 1.0.8beta2
+PNGMIN = 1.0.8beta3
 PNGVER = $(PNGMAJ).$(PNGMIN)
 
 INCPATH=$(prefix)/include
diff --git a/scripts/pngdef.pas b/scripts/pngdef.pas
index 1732bcc69..557c80b30 100644
--- a/scripts/pngdef.pas
+++ b/scripts/pngdef.pas
@@ -5,7 +5,7 @@ unit pngdef;
 interface
 
 const
-  PNG_LIBPNG_VER_STRING = '1.0.8beta2';
+  PNG_LIBPNG_VER_STRING = '1.0.8beta3';
   PNG_LIBPNG_VER        =  10008;
 
 type
diff --git a/wince/lpngce.dsp b/wince/lpngce.dsp
index f866c4dcf..829a519dd 100644
--- a/wince/lpngce.dsp
+++ b/wince/lpngce.dsp
@@ -62,7 +62,7 @@ CFG=lpngce - Win32 (WCE MIPS) Debug
 # PROP Target_Dir ""
 CPP=clmips.exe
 # ADD BASE CPP /nologo /M$(CECrt) /W3 /O2 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /QMRWCE /c
-# ADD CPP /nologo /M$(CECrt) /W3 /O2 /I "..\..\zlibce" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /QMRWCE /c
+# ADD CPP /nologo /M$(CECrt) /W3 /O2 /I "..\..\zlib" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /QMRWCE /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
@@ -93,7 +93,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=clmips.exe
 # ADD BASE CPP /nologo /M$(CECrtDebug) /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /QMRWCE /c
-# ADD CPP /nologo /M$(CECrtDebug) /W3 /Zi /Od /I ".." /I "..\..\zlibce" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /QMRWCE /c
+# ADD CPP /nologo /M$(CECrtDebug) /W3 /Zi /Od /I ".." /I "..\..\zlib" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /QMRWCE /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
@@ -124,7 +124,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=shcl.exe
 # ADD BASE CPP /nologo /Qsh4 /MC /W3 /O2 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /c
-# ADD CPP /nologo /Qsh4 /MC /W3 /O2 /I ".." /I "..\..\zlibce" /D "NDEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /c
+# ADD CPP /nologo /Qsh4 /MC /W3 /O2 /I ".." /I "..\..\zlib" /D "NDEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /r /d "SHx" /d "SH4" /d "_SH4_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
@@ -155,7 +155,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=shcl.exe
 # ADD BASE CPP /nologo /Qsh4 /MC /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /c
-# ADD CPP /nologo /Qsh4 /MC /W3 /Zi /Od /I ".." /I "..\..\zlibce" /D "DEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /c
+# ADD CPP /nologo /Qsh4 /MC /W3 /Zi /Od /I ".." /I "..\..\zlib" /D "DEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /r /d "SHx" /d "SH4" /d "_SH4_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
@@ -186,7 +186,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=shcl.exe
 # ADD BASE CPP /nologo /M$(CECrt) /W3 /O2 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /c
-# ADD CPP /nologo /M$(CECrt) /W3 /O2 /I ".." /I "..\..\zlibce" /D "NDEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /c
+# ADD CPP /nologo /M$(CECrt) /W3 /O2 /I ".." /I "..\..\zlib" /D "NDEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
@@ -217,7 +217,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=shcl.exe
 # ADD BASE CPP /nologo /M$(CECrtDebug) /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /c
-# ADD CPP /nologo /M$(CECrtDebug) /W3 /Zi /Od /I ".." /I "..\..\zlibce" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /c
+# ADD CPP /nologo /M$(CECrtDebug) /W3 /Zi /Od /I ".." /I "..\..\zlib" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
@@ -248,7 +248,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=clarm.exe
 # ADD BASE CPP /nologo /MC /W3 /O2 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /c
-# ADD CPP /nologo /MC /W3 /O2 /I ".." /I "..\..\zlibce" /D "NDEBUG" /D "ARM" /D "_ARM_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /c
+# ADD CPP /nologo /MC /W3 /O2 /I ".." /I "..\..\zlib" /D "NDEBUG" /D "ARM" /D "_ARM_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /r /d "ARM" /d "_ARM_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
@@ -279,7 +279,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=clarm.exe
 # ADD BASE CPP /nologo /MC /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /c
-# ADD CPP /nologo /MC /W3 /Zi /Od /I ".." /I "..\..\zlibce" /D "DEBUG" /D "ARM" /D "_ARM_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /c
+# ADD CPP /nologo /MC /W3 /Zi /Od /I ".." /I "..\..\zlib" /D "DEBUG" /D "ARM" /D "_ARM_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /r /d "ARM" /d "_ARM_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
@@ -310,7 +310,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=clmips.exe
 # ADD BASE CPP /nologo /QMFWCE /MC /W3 /O2 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /c
-# ADD CPP /nologo /QMFWCE /MC /W3 /O2 /I ".." /I "..\..\zlibce" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /c
+# ADD CPP /nologo /QMFWCE /MC /W3 /O2 /I ".." /I "..\..\zlib" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
@@ -341,7 +341,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=clmips.exe
 # ADD BASE CPP /nologo /QMFWCE /MC /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /c
-# ADD CPP /nologo /QMFWCE /MC /W3 /Zi /Od /I ".." /I "..\..\zlibce" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /c
+# ADD CPP /nologo /QMFWCE /MC /W3 /Zi /Od /I ".." /I "..\..\zlib" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
@@ -372,7 +372,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /ML /W3 /O2 /D "x86" /D "_i386_" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "NDEBUG" /D "i_386_" /D "_MBCS" /D "_USRDLL" /D "LPNGCE_EXPORTS" /Gs8192 /GF /c
-# ADD CPP /nologo /ML /W3 /O2 /I ".." /I "..\..\zlibce" /D "x86" /D "_i386_" /D "_x86_" /D "NDEBUG" /D "i_386_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /Gs8192 /GF /c
+# ADD CPP /nologo /ML /W3 /O2 /I ".." /I "..\..\zlib" /D "x86" /D "_i386_" /D "_x86_" /D "NDEBUG" /D "i_386_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /Gs8192 /GF /c
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /r /d "x86" /d "_i386_" /d "_x86_" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "NDEBUG"
 # ADD RSC /l 0x411 /r /d "x86" /d "_i386_" /d "_x86_" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "NDEBUG"
@@ -402,7 +402,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D "x86" /D "_i386_" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "DEBUG" /D "i_386_" /D "_MBCS" /D "_USRDLL" /D "LPNGCE_EXPORTS" /Gs8192 /GF /c
-# ADD CPP /nologo /MLd /W3 /Zi /Od /I ".." /I "..\..\zlibce" /D "x86" /D "_i386_" /D "_x86_" /D "DEBUG" /D "i_386_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /Gs8192 /GF /c
+# ADD CPP /nologo /MLd /W3 /Zi /Od /I ".." /I "..\..\zlib" /D "x86" /D "_i386_" /D "_x86_" /D "DEBUG" /D "i_386_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /Gs8192 /GF /c
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /r /d "x86" /d "_i386_" /d "_x86_" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "DEBUG"
 # ADD RSC /l 0x411 /r /d "x86" /d "_i386_" /d "_x86_" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "DEBUG"
@@ -432,7 +432,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /ML /W3 /O2 /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "NDEBUG" /D "x86" /D "i486" /D "_x86_" /D "_MBCS" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /c
-# ADD CPP /nologo /ML /W3 /O2 /I ".." /I "..\..\zlibce" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "NDEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /c
+# ADD CPP /nologo /ML /W3 /O2 /I ".." /I "..\..\zlib" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "NDEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "NDEBUG"
@@ -461,7 +461,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D "_MBCS" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /c
-# ADD CPP /nologo /MLd /W3 /Gm /Zi /Od /I ".." /I "..\..\zlibce" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /c
+# ADD CPP /nologo /MLd /W3 /Gm /Zi /Od /I ".." /I "..\..\zlib" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"
@@ -490,7 +490,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=clppc.exe
 # ADD BASE CPP /nologo /M$(CECrt) /W3 /O2 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "PPC" /D "_PPC_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /c
-# ADD CPP /nologo /M$(CECrt) /W3 /O2 /I ".." /I "..\..\zlibce" /D "NDEBUG" /D "PPC" /D "_PPC_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /c
+# ADD CPP /nologo /M$(CECrt) /W3 /O2 /I ".." /I "..\..\zlib" /D "NDEBUG" /D "PPC" /D "_PPC_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /r /d "ppc" /d "_ppc_" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "NDEBUG"
@@ -521,7 +521,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=clppc.exe
 # ADD BASE CPP /nologo /M$(CECrtDebug) /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "PPC" /D "_PPC_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "_USRDLL" /D "LPNGCE_EXPORTS" /YX /c
-# ADD CPP /nologo /M$(CECrtDebug) /W3 /Zi /Od /I ".." /I "..\..\zlibce" /D "DEBUG" /D "PPC" /D "_PPC_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /c
+# ADD CPP /nologo /M$(CECrtDebug) /W3 /Zi /Od /I ".." /I "..\..\zlib" /D "DEBUG" /D "PPC" /D "_PPC_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_BUILD_DLL" /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /r /d "ppc" /d "_ppc_" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "DEBUG"
@@ -574,14 +574,14 @@ DEP_CPP_PNG_C=\
 	
 NODEP_CPP_PNG_C=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_PNG_C=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -593,8 +593,8 @@ NODEP_CPP_PNG_C=\
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH4) Release"
 
 DEP_CPP_PNG_C=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -612,7 +612,7 @@ DEP_CPP_PNG_C=\
 	
 NODEP_CPP_PNG_C=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Release"
@@ -624,7 +624,7 @@ DEP_CPP_PNG_C=\
 	
 NODEP_CPP_PNG_C=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Debug"
@@ -636,7 +636,7 @@ DEP_CPP_PNG_C=\
 	
 NODEP_CPP_PNG_C=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Release"
@@ -648,7 +648,7 @@ DEP_CPP_PNG_C=\
 	
 NODEP_CPP_PNG_C=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Debug"
@@ -660,7 +660,7 @@ DEP_CPP_PNG_C=\
 	
 NODEP_CPP_PNG_C=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Release"
@@ -672,7 +672,7 @@ DEP_CPP_PNG_C=\
 	
 NODEP_CPP_PNG_C=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Debug"
@@ -684,7 +684,7 @@ DEP_CPP_PNG_C=\
 	
 NODEP_CPP_PNG_C=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Release"
@@ -696,7 +696,7 @@ DEP_CPP_PNG_C=\
 	
 NODEP_CPP_PNG_C=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Debug"
@@ -708,7 +708,7 @@ DEP_CPP_PNG_C=\
 	
 NODEP_CPP_PNG_C=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Release"
@@ -720,7 +720,7 @@ DEP_CPP_PNG_C=\
 	
 NODEP_CPP_PNG_C=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Debug"
@@ -732,7 +732,7 @@ DEP_CPP_PNG_C=\
 	
 NODEP_CPP_PNG_C=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Release"
@@ -744,7 +744,7 @@ DEP_CPP_PNG_C=\
 	
 NODEP_CPP_PNG_C=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Debug"
@@ -756,7 +756,7 @@ DEP_CPP_PNG_C=\
 	
 NODEP_CPP_PNG_C=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ENDIF 
@@ -779,14 +779,14 @@ DEP_CPP_PNGER=\
 	
 NODEP_CPP_PNGER=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_PNGER=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -798,8 +798,8 @@ NODEP_CPP_PNGER=\
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH4) Release"
 
 DEP_CPP_PNGER=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -817,7 +817,7 @@ DEP_CPP_PNGER=\
 	
 NODEP_CPP_PNGER=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Release"
@@ -829,7 +829,7 @@ DEP_CPP_PNGER=\
 	
 NODEP_CPP_PNGER=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Debug"
@@ -841,7 +841,7 @@ DEP_CPP_PNGER=\
 	
 NODEP_CPP_PNGER=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Release"
@@ -853,7 +853,7 @@ DEP_CPP_PNGER=\
 	
 NODEP_CPP_PNGER=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Debug"
@@ -865,7 +865,7 @@ DEP_CPP_PNGER=\
 	
 NODEP_CPP_PNGER=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Release"
@@ -877,7 +877,7 @@ DEP_CPP_PNGER=\
 	
 NODEP_CPP_PNGER=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Debug"
@@ -889,7 +889,7 @@ DEP_CPP_PNGER=\
 	
 NODEP_CPP_PNGER=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Release"
@@ -901,7 +901,7 @@ DEP_CPP_PNGER=\
 	
 NODEP_CPP_PNGER=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Debug"
@@ -913,7 +913,7 @@ DEP_CPP_PNGER=\
 	
 NODEP_CPP_PNGER=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Release"
@@ -925,7 +925,7 @@ DEP_CPP_PNGER=\
 	
 NODEP_CPP_PNGER=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Debug"
@@ -937,7 +937,7 @@ DEP_CPP_PNGER=\
 	
 NODEP_CPP_PNGER=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Release"
@@ -949,7 +949,7 @@ DEP_CPP_PNGER=\
 	
 NODEP_CPP_PNGER=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Debug"
@@ -961,7 +961,7 @@ DEP_CPP_PNGER=\
 	
 NODEP_CPP_PNGER=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ENDIF 
@@ -980,14 +980,14 @@ DEP_CPP_PNGGC=\
 	
 NODEP_CPP_PNGGC=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_PNGGC=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -999,8 +999,8 @@ NODEP_CPP_PNGGC=\
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH4) Release"
 
 DEP_CPP_PNGGC=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -1018,7 +1018,7 @@ DEP_CPP_PNGGC=\
 	
 NODEP_CPP_PNGGC=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Release"
@@ -1030,7 +1030,7 @@ DEP_CPP_PNGGC=\
 	
 NODEP_CPP_PNGGC=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Debug"
@@ -1042,7 +1042,7 @@ DEP_CPP_PNGGC=\
 	
 NODEP_CPP_PNGGC=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Release"
@@ -1054,7 +1054,7 @@ DEP_CPP_PNGGC=\
 	
 NODEP_CPP_PNGGC=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Debug"
@@ -1066,7 +1066,7 @@ DEP_CPP_PNGGC=\
 	
 NODEP_CPP_PNGGC=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Release"
@@ -1078,7 +1078,7 @@ DEP_CPP_PNGGC=\
 	
 NODEP_CPP_PNGGC=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Debug"
@@ -1090,7 +1090,7 @@ DEP_CPP_PNGGC=\
 	
 NODEP_CPP_PNGGC=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Release"
@@ -1102,7 +1102,7 @@ DEP_CPP_PNGGC=\
 	
 NODEP_CPP_PNGGC=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Debug"
@@ -1114,7 +1114,7 @@ DEP_CPP_PNGGC=\
 	
 NODEP_CPP_PNGGC=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Release"
@@ -1126,7 +1126,7 @@ DEP_CPP_PNGGC=\
 	
 NODEP_CPP_PNGGC=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Debug"
@@ -1138,7 +1138,7 @@ DEP_CPP_PNGGC=\
 	
 NODEP_CPP_PNGGC=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Release"
@@ -1150,7 +1150,7 @@ DEP_CPP_PNGGC=\
 	
 NODEP_CPP_PNGGC=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Debug"
@@ -1162,7 +1162,7 @@ DEP_CPP_PNGGC=\
 	
 NODEP_CPP_PNGGC=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ENDIF 
@@ -1181,14 +1181,14 @@ DEP_CPP_PNGGE=\
 	
 NODEP_CPP_PNGGE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_PNGGE=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -1200,8 +1200,8 @@ NODEP_CPP_PNGGE=\
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH4) Release"
 
 DEP_CPP_PNGGE=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -1219,7 +1219,7 @@ DEP_CPP_PNGGE=\
 	
 NODEP_CPP_PNGGE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Release"
@@ -1231,7 +1231,7 @@ DEP_CPP_PNGGE=\
 	
 NODEP_CPP_PNGGE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Debug"
@@ -1243,7 +1243,7 @@ DEP_CPP_PNGGE=\
 	
 NODEP_CPP_PNGGE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Release"
@@ -1255,7 +1255,7 @@ DEP_CPP_PNGGE=\
 	
 NODEP_CPP_PNGGE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Debug"
@@ -1267,7 +1267,7 @@ DEP_CPP_PNGGE=\
 	
 NODEP_CPP_PNGGE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Release"
@@ -1279,7 +1279,7 @@ DEP_CPP_PNGGE=\
 	
 NODEP_CPP_PNGGE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Debug"
@@ -1291,7 +1291,7 @@ DEP_CPP_PNGGE=\
 	
 NODEP_CPP_PNGGE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Release"
@@ -1303,7 +1303,7 @@ DEP_CPP_PNGGE=\
 	
 NODEP_CPP_PNGGE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Debug"
@@ -1315,7 +1315,7 @@ DEP_CPP_PNGGE=\
 	
 NODEP_CPP_PNGGE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Release"
@@ -1327,7 +1327,7 @@ DEP_CPP_PNGGE=\
 	
 NODEP_CPP_PNGGE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Debug"
@@ -1339,7 +1339,7 @@ DEP_CPP_PNGGE=\
 	
 NODEP_CPP_PNGGE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Release"
@@ -1351,7 +1351,7 @@ DEP_CPP_PNGGE=\
 	
 NODEP_CPP_PNGGE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Debug"
@@ -1363,7 +1363,7 @@ DEP_CPP_PNGGE=\
 	
 NODEP_CPP_PNGGE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ENDIF 
@@ -1382,14 +1382,14 @@ DEP_CPP_PNGME=\
 	
 NODEP_CPP_PNGME=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_PNGME=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -1401,8 +1401,8 @@ NODEP_CPP_PNGME=\
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH4) Release"
 
 DEP_CPP_PNGME=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -1420,7 +1420,7 @@ DEP_CPP_PNGME=\
 	
 NODEP_CPP_PNGME=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Release"
@@ -1432,7 +1432,7 @@ DEP_CPP_PNGME=\
 	
 NODEP_CPP_PNGME=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Debug"
@@ -1444,7 +1444,7 @@ DEP_CPP_PNGME=\
 	
 NODEP_CPP_PNGME=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Release"
@@ -1456,7 +1456,7 @@ DEP_CPP_PNGME=\
 	
 NODEP_CPP_PNGME=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Debug"
@@ -1468,7 +1468,7 @@ DEP_CPP_PNGME=\
 	
 NODEP_CPP_PNGME=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Release"
@@ -1480,7 +1480,7 @@ DEP_CPP_PNGME=\
 	
 NODEP_CPP_PNGME=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Debug"
@@ -1492,7 +1492,7 @@ DEP_CPP_PNGME=\
 	
 NODEP_CPP_PNGME=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Release"
@@ -1504,7 +1504,7 @@ DEP_CPP_PNGME=\
 	
 NODEP_CPP_PNGME=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Debug"
@@ -1516,7 +1516,7 @@ DEP_CPP_PNGME=\
 	
 NODEP_CPP_PNGME=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Release"
@@ -1528,7 +1528,7 @@ DEP_CPP_PNGME=\
 	
 NODEP_CPP_PNGME=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Debug"
@@ -1540,7 +1540,7 @@ DEP_CPP_PNGME=\
 	
 NODEP_CPP_PNGME=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Release"
@@ -1552,7 +1552,7 @@ DEP_CPP_PNGME=\
 	
 NODEP_CPP_PNGME=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Debug"
@@ -1564,7 +1564,7 @@ DEP_CPP_PNGME=\
 	
 NODEP_CPP_PNGME=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ENDIF 
@@ -1583,14 +1583,14 @@ DEP_CPP_PNGPR=\
 	
 NODEP_CPP_PNGPR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_PNGPR=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -1602,8 +1602,8 @@ NODEP_CPP_PNGPR=\
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH4) Release"
 
 DEP_CPP_PNGPR=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -1621,7 +1621,7 @@ DEP_CPP_PNGPR=\
 	
 NODEP_CPP_PNGPR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Release"
@@ -1633,7 +1633,7 @@ DEP_CPP_PNGPR=\
 	
 NODEP_CPP_PNGPR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Debug"
@@ -1645,7 +1645,7 @@ DEP_CPP_PNGPR=\
 	
 NODEP_CPP_PNGPR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Release"
@@ -1657,7 +1657,7 @@ DEP_CPP_PNGPR=\
 	
 NODEP_CPP_PNGPR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Debug"
@@ -1669,7 +1669,7 @@ DEP_CPP_PNGPR=\
 	
 NODEP_CPP_PNGPR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Release"
@@ -1681,7 +1681,7 @@ DEP_CPP_PNGPR=\
 	
 NODEP_CPP_PNGPR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Debug"
@@ -1693,7 +1693,7 @@ DEP_CPP_PNGPR=\
 	
 NODEP_CPP_PNGPR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Release"
@@ -1705,7 +1705,7 @@ DEP_CPP_PNGPR=\
 	
 NODEP_CPP_PNGPR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Debug"
@@ -1717,7 +1717,7 @@ DEP_CPP_PNGPR=\
 	
 NODEP_CPP_PNGPR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Release"
@@ -1729,7 +1729,7 @@ DEP_CPP_PNGPR=\
 	
 NODEP_CPP_PNGPR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Debug"
@@ -1741,7 +1741,7 @@ DEP_CPP_PNGPR=\
 	
 NODEP_CPP_PNGPR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Release"
@@ -1753,7 +1753,7 @@ DEP_CPP_PNGPR=\
 	
 NODEP_CPP_PNGPR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Debug"
@@ -1765,7 +1765,7 @@ DEP_CPP_PNGPR=\
 	
 NODEP_CPP_PNGPR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ENDIF 
@@ -1784,14 +1784,14 @@ DEP_CPP_PNGRE=\
 	
 NODEP_CPP_PNGRE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_PNGRE=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -1803,8 +1803,8 @@ NODEP_CPP_PNGRE=\
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH4) Release"
 
 DEP_CPP_PNGRE=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -1822,7 +1822,7 @@ DEP_CPP_PNGRE=\
 	
 NODEP_CPP_PNGRE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Release"
@@ -1834,7 +1834,7 @@ DEP_CPP_PNGRE=\
 	
 NODEP_CPP_PNGRE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Debug"
@@ -1846,7 +1846,7 @@ DEP_CPP_PNGRE=\
 	
 NODEP_CPP_PNGRE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Release"
@@ -1858,7 +1858,7 @@ DEP_CPP_PNGRE=\
 	
 NODEP_CPP_PNGRE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Debug"
@@ -1870,7 +1870,7 @@ DEP_CPP_PNGRE=\
 	
 NODEP_CPP_PNGRE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Release"
@@ -1882,7 +1882,7 @@ DEP_CPP_PNGRE=\
 	
 NODEP_CPP_PNGRE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Debug"
@@ -1894,7 +1894,7 @@ DEP_CPP_PNGRE=\
 	
 NODEP_CPP_PNGRE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Release"
@@ -1906,7 +1906,7 @@ DEP_CPP_PNGRE=\
 	
 NODEP_CPP_PNGRE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Debug"
@@ -1918,7 +1918,7 @@ DEP_CPP_PNGRE=\
 	
 NODEP_CPP_PNGRE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Release"
@@ -1930,7 +1930,7 @@ DEP_CPP_PNGRE=\
 	
 NODEP_CPP_PNGRE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Debug"
@@ -1942,7 +1942,7 @@ DEP_CPP_PNGRE=\
 	
 NODEP_CPP_PNGRE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Release"
@@ -1954,7 +1954,7 @@ DEP_CPP_PNGRE=\
 	
 NODEP_CPP_PNGRE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Debug"
@@ -1966,7 +1966,7 @@ DEP_CPP_PNGRE=\
 	
 NODEP_CPP_PNGRE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ENDIF 
@@ -1985,14 +1985,14 @@ DEP_CPP_PNGRI=\
 	
 NODEP_CPP_PNGRI=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_PNGRI=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -2004,8 +2004,8 @@ NODEP_CPP_PNGRI=\
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH4) Release"
 
 DEP_CPP_PNGRI=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -2023,7 +2023,7 @@ DEP_CPP_PNGRI=\
 	
 NODEP_CPP_PNGRI=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Release"
@@ -2035,7 +2035,7 @@ DEP_CPP_PNGRI=\
 	
 NODEP_CPP_PNGRI=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Debug"
@@ -2047,7 +2047,7 @@ DEP_CPP_PNGRI=\
 	
 NODEP_CPP_PNGRI=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Release"
@@ -2059,7 +2059,7 @@ DEP_CPP_PNGRI=\
 	
 NODEP_CPP_PNGRI=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Debug"
@@ -2071,7 +2071,7 @@ DEP_CPP_PNGRI=\
 	
 NODEP_CPP_PNGRI=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Release"
@@ -2083,7 +2083,7 @@ DEP_CPP_PNGRI=\
 	
 NODEP_CPP_PNGRI=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Debug"
@@ -2095,7 +2095,7 @@ DEP_CPP_PNGRI=\
 	
 NODEP_CPP_PNGRI=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Release"
@@ -2107,7 +2107,7 @@ DEP_CPP_PNGRI=\
 	
 NODEP_CPP_PNGRI=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Debug"
@@ -2119,7 +2119,7 @@ DEP_CPP_PNGRI=\
 	
 NODEP_CPP_PNGRI=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Release"
@@ -2131,7 +2131,7 @@ DEP_CPP_PNGRI=\
 	
 NODEP_CPP_PNGRI=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Debug"
@@ -2143,7 +2143,7 @@ DEP_CPP_PNGRI=\
 	
 NODEP_CPP_PNGRI=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Release"
@@ -2155,7 +2155,7 @@ DEP_CPP_PNGRI=\
 	
 NODEP_CPP_PNGRI=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Debug"
@@ -2167,7 +2167,7 @@ DEP_CPP_PNGRI=\
 	
 NODEP_CPP_PNGRI=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ENDIF 
@@ -2186,14 +2186,14 @@ DEP_CPP_PNGRT=\
 	
 NODEP_CPP_PNGRT=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_PNGRT=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -2205,8 +2205,8 @@ NODEP_CPP_PNGRT=\
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH4) Release"
 
 DEP_CPP_PNGRT=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -2224,7 +2224,7 @@ DEP_CPP_PNGRT=\
 	
 NODEP_CPP_PNGRT=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Release"
@@ -2236,7 +2236,7 @@ DEP_CPP_PNGRT=\
 	
 NODEP_CPP_PNGRT=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Debug"
@@ -2248,7 +2248,7 @@ DEP_CPP_PNGRT=\
 	
 NODEP_CPP_PNGRT=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Release"
@@ -2260,7 +2260,7 @@ DEP_CPP_PNGRT=\
 	
 NODEP_CPP_PNGRT=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Debug"
@@ -2272,7 +2272,7 @@ DEP_CPP_PNGRT=\
 	
 NODEP_CPP_PNGRT=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Release"
@@ -2284,7 +2284,7 @@ DEP_CPP_PNGRT=\
 	
 NODEP_CPP_PNGRT=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Debug"
@@ -2296,7 +2296,7 @@ DEP_CPP_PNGRT=\
 	
 NODEP_CPP_PNGRT=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Release"
@@ -2308,7 +2308,7 @@ DEP_CPP_PNGRT=\
 	
 NODEP_CPP_PNGRT=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Debug"
@@ -2320,7 +2320,7 @@ DEP_CPP_PNGRT=\
 	
 NODEP_CPP_PNGRT=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Release"
@@ -2332,7 +2332,7 @@ DEP_CPP_PNGRT=\
 	
 NODEP_CPP_PNGRT=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Debug"
@@ -2344,7 +2344,7 @@ DEP_CPP_PNGRT=\
 	
 NODEP_CPP_PNGRT=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Release"
@@ -2356,7 +2356,7 @@ DEP_CPP_PNGRT=\
 	
 NODEP_CPP_PNGRT=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Debug"
@@ -2368,7 +2368,7 @@ DEP_CPP_PNGRT=\
 	
 NODEP_CPP_PNGRT=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ENDIF 
@@ -2387,14 +2387,14 @@ DEP_CPP_PNGRU=\
 	
 NODEP_CPP_PNGRU=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_PNGRU=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -2406,8 +2406,8 @@ NODEP_CPP_PNGRU=\
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH4) Release"
 
 DEP_CPP_PNGRU=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -2425,7 +2425,7 @@ DEP_CPP_PNGRU=\
 	
 NODEP_CPP_PNGRU=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Release"
@@ -2437,7 +2437,7 @@ DEP_CPP_PNGRU=\
 	
 NODEP_CPP_PNGRU=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Debug"
@@ -2449,7 +2449,7 @@ DEP_CPP_PNGRU=\
 	
 NODEP_CPP_PNGRU=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Release"
@@ -2461,7 +2461,7 @@ DEP_CPP_PNGRU=\
 	
 NODEP_CPP_PNGRU=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Debug"
@@ -2473,7 +2473,7 @@ DEP_CPP_PNGRU=\
 	
 NODEP_CPP_PNGRU=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Release"
@@ -2485,7 +2485,7 @@ DEP_CPP_PNGRU=\
 	
 NODEP_CPP_PNGRU=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Debug"
@@ -2497,7 +2497,7 @@ DEP_CPP_PNGRU=\
 	
 NODEP_CPP_PNGRU=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Release"
@@ -2509,7 +2509,7 @@ DEP_CPP_PNGRU=\
 	
 NODEP_CPP_PNGRU=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Debug"
@@ -2521,7 +2521,7 @@ DEP_CPP_PNGRU=\
 	
 NODEP_CPP_PNGRU=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Release"
@@ -2533,7 +2533,7 @@ DEP_CPP_PNGRU=\
 	
 NODEP_CPP_PNGRU=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Debug"
@@ -2545,7 +2545,7 @@ DEP_CPP_PNGRU=\
 	
 NODEP_CPP_PNGRU=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Release"
@@ -2557,7 +2557,7 @@ DEP_CPP_PNGRU=\
 	
 NODEP_CPP_PNGRU=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Debug"
@@ -2569,7 +2569,7 @@ DEP_CPP_PNGRU=\
 	
 NODEP_CPP_PNGRU=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ENDIF 
@@ -2588,14 +2588,14 @@ DEP_CPP_PNGSE=\
 	
 NODEP_CPP_PNGSE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_PNGSE=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -2607,8 +2607,8 @@ NODEP_CPP_PNGSE=\
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH4) Release"
 
 DEP_CPP_PNGSE=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -2626,7 +2626,7 @@ DEP_CPP_PNGSE=\
 	
 NODEP_CPP_PNGSE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Release"
@@ -2638,7 +2638,7 @@ DEP_CPP_PNGSE=\
 	
 NODEP_CPP_PNGSE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Debug"
@@ -2650,7 +2650,7 @@ DEP_CPP_PNGSE=\
 	
 NODEP_CPP_PNGSE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Release"
@@ -2662,7 +2662,7 @@ DEP_CPP_PNGSE=\
 	
 NODEP_CPP_PNGSE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Debug"
@@ -2674,7 +2674,7 @@ DEP_CPP_PNGSE=\
 	
 NODEP_CPP_PNGSE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Release"
@@ -2686,7 +2686,7 @@ DEP_CPP_PNGSE=\
 	
 NODEP_CPP_PNGSE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Debug"
@@ -2698,7 +2698,7 @@ DEP_CPP_PNGSE=\
 	
 NODEP_CPP_PNGSE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Release"
@@ -2710,7 +2710,7 @@ DEP_CPP_PNGSE=\
 	
 NODEP_CPP_PNGSE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Debug"
@@ -2722,7 +2722,7 @@ DEP_CPP_PNGSE=\
 	
 NODEP_CPP_PNGSE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Release"
@@ -2734,7 +2734,7 @@ DEP_CPP_PNGSE=\
 	
 NODEP_CPP_PNGSE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Debug"
@@ -2746,7 +2746,7 @@ DEP_CPP_PNGSE=\
 	
 NODEP_CPP_PNGSE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Release"
@@ -2758,7 +2758,7 @@ DEP_CPP_PNGSE=\
 	
 NODEP_CPP_PNGSE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Debug"
@@ -2770,7 +2770,7 @@ DEP_CPP_PNGSE=\
 	
 NODEP_CPP_PNGSE=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ENDIF 
@@ -2789,14 +2789,14 @@ DEP_CPP_PNGTR=\
 	
 NODEP_CPP_PNGTR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_PNGTR=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -2808,8 +2808,8 @@ NODEP_CPP_PNGTR=\
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH4) Release"
 
 DEP_CPP_PNGTR=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -2827,7 +2827,7 @@ DEP_CPP_PNGTR=\
 	
 NODEP_CPP_PNGTR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Release"
@@ -2839,7 +2839,7 @@ DEP_CPP_PNGTR=\
 	
 NODEP_CPP_PNGTR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Debug"
@@ -2851,7 +2851,7 @@ DEP_CPP_PNGTR=\
 	
 NODEP_CPP_PNGTR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Release"
@@ -2863,7 +2863,7 @@ DEP_CPP_PNGTR=\
 	
 NODEP_CPP_PNGTR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Debug"
@@ -2875,7 +2875,7 @@ DEP_CPP_PNGTR=\
 	
 NODEP_CPP_PNGTR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Release"
@@ -2887,7 +2887,7 @@ DEP_CPP_PNGTR=\
 	
 NODEP_CPP_PNGTR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Debug"
@@ -2899,7 +2899,7 @@ DEP_CPP_PNGTR=\
 	
 NODEP_CPP_PNGTR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Release"
@@ -2911,7 +2911,7 @@ DEP_CPP_PNGTR=\
 	
 NODEP_CPP_PNGTR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Debug"
@@ -2923,7 +2923,7 @@ DEP_CPP_PNGTR=\
 	
 NODEP_CPP_PNGTR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Release"
@@ -2935,7 +2935,7 @@ DEP_CPP_PNGTR=\
 	
 NODEP_CPP_PNGTR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Debug"
@@ -2947,7 +2947,7 @@ DEP_CPP_PNGTR=\
 	
 NODEP_CPP_PNGTR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Release"
@@ -2959,7 +2959,7 @@ DEP_CPP_PNGTR=\
 	
 NODEP_CPP_PNGTR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Debug"
@@ -2971,7 +2971,7 @@ DEP_CPP_PNGTR=\
 	
 NODEP_CPP_PNGTR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ENDIF 
@@ -2990,14 +2990,14 @@ DEP_CPP_PNGVC=\
 	
 NODEP_CPP_PNGVC=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_PNGVC=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -3009,8 +3009,8 @@ NODEP_CPP_PNGVC=\
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH4) Release"
 
 DEP_CPP_PNGVC=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -3028,7 +3028,7 @@ DEP_CPP_PNGVC=\
 	
 NODEP_CPP_PNGVC=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Release"
@@ -3040,7 +3040,7 @@ DEP_CPP_PNGVC=\
 	
 NODEP_CPP_PNGVC=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Debug"
@@ -3052,7 +3052,7 @@ DEP_CPP_PNGVC=\
 	
 NODEP_CPP_PNGVC=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Release"
@@ -3064,7 +3064,7 @@ DEP_CPP_PNGVC=\
 	
 NODEP_CPP_PNGVC=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Debug"
@@ -3076,7 +3076,7 @@ DEP_CPP_PNGVC=\
 	
 NODEP_CPP_PNGVC=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Release"
@@ -3088,7 +3088,7 @@ DEP_CPP_PNGVC=\
 	
 NODEP_CPP_PNGVC=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Debug"
@@ -3100,7 +3100,7 @@ DEP_CPP_PNGVC=\
 	
 NODEP_CPP_PNGVC=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Release"
@@ -3112,7 +3112,7 @@ DEP_CPP_PNGVC=\
 	
 NODEP_CPP_PNGVC=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Debug"
@@ -3124,7 +3124,7 @@ DEP_CPP_PNGVC=\
 	
 NODEP_CPP_PNGVC=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Release"
@@ -3136,7 +3136,7 @@ DEP_CPP_PNGVC=\
 	
 NODEP_CPP_PNGVC=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Debug"
@@ -3148,7 +3148,7 @@ DEP_CPP_PNGVC=\
 	
 NODEP_CPP_PNGVC=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Release"
@@ -3160,7 +3160,7 @@ DEP_CPP_PNGVC=\
 	
 NODEP_CPP_PNGVC=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Debug"
@@ -3172,7 +3172,7 @@ DEP_CPP_PNGVC=\
 	
 NODEP_CPP_PNGVC=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ENDIF 
@@ -3191,14 +3191,14 @@ DEP_CPP_PNGWI=\
 	
 NODEP_CPP_PNGWI=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_PNGWI=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -3210,8 +3210,8 @@ NODEP_CPP_PNGWI=\
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH4) Release"
 
 DEP_CPP_PNGWI=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -3229,7 +3229,7 @@ DEP_CPP_PNGWI=\
 	
 NODEP_CPP_PNGWI=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Release"
@@ -3241,7 +3241,7 @@ DEP_CPP_PNGWI=\
 	
 NODEP_CPP_PNGWI=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Debug"
@@ -3253,7 +3253,7 @@ DEP_CPP_PNGWI=\
 	
 NODEP_CPP_PNGWI=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Release"
@@ -3265,7 +3265,7 @@ DEP_CPP_PNGWI=\
 	
 NODEP_CPP_PNGWI=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Debug"
@@ -3277,7 +3277,7 @@ DEP_CPP_PNGWI=\
 	
 NODEP_CPP_PNGWI=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Release"
@@ -3289,7 +3289,7 @@ DEP_CPP_PNGWI=\
 	
 NODEP_CPP_PNGWI=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Debug"
@@ -3301,7 +3301,7 @@ DEP_CPP_PNGWI=\
 	
 NODEP_CPP_PNGWI=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Release"
@@ -3313,7 +3313,7 @@ DEP_CPP_PNGWI=\
 	
 NODEP_CPP_PNGWI=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Debug"
@@ -3325,7 +3325,7 @@ DEP_CPP_PNGWI=\
 	
 NODEP_CPP_PNGWI=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Release"
@@ -3337,7 +3337,7 @@ DEP_CPP_PNGWI=\
 	
 NODEP_CPP_PNGWI=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Debug"
@@ -3349,7 +3349,7 @@ DEP_CPP_PNGWI=\
 	
 NODEP_CPP_PNGWI=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Release"
@@ -3361,7 +3361,7 @@ DEP_CPP_PNGWI=\
 	
 NODEP_CPP_PNGWI=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Debug"
@@ -3373,7 +3373,7 @@ DEP_CPP_PNGWI=\
 	
 NODEP_CPP_PNGWI=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ENDIF 
@@ -3392,14 +3392,14 @@ DEP_CPP_PNGWR=\
 	
 NODEP_CPP_PNGWR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_PNGWR=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -3411,8 +3411,8 @@ NODEP_CPP_PNGWR=\
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH4) Release"
 
 DEP_CPP_PNGWR=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -3430,7 +3430,7 @@ DEP_CPP_PNGWR=\
 	
 NODEP_CPP_PNGWR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Release"
@@ -3442,7 +3442,7 @@ DEP_CPP_PNGWR=\
 	
 NODEP_CPP_PNGWR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Debug"
@@ -3454,7 +3454,7 @@ DEP_CPP_PNGWR=\
 	
 NODEP_CPP_PNGWR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Release"
@@ -3466,7 +3466,7 @@ DEP_CPP_PNGWR=\
 	
 NODEP_CPP_PNGWR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Debug"
@@ -3478,7 +3478,7 @@ DEP_CPP_PNGWR=\
 	
 NODEP_CPP_PNGWR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Release"
@@ -3490,7 +3490,7 @@ DEP_CPP_PNGWR=\
 	
 NODEP_CPP_PNGWR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Debug"
@@ -3502,7 +3502,7 @@ DEP_CPP_PNGWR=\
 	
 NODEP_CPP_PNGWR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Release"
@@ -3514,7 +3514,7 @@ DEP_CPP_PNGWR=\
 	
 NODEP_CPP_PNGWR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Debug"
@@ -3526,7 +3526,7 @@ DEP_CPP_PNGWR=\
 	
 NODEP_CPP_PNGWR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Release"
@@ -3538,7 +3538,7 @@ DEP_CPP_PNGWR=\
 	
 NODEP_CPP_PNGWR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Debug"
@@ -3550,7 +3550,7 @@ DEP_CPP_PNGWR=\
 	
 NODEP_CPP_PNGWR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Release"
@@ -3562,7 +3562,7 @@ DEP_CPP_PNGWR=\
 	
 NODEP_CPP_PNGWR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Debug"
@@ -3574,7 +3574,7 @@ DEP_CPP_PNGWR=\
 	
 NODEP_CPP_PNGWR=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ENDIF 
@@ -3593,14 +3593,14 @@ DEP_CPP_PNGWT=\
 	
 NODEP_CPP_PNGWT=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_PNGWT=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -3612,8 +3612,8 @@ NODEP_CPP_PNGWT=\
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH4) Release"
 
 DEP_CPP_PNGWT=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -3631,7 +3631,7 @@ DEP_CPP_PNGWT=\
 	
 NODEP_CPP_PNGWT=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Release"
@@ -3643,7 +3643,7 @@ DEP_CPP_PNGWT=\
 	
 NODEP_CPP_PNGWT=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Debug"
@@ -3655,7 +3655,7 @@ DEP_CPP_PNGWT=\
 	
 NODEP_CPP_PNGWT=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Release"
@@ -3667,7 +3667,7 @@ DEP_CPP_PNGWT=\
 	
 NODEP_CPP_PNGWT=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Debug"
@@ -3679,7 +3679,7 @@ DEP_CPP_PNGWT=\
 	
 NODEP_CPP_PNGWT=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Release"
@@ -3691,7 +3691,7 @@ DEP_CPP_PNGWT=\
 	
 NODEP_CPP_PNGWT=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Debug"
@@ -3703,7 +3703,7 @@ DEP_CPP_PNGWT=\
 	
 NODEP_CPP_PNGWT=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Release"
@@ -3715,7 +3715,7 @@ DEP_CPP_PNGWT=\
 	
 NODEP_CPP_PNGWT=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Debug"
@@ -3727,7 +3727,7 @@ DEP_CPP_PNGWT=\
 	
 NODEP_CPP_PNGWT=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Release"
@@ -3739,7 +3739,7 @@ DEP_CPP_PNGWT=\
 	
 NODEP_CPP_PNGWT=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Debug"
@@ -3751,7 +3751,7 @@ DEP_CPP_PNGWT=\
 	
 NODEP_CPP_PNGWT=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Release"
@@ -3763,7 +3763,7 @@ DEP_CPP_PNGWT=\
 	
 NODEP_CPP_PNGWT=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Debug"
@@ -3775,7 +3775,7 @@ DEP_CPP_PNGWT=\
 	
 NODEP_CPP_PNGWT=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ENDIF 
@@ -3794,14 +3794,14 @@ DEP_CPP_PNGWU=\
 	
 NODEP_CPP_PNGWU=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_PNGWU=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -3813,8 +3813,8 @@ NODEP_CPP_PNGWU=\
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH4) Release"
 
 DEP_CPP_PNGWU=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	"..\png.h"\
 	"..\pngasmrd.h"\
 	"..\pngconf.h"\
@@ -3832,7 +3832,7 @@ DEP_CPP_PNGWU=\
 	
 NODEP_CPP_PNGWU=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Release"
@@ -3844,7 +3844,7 @@ DEP_CPP_PNGWU=\
 	
 NODEP_CPP_PNGWU=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE SH3) Debug"
@@ -3856,7 +3856,7 @@ DEP_CPP_PNGWU=\
 	
 NODEP_CPP_PNGWU=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Release"
@@ -3868,7 +3868,7 @@ DEP_CPP_PNGWU=\
 	
 NODEP_CPP_PNGWU=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE ARM) Debug"
@@ -3880,7 +3880,7 @@ DEP_CPP_PNGWU=\
 	
 NODEP_CPP_PNGWU=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Release"
@@ -3892,7 +3892,7 @@ DEP_CPP_PNGWU=\
 	
 NODEP_CPP_PNGWU=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE MIPSFP) Debug"
@@ -3904,7 +3904,7 @@ DEP_CPP_PNGWU=\
 	
 NODEP_CPP_PNGWU=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Release"
@@ -3916,7 +3916,7 @@ DEP_CPP_PNGWU=\
 	
 NODEP_CPP_PNGWU=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86) Debug"
@@ -3928,7 +3928,7 @@ DEP_CPP_PNGWU=\
 	
 NODEP_CPP_PNGWU=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Release"
@@ -3940,7 +3940,7 @@ DEP_CPP_PNGWU=\
 	
 NODEP_CPP_PNGWU=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE x86em) Debug"
@@ -3952,7 +3952,7 @@ DEP_CPP_PNGWU=\
 	
 NODEP_CPP_PNGWU=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Release"
@@ -3964,7 +3964,7 @@ DEP_CPP_PNGWU=\
 	
 NODEP_CPP_PNGWU=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "lpngce - Win32 (WCE PPC) Debug"
@@ -3976,7 +3976,7 @@ DEP_CPP_PNGWU=\
 	
 NODEP_CPP_PNGWU=\
 	"..\alloc.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ENDIF 
diff --git a/wince/pngtest.dsp b/wince/pngtest.dsp
new file mode 100644
index 000000000..38266c779
--- /dev/null
+++ b/wince/pngtest.dsp
@@ -0,0 +1,828 @@
+# Microsoft Developer Studio Project File - Name="pngtest" - Package Owner=<4>
+# Microsoft Developer Studio Generated Build File, Format Version 6.00
+# ** DO NOT EDIT **
+
+# TARGTYPE "Win32 (WCE x86) Application" 0x8301
+# TARGTYPE "Win32 (WCE ARM) Application" 0x8501
+# TARGTYPE "Win32 (WCE PPC) Application" 0x8401
+# TARGTYPE "Win32 (WCE x86em) Application" 0x7f01
+# TARGTYPE "Win32 (WCE SH3) Application" 0x8101
+# TARGTYPE "Win32 (WCE SH4) Application" 0x8601
+# TARGTYPE "Win32 (WCE MIPS) Application" 0x8201
+# TARGTYPE "Win32 (WCE MIPSFP) Application" 0x8701
+
+CFG=pngtest - Win32 (WCE MIPS) Debug
+!MESSAGE This is not a valid makefile. To build this project using NMAKE,
+!MESSAGE use the Export Makefile command and run
+!MESSAGE 
+!MESSAGE NMAKE /f "pngtest.mak".
+!MESSAGE 
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE 
+!MESSAGE NMAKE /f "pngtest.mak" CFG="pngtest - Win32 (WCE MIPS) Debug"
+!MESSAGE 
+!MESSAGE Possible choices for configuration are:
+!MESSAGE 
+!MESSAGE "pngtest - Win32 (WCE MIPS) Release" (based on "Win32 (WCE MIPS) Application")
+!MESSAGE "pngtest - Win32 (WCE MIPS) Debug" (based on "Win32 (WCE MIPS) Application")
+!MESSAGE "pngtest - Win32 (WCE SH4) Release" (based on "Win32 (WCE SH4) Application")
+!MESSAGE "pngtest - Win32 (WCE SH4) Debug" (based on "Win32 (WCE SH4) Application")
+!MESSAGE "pngtest - Win32 (WCE SH3) Release" (based on "Win32 (WCE SH3) Application")
+!MESSAGE "pngtest - Win32 (WCE SH3) Debug" (based on "Win32 (WCE SH3) Application")
+!MESSAGE "pngtest - Win32 (WCE ARM) Release" (based on "Win32 (WCE ARM) Application")
+!MESSAGE "pngtest - Win32 (WCE ARM) Debug" (based on "Win32 (WCE ARM) Application")
+!MESSAGE "pngtest - Win32 (WCE MIPSFP) Release" (based on "Win32 (WCE MIPSFP) Application")
+!MESSAGE "pngtest - Win32 (WCE MIPSFP) Debug" (based on "Win32 (WCE MIPSFP) Application")
+!MESSAGE "pngtest - Win32 (WCE x86) Release" (based on "Win32 (WCE x86) Application")
+!MESSAGE "pngtest - Win32 (WCE x86) Debug" (based on "Win32 (WCE x86) Application")
+!MESSAGE "pngtest - Win32 (WCE x86em) Release" (based on "Win32 (WCE x86em) Application")
+!MESSAGE "pngtest - Win32 (WCE x86em) Debug" (based on "Win32 (WCE x86em) Application")
+!MESSAGE "pngtest - Win32 (WCE PPC) Release" (based on "Win32 (WCE PPC) Application")
+!MESSAGE "pngtest - Win32 (WCE PPC) Debug" (based on "Win32 (WCE PPC) Application")
+!MESSAGE 
+
+# Begin Project
+# PROP AllowPerConfigDependencies 0
+# PROP Scc_ProjName ""
+# PROP Scc_LocalPath "H/PC Pro 2.11"
+# PROP WCE_FormatVersion "6.0"
+
+!IF  "$(CFG)" == "pngtest - Win32 (WCE MIPS) Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "WMIPSRel"
+# PROP BASE Intermediate_Dir "WMIPSRel"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "WMIPSRel"
+# PROP Intermediate_Dir "WMIPSRel"
+# PROP Target_Dir ""
+CPP=clmips.exe
+# ADD BASE CPP /nologo /M$(CECrt) /W3 /O2 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /YX /QMRWCE /c
+# ADD CPP /nologo /M$(CECrt) /W3 /O2 /I ".." /I "..\..\zlib" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_USE_DLL" /QMRWCE /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
+# ADD RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib
+# ADD LINK32 commctrl.lib coredll.lib /nologo /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
+# SUBTRACT LINK32 /pdb:none /nodefaultlib
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE MIPS) Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "WMIPSDbg"
+# PROP BASE Intermediate_Dir "WMIPSDbg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "WMIPSDbg"
+# PROP Intermediate_Dir "WMIPSDbg"
+# PROP Target_Dir ""
+CPP=clmips.exe
+# ADD BASE CPP /nologo /M$(CECrtDebug) /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /YX /QMRWCE /c
+# ADD CPP /nologo /M$(CECrtDebug) /W3 /Zi /Od /I ".." /I "..\..\zlib" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_USE_DLL" /QMRWCE /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
+# ADD RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib
+# ADD LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
+# SUBTRACT LINK32 /pdb:none /nodefaultlib
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE SH4) Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "WCESH4Rel"
+# PROP BASE Intermediate_Dir "WCESH4Rel"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "WCESH4Rel"
+# PROP Intermediate_Dir "WCESH4Rel"
+# PROP Target_Dir ""
+CPP=shcl.exe
+# ADD BASE CPP /nologo /Qsh4 /MC /W3 /O2 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /YX /c
+# ADD CPP /nologo /Qsh4 /MC /W3 /O2 /I ".." /I "..\..\zlib" /D "NDEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_USE_DLL" /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x411 /r /d "SHx" /d "SH4" /d "_SH4_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
+# ADD RSC /l 0x411 /r /d "SHx" /d "SH4" /d "_SH4_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /machine:SH4 /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib
+# ADD LINK32 commctrl.lib coredll.lib /nologo /machine:SH4 /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
+# SUBTRACT LINK32 /pdb:none /nodefaultlib
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE SH4) Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "WCESH4Dbg"
+# PROP BASE Intermediate_Dir "WCESH4Dbg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "WCESH4Dbg"
+# PROP Intermediate_Dir "WCESH4Dbg"
+# PROP Target_Dir ""
+CPP=shcl.exe
+# ADD BASE CPP /nologo /Qsh4 /MC /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /YX /c
+# ADD CPP /nologo /Qsh4 /MC /W3 /Zi /Od /I ".." /I "..\..\zlib" /D "DEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_USE_DLL" /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x411 /r /d "SHx" /d "SH4" /d "_SH4_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
+# ADD RSC /l 0x411 /r /d "SHx" /d "SH4" /d "_SH4_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH4 /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib
+# ADD LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH4 /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
+# SUBTRACT LINK32 /pdb:none /nodefaultlib
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE SH3) Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "WCESH3Rel"
+# PROP BASE Intermediate_Dir "WCESH3Rel"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "WCESH3Rel"
+# PROP Intermediate_Dir "WCESH3Rel"
+# PROP Target_Dir ""
+CPP=shcl.exe
+# ADD BASE CPP /nologo /M$(CECrt) /W3 /O2 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /YX /c
+# ADD CPP /nologo /M$(CECrt) /W3 /O2 /I ".." /I "..\..\zlib" /D "NDEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_USE_DLL" /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x411 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
+# ADD RSC /l 0x411 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib
+# ADD LINK32 commctrl.lib coredll.lib /nologo /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
+# SUBTRACT LINK32 /pdb:none /nodefaultlib
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE SH3) Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "WCESH3Dbg"
+# PROP BASE Intermediate_Dir "WCESH3Dbg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "WCESH3Dbg"
+# PROP Intermediate_Dir "WCESH3Dbg"
+# PROP Target_Dir ""
+CPP=shcl.exe
+# ADD BASE CPP /nologo /M$(CECrtDebug) /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /YX /c
+# ADD CPP /nologo /M$(CECrtDebug) /W3 /Zi /Od /I ".." /I "..\..\zlib" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_USE_DLL" /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x411 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
+# ADD RSC /l 0x411 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib
+# ADD LINK32 commctrl.lib coredll.lib /nologo /debug /machine:SH3 /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
+# SUBTRACT LINK32 /pdb:none /nodefaultlib
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE ARM) Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "WCEARMRel"
+# PROP BASE Intermediate_Dir "WCEARMRel"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "WCEARMRel"
+# PROP Intermediate_Dir "WCEARMRel"
+# PROP Target_Dir ""
+CPP=clarm.exe
+# ADD BASE CPP /nologo /MC /W3 /O2 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /YX /c
+# ADD CPP /nologo /MC /W3 /O2 /I ".." /I "..\..\zlib" /D "NDEBUG" /D "ARM" /D "_ARM_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_USE_DLL" /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x411 /r /d "ARM" /d "_ARM_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
+# ADD RSC /l 0x411 /r /d "ARM" /d "_ARM_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 coredll.lib commctrl.lib /nologo /machine:ARM /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib
+# ADD LINK32 coredll.lib commctrl.lib /nologo /machine:ARM /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
+# SUBTRACT LINK32 /pdb:none /nodefaultlib
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE ARM) Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "WCEARMDbg"
+# PROP BASE Intermediate_Dir "WCEARMDbg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "WCEARMDbg"
+# PROP Intermediate_Dir "WCEARMDbg"
+# PROP Target_Dir ""
+CPP=clarm.exe
+# ADD BASE CPP /nologo /MC /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /YX /c
+# ADD CPP /nologo /MC /W3 /Zi /Od /I ".." /I "..\..\zlib" /D "DEBUG" /D "ARM" /D "_ARM_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_USE_DLL" /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x411 /r /d "ARM" /d "_ARM_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
+# ADD RSC /l 0x411 /r /d "ARM" /d "_ARM_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 coredll.lib commctrl.lib /nologo /debug /machine:ARM /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib
+# ADD LINK32 coredll.lib commctrl.lib /nologo /debug /machine:ARM /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
+# SUBTRACT LINK32 /pdb:none /nodefaultlib
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE MIPSFP) Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "WMIPSFPRel"
+# PROP BASE Intermediate_Dir "WMIPSFPRel"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "WMIPSFPRel"
+# PROP Intermediate_Dir "WMIPSFPRel"
+# PROP Target_Dir ""
+CPP=clmips.exe
+# ADD BASE CPP /nologo /QMFWCE /MC /W3 /O2 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /YX /c
+# ADD CPP /nologo /QMFWCE /MC /W3 /O2 /I ".." /I "..\..\zlib" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_USE_DLL" /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
+# ADD RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib
+# ADD LINK32 commctrl.lib coredll.lib /nologo /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
+# SUBTRACT LINK32 /pdb:none /nodefaultlib
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE MIPSFP) Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "WMIPSFPDbg"
+# PROP BASE Intermediate_Dir "WMIPSFPDbg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "WMIPSFPDbg"
+# PROP Intermediate_Dir "WMIPSFPDbg"
+# PROP Target_Dir ""
+CPP=clmips.exe
+# ADD BASE CPP /nologo /QMFWCE /MC /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /YX /c
+# ADD CPP /nologo /QMFWCE /MC /W3 /Zi /Od /I ".." /I "..\..\zlib" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_USE_DLL" /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
+# ADD RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib
+# ADD LINK32 commctrl.lib coredll.lib /nologo /debug /machine:MIPS /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
+# SUBTRACT LINK32 /pdb:none /nodefaultlib
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE x86) Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "WCEX86Rel"
+# PROP BASE Intermediate_Dir "WCEX86Rel"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "WCEX86Rel"
+# PROP Intermediate_Dir "WCEX86Rel"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /ML /W3 /O2 /D "x86" /D "_i386_" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "NDEBUG" /D "i_386_" /D "_MBCS" /Gs8192 /GF /c
+# ADD CPP /nologo /ML /W3 /O2 /I ".." /I "..\..\zlib" /D "x86" /D "_i386_" /D "_x86_" /D "NDEBUG" /D "i_386_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_USE_DLL" /Gs8192 /GF /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x411 /r /d "x86" /d "_i386_" /d "_x86_" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "NDEBUG"
+# ADD RSC /l 0x411 /r /d "x86" /d "_i386_" /d "_x86_" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "NDEBUG"
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib /nologo /machine:IX86 /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib
+# ADD LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib /nologo /machine:IX86 /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
+# SUBTRACT LINK32 /pdb:none /nodefaultlib
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE x86) Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "WCEX86Dbg"
+# PROP BASE Intermediate_Dir "WCEX86Dbg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "WCEX86Dbg"
+# PROP Intermediate_Dir "WCEX86Dbg"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MLd /W3 /Zi /Od /D "x86" /D "_i386_" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "DEBUG" /D "i_386_" /D "_MBCS" /Gs8192 /GF /c
+# ADD CPP /nologo /MLd /W3 /Zi /Od /I ".." /I "..\..\zlib" /D "x86" /D "_i386_" /D "_x86_" /D "DEBUG" /D "i_386_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_USE_DLL" /Gs8192 /GF /c
+RSC=rc.exe
+# ADD BASE RSC /l 0x411 /r /d "x86" /d "_i386_" /d "_x86_" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "DEBUG"
+# ADD RSC /l 0x411 /r /d "x86" /d "_i386_" /d "_x86_" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "DEBUG"
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib /nologo /debug /machine:IX86 /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib
+# ADD LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib /nologo /debug /machine:IX86 /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
+# SUBTRACT LINK32 /pdb:none /nodefaultlib
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE x86em) Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "x86emRel"
+# PROP BASE Intermediate_Dir "x86emRel"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "x86emRel"
+# PROP Intermediate_Dir "x86emRel"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /ML /W3 /O2 /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "NDEBUG" /D "x86" /D "i486" /D "_x86_" /D "_MBCS" /YX /c
+# ADD CPP /nologo /ML /W3 /O2 /I ".." /I "..\..\zlib" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "NDEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_USE_DLL" /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x411 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "NDEBUG"
+# ADD RSC /l 0x411 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "NDEBUG"
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib /nologo /stack:0x10000,0x1000 /subsystem:windows /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /windowsce:emulation
+# ADD LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib /nologo /stack:0x10000,0x1000 /subsystem:windows /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /windowsce:emulation
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE x86em) Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "x86emDbg"
+# PROP BASE Intermediate_Dir "x86emDbg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "x86emDbg"
+# PROP Intermediate_Dir "x86emDbg"
+# PROP Target_Dir ""
+CPP=cl.exe
+# ADD BASE CPP /nologo /MLd /W3 /Gm /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D "_MBCS" /YX /c
+# ADD CPP /nologo /MLd /W3 /Gm /Zi /Od /I ".." /I "..\..\zlib" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_USE_DLL" /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x411 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"
+# ADD RSC /l 0x411 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib /nologo /stack:0x10000,0x1000 /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /windowsce:emulation
+# ADD LINK32 $(CEx86Corelibc) commctrl.lib coredll.lib /nologo /stack:0x10000,0x1000 /subsystem:windows /debug /machine:I386 /nodefaultlib:"$(CENoDefaultLib)" /windowsce:emulation
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE PPC) Release"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 0
+# PROP BASE Output_Dir "WCEPPCRel"
+# PROP BASE Intermediate_Dir "WCEPPCRel"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 0
+# PROP Output_Dir "WCEPPCRel"
+# PROP Intermediate_Dir "WCEPPCRel"
+# PROP Target_Dir ""
+CPP=clppc.exe
+# ADD BASE CPP /nologo /M$(CECrt) /W3 /O2 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "PPC" /D "_PPC_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /YX /c
+# ADD CPP /nologo /M$(CECrt) /W3 /O2 /I ".." /I "..\..\zlib" /D "NDEBUG" /D "PPC" /D "_PPC_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_USE_DLL" /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x411 /r /d "ppc" /d "_ppc_" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "NDEBUG"
+# ADD RSC /l 0x411 /r /d "ppc" /d "_ppc_" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "NDEBUG"
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /machine:PPC /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib
+# ADD LINK32 commctrl.lib coredll.lib /nologo /machine:PPC /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
+# SUBTRACT LINK32 /pdb:none /nodefaultlib
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE PPC) Debug"
+
+# PROP BASE Use_MFC 0
+# PROP BASE Use_Debug_Libraries 1
+# PROP BASE Output_Dir "WCEPPCDbg"
+# PROP BASE Intermediate_Dir "WCEPPCDbg"
+# PROP BASE Target_Dir ""
+# PROP Use_MFC 0
+# PROP Use_Debug_Libraries 1
+# PROP Output_Dir "WCEPPCDbg"
+# PROP Intermediate_Dir "WCEPPCDbg"
+# PROP Target_Dir ""
+CPP=clppc.exe
+# ADD BASE CPP /nologo /M$(CECrtDebug) /W3 /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "PPC" /D "_PPC_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /YX /c
+# ADD CPP /nologo /M$(CECrtDebug) /W3 /Zi /Od /I ".." /I "..\..\zlib" /D "DEBUG" /D "PPC" /D "_PPC_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "PNG_USE_DLL" /c
+# SUBTRACT CPP /YX
+RSC=rc.exe
+# ADD BASE RSC /l 0x411 /r /d "ppc" /d "_ppc_" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "DEBUG"
+# ADD RSC /l 0x411 /r /d "ppc" /d "_ppc_" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "DEBUG"
+MTL=midl.exe
+# ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
+BSC32=bscmake.exe
+# ADD BASE BSC32 /nologo
+# ADD BSC32 /nologo
+LINK32=link.exe
+# ADD BASE LINK32 commctrl.lib coredll.lib /nologo /debug /machine:PPC /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
+# SUBTRACT BASE LINK32 /pdb:none /nodefaultlib
+# ADD LINK32 commctrl.lib coredll.lib /nologo /debug /machine:PPC /nodefaultlib:"$(CENoDefaultLib)" /subsystem:$(CESubsystem) /STACK:65536,4096
+# SUBTRACT LINK32 /pdb:none /nodefaultlib
+
+!ENDIF 
+
+# Begin Target
+
+# Name "pngtest - Win32 (WCE MIPS) Release"
+# Name "pngtest - Win32 (WCE MIPS) Debug"
+# Name "pngtest - Win32 (WCE SH4) Release"
+# Name "pngtest - Win32 (WCE SH4) Debug"
+# Name "pngtest - Win32 (WCE SH3) Release"
+# Name "pngtest - Win32 (WCE SH3) Debug"
+# Name "pngtest - Win32 (WCE ARM) Release"
+# Name "pngtest - Win32 (WCE ARM) Debug"
+# Name "pngtest - Win32 (WCE MIPSFP) Release"
+# Name "pngtest - Win32 (WCE MIPSFP) Debug"
+# Name "pngtest - Win32 (WCE x86) Release"
+# Name "pngtest - Win32 (WCE x86) Debug"
+# Name "pngtest - Win32 (WCE x86em) Release"
+# Name "pngtest - Win32 (WCE x86em) Debug"
+# Name "pngtest - Win32 (WCE PPC) Release"
+# Name "pngtest - Win32 (WCE PPC) Debug"
+# Begin Group "Source Files"
+
+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+# Begin Source File
+
+SOURCE=..\pngtest.c
+
+!IF  "$(CFG)" == "pngtest - Win32 (WCE MIPS) Release"
+
+DEP_CPP_PNGTE=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\png.h"\
+	"..\pngasmrd.h"\
+	"..\pngconf.h"\
+	
+NODEP_CPP_PNGTE=\
+	"..\alloc.h"\
+	
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE MIPS) Debug"
+
+DEP_CPP_PNGTE=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\png.h"\
+	"..\pngasmrd.h"\
+	"..\pngconf.h"\
+	
+NODEP_CPP_PNGTE=\
+	"..\alloc.h"\
+	
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE SH4) Release"
+
+DEP_CPP_PNGTE=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\png.h"\
+	"..\pngasmrd.h"\
+	"..\pngconf.h"\
+	
+NODEP_CPP_PNGTE=\
+	"..\alloc.h"\
+	
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE SH4) Debug"
+
+DEP_CPP_PNGTE=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\png.h"\
+	"..\pngasmrd.h"\
+	"..\pngconf.h"\
+	
+NODEP_CPP_PNGTE=\
+	"..\alloc.h"\
+	
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE SH3) Release"
+
+DEP_CPP_PNGTE=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\png.h"\
+	"..\pngasmrd.h"\
+	"..\pngconf.h"\
+	
+NODEP_CPP_PNGTE=\
+	"..\alloc.h"\
+	
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE SH3) Debug"
+
+DEP_CPP_PNGTE=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\png.h"\
+	"..\pngasmrd.h"\
+	"..\pngconf.h"\
+	
+NODEP_CPP_PNGTE=\
+	"..\alloc.h"\
+	
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE ARM) Release"
+
+DEP_CPP_PNGTE=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\png.h"\
+	"..\pngasmrd.h"\
+	"..\pngconf.h"\
+	
+NODEP_CPP_PNGTE=\
+	"..\alloc.h"\
+	
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE ARM) Debug"
+
+DEP_CPP_PNGTE=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\png.h"\
+	"..\pngasmrd.h"\
+	"..\pngconf.h"\
+	
+NODEP_CPP_PNGTE=\
+	"..\alloc.h"\
+	
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE MIPSFP) Release"
+
+DEP_CPP_PNGTE=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\png.h"\
+	"..\pngasmrd.h"\
+	"..\pngconf.h"\
+	
+NODEP_CPP_PNGTE=\
+	"..\alloc.h"\
+	
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE MIPSFP) Debug"
+
+DEP_CPP_PNGTE=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\png.h"\
+	"..\pngasmrd.h"\
+	"..\pngconf.h"\
+	
+NODEP_CPP_PNGTE=\
+	"..\alloc.h"\
+	
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE x86) Release"
+
+DEP_CPP_PNGTE=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\png.h"\
+	"..\pngasmrd.h"\
+	"..\pngconf.h"\
+	
+NODEP_CPP_PNGTE=\
+	"..\alloc.h"\
+	
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE x86) Debug"
+
+DEP_CPP_PNGTE=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\png.h"\
+	"..\pngasmrd.h"\
+	"..\pngconf.h"\
+	
+NODEP_CPP_PNGTE=\
+	"..\alloc.h"\
+	
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE x86em) Release"
+
+DEP_CPP_PNGTE=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\png.h"\
+	"..\pngasmrd.h"\
+	"..\pngconf.h"\
+	
+NODEP_CPP_PNGTE=\
+	"..\alloc.h"\
+	
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE x86em) Debug"
+
+DEP_CPP_PNGTE=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\png.h"\
+	"..\pngasmrd.h"\
+	"..\pngconf.h"\
+	
+NODEP_CPP_PNGTE=\
+	"..\alloc.h"\
+	
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE PPC) Release"
+
+DEP_CPP_PNGTE=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\png.h"\
+	"..\pngasmrd.h"\
+	"..\pngconf.h"\
+	
+NODEP_CPP_PNGTE=\
+	"..\alloc.h"\
+	
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE PPC) Debug"
+
+DEP_CPP_PNGTE=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\png.h"\
+	"..\pngasmrd.h"\
+	"..\pngconf.h"\
+	
+NODEP_CPP_PNGTE=\
+	"..\alloc.h"\
+	
+
+!ENDIF 
+
+# End Source File
+# Begin Source File
+
+SOURCE=.\winmain.c
+
+!IF  "$(CFG)" == "pngtest - Win32 (WCE MIPS) Release"
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE MIPS) Debug"
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE SH4) Release"
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE SH4) Debug"
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE SH3) Release"
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE SH3) Debug"
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE ARM) Release"
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE ARM) Debug"
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE MIPSFP) Release"
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE MIPSFP) Debug"
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE x86) Release"
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE x86) Debug"
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE x86em) Release"
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE x86em) Debug"
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE PPC) Release"
+
+!ELSEIF  "$(CFG)" == "pngtest - Win32 (WCE PPC) Debug"
+
+!ENDIF 
+
+# End Source File
+# End Group
+# Begin Group "Header Files"
+
+# PROP Default_Filter "h;hpp;hxx;hm;inl"
+# End Group
+# Begin Group "Resource Files"
+
+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+# End Group
+# End Target
+# End Project
diff --git a/wince/pngtest.dsw b/wince/pngtest.dsw
new file mode 100644
index 000000000..ffcd0d6d7
--- /dev/null
+++ b/wince/pngtest.dsw
@@ -0,0 +1,59 @@
+Microsoft Developer Studio Workspace File, Format Version 6.00
+# WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE!
+
+###############################################################################
+
+Project: "lpngce"=.\lpngce.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name zlibce
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "pngtest"=.\pngtest.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+    Begin Project Dependency
+    Project_Dep_Name lpngce
+    End Project Dependency
+}}}
+
+###############################################################################
+
+Project: "zlibce"=.\zlibce.dsp - Package Owner=<4>
+
+Package=<5>
+{{{
+}}}
+
+Package=<4>
+{{{
+}}}
+
+###############################################################################
+
+Global:
+
+Package=<5>
+{{{
+}}}
+
+Package=<3>
+{{{
+}}}
+
+###############################################################################
+
diff --git a/wince/winmain.c b/wince/winmain.c
new file mode 100644
index 000000000..2c690e269
--- /dev/null
+++ b/wince/winmain.c
@@ -0,0 +1,86 @@
+
+/* winmain.c - a simple entry point for WindowsCE
+ *
+ * Copyright (c) 2000 Tenik Co.,Ltd.
+ */
+
+#include <windows.h>
+#include <tchar.h>
+
+extern int main(int argc, char *argv[]);
+
+int WINAPI WinMain(HINSTANCE hInst, HINSTANCE hPrevInst, LPWSTR lpszCmdLine, int nCmdShow)
+{
+#define SIZE_ARGV   (32)
+
+    TCHAR path[MAX_PATH];
+    LPTSTR file;
+    char prog[MAX_PATH];
+    int argc;
+    char *argv[SIZE_ARGV];
+    int size;
+    char *buff;
+    char *argp;
+    char *args;
+    char quote;
+
+    // get program name
+    argc = 0;
+    GetModuleFileName(GetCurrentProcess(), path, MAX_PATH);
+    file = _tcsrchr(path, TEXT('\\'));
+    if (NULL == file) {
+        file = path;
+    }
+    else {
+        file++;
+    }
+    WideCharToMultiByte(CP_ACP, 0, file, -1, prog, MAX_PATH, NULL, NULL);
+    argv[argc++] = prog;
+
+    // analyze parameters
+    size = WideCharToMultiByte(CP_ACP, 0, lpszCmdLine, -1, NULL, 0, NULL, NULL);
+    buff = (char *)malloc(size);
+    size = WideCharToMultiByte(CP_ACP, 0, lpszCmdLine, -1, buff, size, NULL, NULL);
+    quote = 0x00;
+    args = argp = buff;
+    if (argp && *argp && size) {
+        argv[argc++] = args;
+        while (*argp) {
+            if (quote) {
+                if (*argp == quote) {
+                    argp++;
+                    if (*argp != quote) {
+                        quote = 0x00;
+                    }
+                    else {
+                        *args++ = *argp++;
+                    }
+                }
+                else {
+                    *args++ = *argp++;
+                }
+            }
+            else {
+                if (*argp == ' ') {
+                    *args++ = *argp++ = '\0';
+                    while (*argp && *argp == ' ') {
+                        argp++;
+                    }
+                    if (*argp && argc < SIZE_ARGV) {
+                        argv[argc++] = args;
+                    }
+                }
+                else {
+                    if (*argp == '\"') {
+                        quote = *argp++;
+                    }
+                    else {
+                        *args++ = *argp++;
+                    }
+                }
+            }
+        }
+    }
+    *args = '\0';
+    return main(argc, argv);
+}
diff --git a/wince/zlibce.dsp b/wince/zlibce.dsp
index 5119347d7..a86ca5c12 100644
--- a/wince/zlibce.dsp
+++ b/wince/zlibce.dsp
@@ -62,7 +62,7 @@ CFG=zlibce - Win32 (WCE MIPS) Debug
 # PROP Target_Dir ""
 CPP=clmips.exe
 # ADD BASE CPP /nologo /M$(CECrt) /W3 /GX- /O2 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "_USRDLL" /D "ZLIBCE_EXPORTS" /YX /QMRWCE  /c
-# ADD CPP /nologo /M$(CECrt) /W3 /GX- /O2 /I "..\..\zlibce" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /QMRWCE  /c
+# ADD CPP /nologo /M$(CECrt) /W3 /GX- /O2 /I "..\..\zlib" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /QMRWCE  /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
@@ -93,7 +93,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=clmips.exe
 # ADD BASE CPP /nologo /M$(CECrtDebug) /W3 /GX- /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "_USRDLL" /D "ZLIBCE_EXPORTS" /YX /QMRWCE  /c
-# ADD CPP /nologo /M$(CECrtDebug) /W3 /GX- /Zi /Od /I "..\..\zlibce" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /QMRWCE  /c
+# ADD CPP /nologo /M$(CECrtDebug) /W3 /GX- /Zi /Od /I "..\..\zlib" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /QMRWCE  /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
@@ -124,7 +124,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=shcl.exe
 # ADD BASE CPP /nologo /Qsh4 /MC /W3 /GX- /O2 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "_USRDLL" /D "ZLIBCE_EXPORTS" /YX /c
-# ADD CPP /nologo /Qsh4 /MC /W3 /GX- /O2 /I "..\..\zlibce" /D "NDEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /c
+# ADD CPP /nologo /Qsh4 /MC /W3 /GX- /O2 /I "..\..\zlib" /D "NDEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /r /d "SHx" /d "SH4" /d "_SH4_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
@@ -155,7 +155,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=shcl.exe
 # ADD BASE CPP /nologo /Qsh4 /MC /W3 /GX- /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "_USRDLL" /D "ZLIBCE_EXPORTS" /YX /c
-# ADD CPP /nologo /Qsh4 /MC /W3 /GX- /Zi /Od /I "..\..\zlibce" /D "DEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /c
+# ADD CPP /nologo /Qsh4 /MC /W3 /GX- /Zi /Od /I "..\..\zlib" /D "DEBUG" /D "SHx" /D "SH4" /D "_SH4_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /r /d "SHx" /d "SH4" /d "_SH4_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
@@ -186,7 +186,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=shcl.exe
 # ADD BASE CPP /nologo /M$(CECrt) /W3 /GX- /O2 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "_USRDLL" /D "ZLIBCE_EXPORTS" /YX /c
-# ADD CPP /nologo /M$(CECrt) /W3 /GX- /O2 /I "..\..\zlibce" /D "NDEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /c
+# ADD CPP /nologo /M$(CECrt) /W3 /GX- /O2 /I "..\..\zlib" /D "NDEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
@@ -217,7 +217,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=shcl.exe
 # ADD BASE CPP /nologo /M$(CECrtDebug) /W3 /GX- /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "_USRDLL" /D "ZLIBCE_EXPORTS" /YX /c
-# ADD CPP /nologo /M$(CECrtDebug) /W3 /GX- /Zi /Od /I "..\..\zlibce" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /c
+# ADD CPP /nologo /M$(CECrtDebug) /W3 /GX- /Zi /Od /I "..\..\zlib" /D "DEBUG" /D "SHx" /D "SH3" /D "_SH3_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /r /d "SHx" /d "SH3" /d "_SH3_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
@@ -248,7 +248,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=clarm.exe
 # ADD BASE CPP /nologo /MC /W3 /GX- /O2 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "_USRDLL" /D "ZLIBCE_EXPORTS" /YX /c
-# ADD CPP /nologo /MC /W3 /GX- /O2 /I "..\..\zlibce" /D "NDEBUG" /D "ARM" /D "_ARM_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /c
+# ADD CPP /nologo /MC /W3 /GX- /O2 /I "..\..\zlib" /D "NDEBUG" /D "ARM" /D "_ARM_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /r /d "ARM" /d "_ARM_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
@@ -279,7 +279,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=clarm.exe
 # ADD BASE CPP /nologo /MC /W3 /GX- /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "ARM" /D "_ARM_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "_USRDLL" /D "ZLIBCE_EXPORTS" /YX /c
-# ADD CPP /nologo /MC /W3 /GX- /Zi /Od /I "..\..\zlibce" /D "DEBUG" /D "ARM" /D "_ARM_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /c
+# ADD CPP /nologo /MC /W3 /GX- /Zi /Od /I "..\..\zlib" /D "DEBUG" /D "ARM" /D "_ARM_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /r /d "ARM" /d "_ARM_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
@@ -310,7 +310,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=clmips.exe
 # ADD BASE CPP /nologo /QMFWCE /MC /W3 /GX- /O2 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "_USRDLL" /D "ZLIBCE_EXPORTS" /YX /c
-# ADD CPP /nologo /QMFWCE /MC /W3 /GX- /O2 /I "..\..\zlibce" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /c
+# ADD CPP /nologo /QMFWCE /MC /W3 /GX- /O2 /I "..\..\zlib" /D "NDEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "NDEBUG"
@@ -341,7 +341,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=clmips.exe
 # ADD BASE CPP /nologo /QMFWCE /MC /W3 /GX- /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "_USRDLL" /D "ZLIBCE_EXPORTS" /YX /c
-# ADD CPP /nologo /QMFWCE /MC /W3 /GX- /Zi /Od /I "..\..\zlibce" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /c
+# ADD CPP /nologo /QMFWCE /MC /W3 /GX- /Zi /Od /I "..\..\zlib" /D "DEBUG" /D "MIPS" /D "_MIPS_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /r /d "MIPS" /d "_MIPS_" /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "UNICODE" /d "DEBUG"
@@ -372,7 +372,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /ML /W3 /GX- /O2 /D "x86" /D "_i386_" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "NDEBUG" /D "i_386_" /D "_MBCS" /D "_USRDLL" /D "ZLIBCE_EXPORTS" /Gs8192 /GF  /c
-# ADD CPP /nologo /ML /W3 /GX- /O2 /I "..\..\zlibce" /D "x86" /D "_i386_" /D "_x86_" /D "NDEBUG" /D "i_386_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /Gs8192 /GF  /c
+# ADD CPP /nologo /ML /W3 /GX- /O2 /I "..\..\zlib" /D "x86" /D "_i386_" /D "_x86_" /D "NDEBUG" /D "i_386_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /Gs8192 /GF  /c
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /r /d "x86" /d "_i386_" /d "_x86_" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "NDEBUG"
 # ADD RSC /l 0x411 /r /d "x86" /d "_i386_" /d "_x86_" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "NDEBUG"
@@ -402,7 +402,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MLd /W3 /GX- /Zi /Od /D "x86" /D "_i386_" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "DEBUG" /D "i_386_" /D "_MBCS" /D "_USRDLL" /D "ZLIBCE_EXPORTS" /Gs8192 /GF  /c
-# ADD CPP /nologo /MLd /W3 /GX- /Zi /Od /I "..\..\zlibce" /D "x86" /D "_i386_" /D "_x86_" /D "DEBUG" /D "i_386_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /Gs8192 /GF  /c
+# ADD CPP /nologo /MLd /W3 /GX- /Zi /Od /I "..\..\zlib" /D "x86" /D "_i386_" /D "_x86_" /D "DEBUG" /D "i_386_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /Gs8192 /GF  /c
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /r /d "x86" /d "_i386_" /d "_x86_" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "DEBUG"
 # ADD RSC /l 0x411 /r /d "x86" /d "_i386_" /d "_x86_" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "DEBUG"
@@ -432,7 +432,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /ML /W3 /GX- /O2 /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "NDEBUG" /D "x86" /D "i486" /D "_x86_" /D "_MBCS" /D "_USRDLL" /D "ZLIBCE_EXPORTS" /YX /c
-# ADD CPP /nologo /ML /W3 /GX- /O2 /I "..\..\zlibce" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "NDEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /c
+# ADD CPP /nologo /ML /W3 /GX- /O2 /I "..\..\zlib" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "NDEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "NDEBUG"
@@ -461,7 +461,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /MLd /W3 /Gm /GX- /Zi /Od /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "WIN32" /D "STRICT" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D "_MBCS" /D "_USRDLL" /D "ZLIBCE_EXPORTS" /YX /c
-# ADD CPP /nologo /MLd /W3 /Gm /GX- /Zi /Od /I "..\..\zlibce" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /c
+# ADD CPP /nologo /MLd /W3 /Gm /GX- /Zi /Od /I "..\..\zlib" /D "_UNICODE" /D "WIN32" /D "STRICT" /D "_WIN32_WCE_EMULATION" /D "INTERNATIONAL" /D "USA" /D "INTLMSG_CODEPAGE" /D "_DEBUG" /D "x86" /D "i486" /D "_x86_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "WIN32" /d "STRICT" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d "_WIN32_WCE_EMULATION" /d "INTERNATIONAL" /d "USA" /d "INTLMSG_CODEPAGE" /d "_DEBUG" /d "x86" /d "i486" /d "_x86_"
@@ -490,7 +490,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=clppc.exe
 # ADD BASE CPP /nologo /M$(CECrt) /W3 /GX- /O2 /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "NDEBUG" /D "PPC" /D "_PPC_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "_USRDLL" /D "ZLIBCE_EXPORTS" /YX /c
-# ADD CPP /nologo /M$(CECrt) /W3 /GX- /O2 /I "..\..\zlibce" /D "NDEBUG" /D "PPC" /D "_PPC_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /c
+# ADD CPP /nologo /M$(CECrt) /W3 /GX- /O2 /I "..\..\zlib" /D "NDEBUG" /D "PPC" /D "_PPC_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /r /d "ppc" /d "_ppc_" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "NDEBUG"
@@ -521,7 +521,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=clppc.exe
 # ADD BASE CPP /nologo /M$(CECrtDebug) /W3 /GX- /Zi /Od /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D "DEBUG" /D "PPC" /D "_PPC_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "_USRDLL" /D "ZLIBCE_EXPORTS" /YX /c
-# ADD CPP /nologo /M$(CECrtDebug) /W3 /GX- /Zi /Od /I "..\..\zlibce" /D "DEBUG" /D "PPC" /D "_PPC_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /c
+# ADD CPP /nologo /M$(CECrtDebug) /W3 /GX- /Zi /Od /I "..\..\zlib" /D "DEBUG" /D "PPC" /D "_PPC_" /D _WIN32_WCE=$(CEVersion) /D "$(CEConfigName)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_MBCS" /D "ZLIB_DLL" /c
 # SUBTRACT CPP /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x411 /r /d "ppc" /d "_ppc_" /d _WIN32_WCE=$(CEVersion) /d "$(CEConfigName)" /d UNDER_CE=$(CEVersion) /d "UNICODE" /d "DEBUG"
@@ -563,118 +563,118 @@ LINK32=link.exe
 # PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 # Begin Source File
 
-SOURCE=..\..\zlibce\adler32.c
+SOURCE=..\..\zlib\adler32.c
 
 !IF  "$(CFG)" == "zlibce - Win32 (WCE MIPS) Release"
 
 DEP_CPP_ADLER=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_ADLER=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH4) Release"
 
 DEP_CPP_ADLER=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH4) Debug"
 
 DEP_CPP_ADLER=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH3) Release"
 
 DEP_CPP_ADLER=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH3) Debug"
 
 DEP_CPP_ADLER=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE ARM) Release"
 
 DEP_CPP_ADLER=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE ARM) Debug"
 
 DEP_CPP_ADLER=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPSFP) Release"
 
 DEP_CPP_ADLER=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPSFP) Debug"
 
 DEP_CPP_ADLER=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86) Release"
 
 DEP_CPP_ADLER=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86) Debug"
 
 DEP_CPP_ADLER=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86em) Release"
 
 DEP_CPP_ADLER=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86em) Debug"
 
 DEP_CPP_ADLER=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE PPC) Release"
 
 DEP_CPP_ADLER=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE PPC) Debug"
 
 DEP_CPP_ADLER=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ENDIF 
@@ -682,118 +682,118 @@ DEP_CPP_ADLER=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\zlibce\compress.c
+SOURCE=..\..\zlib\compress.c
 
 !IF  "$(CFG)" == "zlibce - Win32 (WCE MIPS) Release"
 
 DEP_CPP_COMPR=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_COMPR=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH4) Release"
 
 DEP_CPP_COMPR=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH4) Debug"
 
 DEP_CPP_COMPR=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH3) Release"
 
 DEP_CPP_COMPR=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH3) Debug"
 
 DEP_CPP_COMPR=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE ARM) Release"
 
 DEP_CPP_COMPR=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE ARM) Debug"
 
 DEP_CPP_COMPR=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPSFP) Release"
 
 DEP_CPP_COMPR=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPSFP) Debug"
 
 DEP_CPP_COMPR=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86) Release"
 
 DEP_CPP_COMPR=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86) Debug"
 
 DEP_CPP_COMPR=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86em) Release"
 
 DEP_CPP_COMPR=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86em) Debug"
 
 DEP_CPP_COMPR=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE PPC) Release"
 
 DEP_CPP_COMPR=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE PPC) Debug"
 
 DEP_CPP_COMPR=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ENDIF 
@@ -801,118 +801,118 @@ DEP_CPP_COMPR=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\zlibce\crc32.c
+SOURCE=..\..\zlib\crc32.c
 
 !IF  "$(CFG)" == "zlibce - Win32 (WCE MIPS) Release"
 
 DEP_CPP_CRC32=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_CRC32=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH4) Release"
 
 DEP_CPP_CRC32=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH4) Debug"
 
 DEP_CPP_CRC32=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH3) Release"
 
 DEP_CPP_CRC32=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH3) Debug"
 
 DEP_CPP_CRC32=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE ARM) Release"
 
 DEP_CPP_CRC32=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE ARM) Debug"
 
 DEP_CPP_CRC32=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPSFP) Release"
 
 DEP_CPP_CRC32=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPSFP) Debug"
 
 DEP_CPP_CRC32=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86) Release"
 
 DEP_CPP_CRC32=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86) Debug"
 
 DEP_CPP_CRC32=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86em) Release"
 
 DEP_CPP_CRC32=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86em) Debug"
 
 DEP_CPP_CRC32=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE PPC) Release"
 
 DEP_CPP_CRC32=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE PPC) Debug"
 
 DEP_CPP_CRC32=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ENDIF 
@@ -920,150 +920,150 @@ DEP_CPP_CRC32=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\zlibce\deflate.c
+SOURCE=..\..\zlib\deflate.c
 
 !IF  "$(CFG)" == "zlibce - Win32 (WCE MIPS) Release"
 
 DEP_CPP_DEFLA=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_DEFLA=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH4) Release"
 
 DEP_CPP_DEFLA=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH4) Debug"
 
 DEP_CPP_DEFLA=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH3) Release"
 
 DEP_CPP_DEFLA=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH3) Debug"
 
 DEP_CPP_DEFLA=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE ARM) Release"
 
 DEP_CPP_DEFLA=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE ARM) Debug"
 
 DEP_CPP_DEFLA=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPSFP) Release"
 
 DEP_CPP_DEFLA=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPSFP) Debug"
 
 DEP_CPP_DEFLA=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86) Release"
 
 DEP_CPP_DEFLA=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86) Debug"
 
 DEP_CPP_DEFLA=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86em) Release"
 
 DEP_CPP_DEFLA=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86em) Debug"
 
 DEP_CPP_DEFLA=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE PPC) Release"
 
 DEP_CPP_DEFLA=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE PPC) Debug"
 
 DEP_CPP_DEFLA=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ENDIF 
@@ -1071,134 +1071,134 @@ DEP_CPP_DEFLA=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\zlibce\gziowce.c
+SOURCE=..\..\zlib\gzio.c
 
 !IF  "$(CFG)" == "zlibce - Win32 (WCE MIPS) Release"
 
-DEP_CPP_GZIOW=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+DEP_CPP_GZIO_C=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPS) Debug"
 
-DEP_CPP_GZIOW=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+DEP_CPP_GZIO_C=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH4) Release"
 
-DEP_CPP_GZIOW=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+DEP_CPP_GZIO_C=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH4) Debug"
 
-DEP_CPP_GZIOW=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+DEP_CPP_GZIO_C=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH3) Release"
 
-DEP_CPP_GZIOW=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+DEP_CPP_GZIO_C=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH3) Debug"
 
-DEP_CPP_GZIOW=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+DEP_CPP_GZIO_C=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE ARM) Release"
 
-DEP_CPP_GZIOW=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+DEP_CPP_GZIO_C=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE ARM) Debug"
 
-DEP_CPP_GZIOW=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+DEP_CPP_GZIO_C=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPSFP) Release"
 
-DEP_CPP_GZIOW=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+DEP_CPP_GZIO_C=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPSFP) Debug"
 
-DEP_CPP_GZIOW=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+DEP_CPP_GZIO_C=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86) Release"
 
-DEP_CPP_GZIOW=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+DEP_CPP_GZIO_C=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86) Debug"
 
-DEP_CPP_GZIOW=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+DEP_CPP_GZIO_C=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86em) Release"
 
-DEP_CPP_GZIOW=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+DEP_CPP_GZIO_C=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86em) Debug"
 
-DEP_CPP_GZIOW=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+DEP_CPP_GZIO_C=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE PPC) Release"
 
-DEP_CPP_GZIOW=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+DEP_CPP_GZIO_C=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE PPC) Debug"
 
-DEP_CPP_GZIOW=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+DEP_CPP_GZIO_C=\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ENDIF 
@@ -1206,198 +1206,198 @@ DEP_CPP_GZIOW=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\zlibce\infblock.c
+SOURCE=..\..\zlib\infblock.c
 
 !IF  "$(CFG)" == "zlibce - Win32 (WCE MIPS) Release"
 
 DEP_CPP_INFBL=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_INFBL=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH4) Release"
 
 DEP_CPP_INFBL=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH4) Debug"
 
 DEP_CPP_INFBL=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH3) Release"
 
 DEP_CPP_INFBL=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH3) Debug"
 
 DEP_CPP_INFBL=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE ARM) Release"
 
 DEP_CPP_INFBL=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE ARM) Debug"
 
 DEP_CPP_INFBL=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPSFP) Release"
 
 DEP_CPP_INFBL=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPSFP) Debug"
 
 DEP_CPP_INFBL=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86) Release"
 
 DEP_CPP_INFBL=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86) Debug"
 
 DEP_CPP_INFBL=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86em) Release"
 
 DEP_CPP_INFBL=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86em) Debug"
 
 DEP_CPP_INFBL=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE PPC) Release"
 
 DEP_CPP_INFBL=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE PPC) Debug"
 
 DEP_CPP_INFBL=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ENDIF 
@@ -1405,214 +1405,214 @@ DEP_CPP_INFBL=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\zlibce\infcodes.c
+SOURCE=..\..\zlib\infcodes.c
 
 !IF  "$(CFG)" == "zlibce - Win32 (WCE MIPS) Release"
 
 DEP_CPP_INFCO=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_INFCO=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH4) Release"
 
 DEP_CPP_INFCO=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH4) Debug"
 
 DEP_CPP_INFCO=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH3) Release"
 
 DEP_CPP_INFCO=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH3) Debug"
 
 DEP_CPP_INFCO=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE ARM) Release"
 
 DEP_CPP_INFCO=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE ARM) Debug"
 
 DEP_CPP_INFCO=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPSFP) Release"
 
 DEP_CPP_INFCO=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPSFP) Debug"
 
 DEP_CPP_INFCO=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86) Release"
 
 DEP_CPP_INFCO=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86) Debug"
 
 DEP_CPP_INFCO=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86em) Release"
 
 DEP_CPP_INFCO=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86em) Debug"
 
 DEP_CPP_INFCO=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE PPC) Release"
 
 DEP_CPP_INFCO=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE PPC) Debug"
 
 DEP_CPP_INFCO=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ENDIF 
@@ -1620,214 +1620,214 @@ DEP_CPP_INFCO=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\zlibce\inffast.c
+SOURCE=..\..\zlib\inffast.c
 
 !IF  "$(CFG)" == "zlibce - Win32 (WCE MIPS) Release"
 
 DEP_CPP_INFFA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_INFFA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH4) Release"
 
 DEP_CPP_INFFA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH4) Debug"
 
 DEP_CPP_INFFA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH3) Release"
 
 DEP_CPP_INFFA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH3) Debug"
 
 DEP_CPP_INFFA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE ARM) Release"
 
 DEP_CPP_INFFA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE ARM) Debug"
 
 DEP_CPP_INFFA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPSFP) Release"
 
 DEP_CPP_INFFA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPSFP) Debug"
 
 DEP_CPP_INFFA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86) Release"
 
 DEP_CPP_INFFA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86) Debug"
 
 DEP_CPP_INFFA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86em) Release"
 
 DEP_CPP_INFFA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86em) Debug"
 
 DEP_CPP_INFFA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE PPC) Release"
 
 DEP_CPP_INFFA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE PPC) Debug"
 
 DEP_CPP_INFFA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inffast.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inffast.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ENDIF 
@@ -1835,150 +1835,150 @@ DEP_CPP_INFFA=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\zlibce\inflate.c
+SOURCE=..\..\zlib\inflate.c
 
 !IF  "$(CFG)" == "zlibce - Win32 (WCE MIPS) Release"
 
 DEP_CPP_INFLA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_INFLA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH4) Release"
 
 DEP_CPP_INFLA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH4) Debug"
 
 DEP_CPP_INFLA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH3) Release"
 
 DEP_CPP_INFLA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH3) Debug"
 
 DEP_CPP_INFLA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE ARM) Release"
 
 DEP_CPP_INFLA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE ARM) Debug"
 
 DEP_CPP_INFLA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPSFP) Release"
 
 DEP_CPP_INFLA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPSFP) Debug"
 
 DEP_CPP_INFLA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86) Release"
 
 DEP_CPP_INFLA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86) Debug"
 
 DEP_CPP_INFLA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86em) Release"
 
 DEP_CPP_INFLA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86em) Debug"
 
 DEP_CPP_INFLA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE PPC) Release"
 
 DEP_CPP_INFLA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE PPC) Debug"
 
 DEP_CPP_INFLA=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ENDIF 
@@ -1986,166 +1986,166 @@ DEP_CPP_INFLA=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\zlibce\inftrees.c
+SOURCE=..\..\zlib\inftrees.c
 
 !IF  "$(CFG)" == "zlibce - Win32 (WCE MIPS) Release"
 
 DEP_CPP_INFTR=\
-	"..\..\zlibce\inffixed.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\inffixed.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_INFTR=\
-	"..\..\zlibce\inffixed.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\inffixed.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH4) Release"
 
 DEP_CPP_INFTR=\
-	"..\..\zlibce\inffixed.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\inffixed.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH4) Debug"
 
 DEP_CPP_INFTR=\
-	"..\..\zlibce\inffixed.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\inffixed.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH3) Release"
 
 DEP_CPP_INFTR=\
-	"..\..\zlibce\inffixed.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\inffixed.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH3) Debug"
 
 DEP_CPP_INFTR=\
-	"..\..\zlibce\inffixed.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\inffixed.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE ARM) Release"
 
 DEP_CPP_INFTR=\
-	"..\..\zlibce\inffixed.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\inffixed.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE ARM) Debug"
 
 DEP_CPP_INFTR=\
-	"..\..\zlibce\inffixed.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\inffixed.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPSFP) Release"
 
 DEP_CPP_INFTR=\
-	"..\..\zlibce\inffixed.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\inffixed.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPSFP) Debug"
 
 DEP_CPP_INFTR=\
-	"..\..\zlibce\inffixed.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\inffixed.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86) Release"
 
 DEP_CPP_INFTR=\
-	"..\..\zlibce\inffixed.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\inffixed.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86) Debug"
 
 DEP_CPP_INFTR=\
-	"..\..\zlibce\inffixed.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\inffixed.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86em) Release"
 
 DEP_CPP_INFTR=\
-	"..\..\zlibce\inffixed.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\inffixed.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86em) Debug"
 
 DEP_CPP_INFTR=\
-	"..\..\zlibce\inffixed.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\inffixed.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE PPC) Release"
 
 DEP_CPP_INFTR=\
-	"..\..\zlibce\inffixed.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\inffixed.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE PPC) Debug"
 
 DEP_CPP_INFTR=\
-	"..\..\zlibce\inffixed.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\inffixed.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ENDIF 
@@ -2153,198 +2153,198 @@ DEP_CPP_INFTR=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\zlibce\infutil.c
+SOURCE=..\..\zlib\infutil.c
 
 !IF  "$(CFG)" == "zlibce - Win32 (WCE MIPS) Release"
 
 DEP_CPP_INFUT=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_INFUT=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH4) Release"
 
 DEP_CPP_INFUT=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH4) Debug"
 
 DEP_CPP_INFUT=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH3) Release"
 
 DEP_CPP_INFUT=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH3) Debug"
 
 DEP_CPP_INFUT=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE ARM) Release"
 
 DEP_CPP_INFUT=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE ARM) Debug"
 
 DEP_CPP_INFUT=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPSFP) Release"
 
 DEP_CPP_INFUT=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPSFP) Debug"
 
 DEP_CPP_INFUT=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86) Release"
 
 DEP_CPP_INFUT=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86) Debug"
 
 DEP_CPP_INFUT=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86em) Release"
 
 DEP_CPP_INFUT=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86em) Debug"
 
 DEP_CPP_INFUT=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE PPC) Release"
 
 DEP_CPP_INFUT=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE PPC) Debug"
 
 DEP_CPP_INFUT=\
-	"..\..\zlibce\infblock.h"\
-	"..\..\zlibce\infcodes.h"\
-	"..\..\zlibce\inftrees.h"\
-	"..\..\zlibce\infutil.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\infblock.h"\
+	"..\..\zlib\infcodes.h"\
+	"..\..\zlib\inftrees.h"\
+	"..\..\zlib\infutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ENDIF 
@@ -2352,166 +2352,166 @@ DEP_CPP_INFUT=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\zlibce\trees.c
+SOURCE=..\..\zlib\trees.c
 
 !IF  "$(CFG)" == "zlibce - Win32 (WCE MIPS) Release"
 
 DEP_CPP_TREES=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\trees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\trees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_TREES=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\trees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\trees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH4) Release"
 
 DEP_CPP_TREES=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\trees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\trees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH4) Debug"
 
 DEP_CPP_TREES=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\trees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\trees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH3) Release"
 
 DEP_CPP_TREES=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\trees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\trees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH3) Debug"
 
 DEP_CPP_TREES=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\trees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\trees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE ARM) Release"
 
 DEP_CPP_TREES=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\trees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\trees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE ARM) Debug"
 
 DEP_CPP_TREES=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\trees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\trees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPSFP) Release"
 
 DEP_CPP_TREES=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\trees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\trees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPSFP) Debug"
 
 DEP_CPP_TREES=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\trees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\trees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86) Release"
 
 DEP_CPP_TREES=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\trees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\trees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86) Debug"
 
 DEP_CPP_TREES=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\trees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\trees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86em) Release"
 
 DEP_CPP_TREES=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\trees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\trees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86em) Debug"
 
 DEP_CPP_TREES=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\trees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\trees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE PPC) Release"
 
 DEP_CPP_TREES=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\trees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\trees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE PPC) Debug"
 
 DEP_CPP_TREES=\
-	"..\..\zlibce\deflate.h"\
-	"..\..\zlibce\trees.h"\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\deflate.h"\
+	"..\..\zlib\trees.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ENDIF 
@@ -2519,118 +2519,118 @@ DEP_CPP_TREES=\
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\zlibce\uncompr.c
+SOURCE=..\..\zlib\uncompr.c
 
 !IF  "$(CFG)" == "zlibce - Win32 (WCE MIPS) Release"
 
 DEP_CPP_UNCOM=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_UNCOM=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH4) Release"
 
 DEP_CPP_UNCOM=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH4) Debug"
 
 DEP_CPP_UNCOM=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH3) Release"
 
 DEP_CPP_UNCOM=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH3) Debug"
 
 DEP_CPP_UNCOM=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE ARM) Release"
 
 DEP_CPP_UNCOM=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE ARM) Debug"
 
 DEP_CPP_UNCOM=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPSFP) Release"
 
 DEP_CPP_UNCOM=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPSFP) Debug"
 
 DEP_CPP_UNCOM=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86) Release"
 
 DEP_CPP_UNCOM=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86) Debug"
 
 DEP_CPP_UNCOM=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86em) Release"
 
 DEP_CPP_UNCOM=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86em) Debug"
 
 DEP_CPP_UNCOM=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE PPC) Release"
 
 DEP_CPP_UNCOM=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE PPC) Debug"
 
 DEP_CPP_UNCOM=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
 	
 
 !ENDIF 
@@ -2642,134 +2642,134 @@ SOURCE=.\zlibce.def
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\zlibce\zutil.c
+SOURCE=..\..\zlib\zutil.c
 
 !IF  "$(CFG)" == "zlibce - Win32 (WCE MIPS) Release"
 
 DEP_CPP_ZUTIL=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPS) Debug"
 
 DEP_CPP_ZUTIL=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH4) Release"
 
 DEP_CPP_ZUTIL=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH4) Debug"
 
 DEP_CPP_ZUTIL=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH3) Release"
 
 DEP_CPP_ZUTIL=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE SH3) Debug"
 
 DEP_CPP_ZUTIL=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE ARM) Release"
 
 DEP_CPP_ZUTIL=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE ARM) Debug"
 
 DEP_CPP_ZUTIL=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPSFP) Release"
 
 DEP_CPP_ZUTIL=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE MIPSFP) Debug"
 
 DEP_CPP_ZUTIL=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86) Release"
 
 DEP_CPP_ZUTIL=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86) Debug"
 
 DEP_CPP_ZUTIL=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86em) Release"
 
 DEP_CPP_ZUTIL=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE x86em) Debug"
 
 DEP_CPP_ZUTIL=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE PPC) Release"
 
 DEP_CPP_ZUTIL=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ELSEIF  "$(CFG)" == "zlibce - Win32 (WCE PPC) Debug"
 
 DEP_CPP_ZUTIL=\
-	"..\..\zlibce\zconf.h"\
-	"..\..\zlibce\zlib.h"\
-	"..\..\zlibce\zutil.h"\
+	"..\..\zlib\zconf.h"\
+	"..\..\zlib\zlib.h"\
+	"..\..\zlib\zutil.h"\
 	
 
 !ENDIF 
@@ -2781,47 +2781,47 @@ DEP_CPP_ZUTIL=\
 # PROP Default_Filter "h;hpp;hxx;hm;inl"
 # Begin Source File
 
-SOURCE=..\..\zlibce\deflate.h
+SOURCE=..\..\zlib\deflate.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\zlibce\infblock.h
+SOURCE=..\..\zlib\infblock.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\zlibce\infcodes.h
+SOURCE=..\..\zlib\infcodes.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\zlibce\inffast.h
+SOURCE=..\..\zlib\inffast.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\zlibce\inffixed.h
+SOURCE=..\..\zlib\inffixed.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\zlibce\inftrees.h
+SOURCE=..\..\zlib\inftrees.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\zlibce\infutil.h
+SOURCE=..\..\zlib\infutil.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\zlibce\trees.h
+SOURCE=..\..\zlib\trees.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\zlibce\zconf.h
+SOURCE=..\..\zlib\zconf.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\zlibce\zlib.h
+SOURCE=..\..\zlib\zlib.h
 # End Source File
 # Begin Source File
 
-SOURCE=..\..\zlibce\zutil.h
+SOURCE=..\..\zlib\zutil.h
 # End Source File
 # End Group
 # Begin Group "Resource Files"