Changeset 133 for smplayer/vendor/current/zlib/win32

Timestamp:

Oct 24, 2012, 7:56:20 PM (13 years ago)

Author:

Silvan Scherrer

Message:

SMplayer: update vendor to 0.8.1

Location:

smplayer/vendor/current/zlib

Files:

• . (moved) (moved from smplayer/vendor/current/zlib-1.2.6 )
• win32/Makefile.emx (deleted)
• win32/Makefile.gcc (modified) (7 diffs)
• win32/README-WIN32.txt (modified) (4 diffs)
• win32/zlib.def (modified) (2 diffs)

smplayer/vendor/current/zlib/win32/Makefile.gcc

@@ -2 +2 @@
 # Modified for mingw32 by C. Spieler, 6/16/98.
 # Updated for zlib 1.2.x by Christian Spieler and Cosmin Truta, Mar-2003.
-# Last updated: 1-Aug-2003.
+# Last updated: Mar 2012.
 # Tested under Cygwin and MinGW.
 
@@ -8 +8 @@
 # For conditions of distribution and use, see copyright notice in zlib.h
 
-# To compile, or to compile and test, type:
+# To compile, or to compile and test, type from the top level zlib directory:
 #
-#   make -fmakefile.gcc;  make test testdll -fmakefile.gcc
+#   make -fwin32/Makefile.gcc;  make test testdll -fwin32/Makefile.gcc
 #
 # To use the asm code, type:
 #   cp contrib/asm?86/match.S ./match.S
-#   make LOC=-DASMV OBJA=match.o -fmakefile.gcc
+#   make LOC=-DASMV OBJA=match.o -fwin32/Makefile.gcc
 #
 # To install libz.a, zconf.h and zlib.h in the system directories, type:
 #
-#   make install -fmakefile.gcc
+#   make install -fwin32/Makefile.gcc
+#
+# BINARY_PATH, INCLUDE_PATH and LIBRARY_PATH must be set.
+#
+# To install the shared lib, append SHARED_MODE=1 to the make command :
+#
+#   make install -fwin32/Makefile.gcc SHARED_MODE=1
 
 # Note:
@@ -39 +45 @@
 CC = $(PREFIX)gcc
 CFLAGS = $(LOC) -O3 -Wall
-EXTRA_CFLAGS = -DNO_VIZ
 
 AS = $(CC)
@@ -58 +63 @@
 # If GNU install is available, replace $(CP) with install.
 INSTALL = $(CP)
-#RM = rm -f
+# RM = rm -f
 RM = del
 
@@ -79 +84 @@
 
 .c.o:
-        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
+        $(CC) $(CFLAGS) -c -o $@ $<
 
 .S.o:
@@ -111 +116 @@
 
 example.o: test/example.c zlib.h zconf.h
-        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -I. -c -o $@ test/example.c
+        $(CC) $(CFLAGS) -I. -c -o $@ test/example.c
 
 minigzip.o: test/minigzip.c zlib.h zconf.h
-        $(CC) $(CFLAGS) $(EXTRA_CFLAGS) -I. -c -o $@ test/minigzip.c
+        $(CC) $(CFLAGS) -I. -c -o $@ test/minigzip.c
 
 zlibrc.o: win32/zlib1.rc
         $(RC) $(RCFLAGS) -o $@ win32/zlib1.rc
 
-
-# BINARY_PATH, INCLUDE_PATH and LIBRARY_PATH must be set.
-
 .PHONY: install uninstall clean
 
 install: zlib.h zconf.h $(STATICLIB) $(IMPLIB)
-        @if test -z "$(INCLUDE_PATH)" -o -z "$(LIBRARY_PATH)" -o -z "$(BINARY_PATH)"; then \
+        @if test -z "$(DESTDIR)$(INCLUDE_PATH)" -o -z "$(DESTDIR)$(LIBRARY_PATH)" -o -z "$(DESTDIR)$(BINARY_PATH)"; then \
                 echo INCLUDE_PATH, LIBRARY_PATH, and BINARY_PATH must be specified; \
                 exit 1; \
         fi
-        -@mkdir -p $(INCLUDE_PATH)
-        -@mkdir -p $(LIBRARY_PATH) $(LIBRARY_PATH)/pkgconfig
+        -@mkdir -p '$(DESTDIR)$(INCLUDE_PATH)'
+        -@mkdir -p '$(DESTDIR)$(LIBRARY_PATH)' '$(DESTDIR)$(LIBRARY_PATH)'/pkgconfig
         -if [ "$(SHARED_MODE)" = "1" ]; then \
