zlib/zlib-1.2.5.patch

   1 --- misc/zlib-1.2.5/makefile.mk Fri Mar 14 10:17:06 2008
   2 +++ misc/build/zlib-1.2.5/makefile.mk   Fri Mar 14 10:16:56 2008
   3 @@ -1 +1,67 @@
   4 -dummy
   5 +#*************************************************************************
   6 +#
   7 +#   Copyright according the GNU Public License.
   8 +#
   9 +#*************************************************************************
  10 +
  11 +PRJ=..$/..$/..$/..
  12 +
  13 +PRJNAME=zlib
  14 +TARGET=zlib
  15 +LIBTARGET=NO
  16 +EXTERNAL_WARNINGS_NOT_ERRORS=TRUE
  17 +
  18 +# --- Settings -----------------------------------------------------
  19 +
  20 +.INCLUDE :  settings.mk
  21 +
  22 +# --- Files --------------------------------------------------------
  23 +
  24 +INCEXT=contrib$/minizip
  25 +
  26 +SLOFILES=      $(SLO)$/adler32.obj             \
  27 +                       $(SLO)$/compress.obj    \
  28 +                       $(SLO)$/deflate.obj             \
  29 +                       $(SLO)$/crc32.obj               \
  30 +                       $(SLO)$/inffast.obj             \
  31 +                       $(SLO)$/inflate.obj             \
  32 +                       $(SLO)$/inftrees.obj    \
  33 +                       $(SLO)$/trees.obj               \
  34 +                       $(SLO)$/zutil.obj       \
  35 +                       $(SLO)$/unzip.obj               \
  36 +                       $(SLO)$/ioapi.obj
  37 +
  38 +
  39 +LIB1TARGET=$(SLB)$/$(TARGET).lib
  40 +LIB1ARCHIV=$(LB)$/lib$(TARGET).a
  41 +LIB1OBJFILES=$(SLOFILES)
  42 +
  43 +.IF "$(BUILD_X64)"!=""
  44 +SLOFILES_X64=  $(SLO_X64)$/adler32.obj         \
  45 +                       $(SLO_X64)$/compress.obj        \
  46 +                       $(SLO_X64)$/deflate.obj         \
  47 +                       $(SLO_X64)$/crc32.obj           \
  48 +                       $(SLO_X64)$/inffast.obj         \
  49 +                       $(SLO_X64)$/inflate.obj         \
  50 +                       $(SLO_X64)$/inftrees.obj        \
  51 +                       $(SLO_X64)$/trees.obj           \
  52 +                       $(SLO_X64)$/zutil.obj       \
  53 +                       $(SLO_X64)$/unzip.obj           \
  54 +                       $(SLO_X64)$/ioapi.obj
  55 +
  56 +LIB1TARGET_X64=$(SLB_X64)$/$(TARGET).lib
  57 +LIB1OBJFILES_X64=$(SLOFILES_X64)
  58 +.ENDIF # "$(BUILD_X64)"!=""
  59 +
  60 +
  61 +# --- Targets ------------------------------------------------------
  62 +
  63 +$(MISC)$/%.c : contrib$/minizip$/%.c
  64 +       @echo ------------------------------
  65 +       @echo Making: $@
  66 +    @$(COPY) $< $@
  67 +
  68 +.INCLUDE :  set_wntx64.mk
  69 +.INCLUDE :  target.mk
  70 +.INCLUDE :  tg_wntx64.mk
  71 +
  72 --- misc/zlib-1.2.5/zconf.h     2010-04-18 19:58:06.000000000 +0200
  73 +++ misc/build/zlib-1.2.5/zconf.h       2011-08-12 09:44:59.524936228 +0200
  74 @@ -14,6 +14,12 @@
  75   * Even better than compiling with -DZ_PREFIX would be to use configure to set
  76   * this permanently in zconf.h using "./configure --zprefix".
  77   */
  78 +/*
  79 + * we need the prefix to get the same names as in 1.1.3
  80 +*/
  81 +
  82 +#define Z_PREFIX
  83 +
  84  #ifdef Z_PREFIX     /* may be set to #if 1 by ./configure */
  85
  86  /* all linked symbols */