-                mkdir -p $(BINARY_PATH); \
-                $(INSTALL) $(SHAREDLIB) $(BINARY_PATH); \
-                $(INSTALL) $(IMPLIB) $(LIBRARY_PATH); \
+                mkdir -p '$(DESTDIR)$(BINARY_PATH)'; \
+                $(INSTALL) $(SHAREDLIB) '$(DESTDIR)$(BINARY_PATH)'; \
+                $(INSTALL) $(IMPLIB) '$(DESTDIR)$(LIBRARY_PATH)'; \
         fi
-        -$(INSTALL) zlib.h $(INCLUDE_PATH)
-        -$(INSTALL) zconf.h $(INCLUDE_PATH)
-        -$(INSTALL) $(STATICLIB) $(LIBRARY_PATH)
+        -$(INSTALL) zlib.h '$(DESTDIR)$(INCLUDE_PATH)'
+        -$(INSTALL) zconf.h '$(DESTDIR)$(INCLUDE_PATH)'
+        -$(INSTALL) $(STATICLIB) '$(DESTDIR)$(LIBRARY_PATH)'
         sed \
                 -e 's|@prefix@|${prefix}|g' \
@@ -146 +148 @@
                 -e 's|@includedir@|$(INCLUDE_PATH)|g' \
                 -e 's|@VERSION@|'`sed -n -e '/VERSION "/s/.*"\(.*\)".*/\1/p' zlib.h`'|g' \
-                zlib.pc.in > $(LIBRARY_PATH)/pkgconfig/zlib.pc
+                zlib.pc.in > '$(DESTDIR)$(LIBRARY_PATH)'/pkgconfig/zlib.pc
 
 uninstall:
         -if [ "$(SHARED_MODE)" = "1" ]; then \
-                $(RM) $(BINARY_PATH)/$(SHAREDLIB); \
-                $(RM) $(LIBRARY_PATH)/$(IMPLIB); \
+                $(RM) '$(DESTDIR)$(BINARY_PATH)'/$(SHAREDLIB); \
+                $(RM) '$(DESTDIR)$(LIBRARY_PATH)'/$(IMPLIB); \
         fi
-        -$(RM) $(INCLUDE_PATH)/zlib.h
-        -$(RM) $(INCLUDE_PATH)/zconf.h
-        -$(RM) $(LIBRARY_PATH)/$(STATICLIB)
+        -$(RM) '$(DESTDIR)$(INCLUDE_PATH)'/zlib.h
+        -$(RM) '$(DESTDIR)$(INCLUDE_PATH)'/zconf.h
+        -$(RM) '$(DESTDIR)$(LIBRARY_PATH)'/$(STATICLIB)
 
 clean:

smplayer/vendor/current/zlib/win32/README-WIN32.txt

@@ -1 +1 @@
 ZLIB DATA COMPRESSION LIBRARY
 
-zlib 1.2.4 is a general purpose data compression library.  All the code is
+zlib 1.2.7 is a general purpose data compression library.  All the code is
 thread safe.  The data format used by the zlib library is described by RFCs
 (Request for Comments) 1950 to 1952 in the files
@@ -23 +23 @@
 Manifest:
 
-The package zlib-1.2.4-win32-x86.zip contains the following files:
+The package zlib-1.2.7-win32-x86.zip will contain the following files:
 
   README-WIN32.txt This document
@@ -59 +59 @@
 All .pdb files above are entirely optional, but are very useful to a developer
 attempting to diagnose program misbehavior or a crash.  Many additional
-important files for developers can be found in the zlib124.zip source package
+important files for developers can be found in the zlib127.zip source package
 available from http://zlib.net/ - review that package's README file for details.
 
@@ -73 +73 @@
 Copyright notice:
 
-  (C) 1995-2010 Jean-loup Gailly and Mark Adler
+  (C) 1995-2012 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied

smplayer/vendor/current/zlib/win32/zlib.def

@@ -75 +75 @@
     inflateInit2_
     inflateBackInit_
+    gzgetc_
     zError
     inflateSyncPoint
@@ -81 +82 @@
     inflateResetKeep
     deflateResetKeep
-    gzgetc_
-    gzflags
+    gzopen_w