diff options
author | Debao Zhang <hello@debao.me> | 2012-12-07 17:42:38 +0800 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-10 12:37:07 +0100 |
commit | 910b9e64a95ed89ff4a6f18cecdeb38ba2a00a2c (patch) | |
tree | 837f0aea81fc48d184fe1175a859bbfb1cdb2eea /src/3rdparty/zlib/treebuild.xml | |
parent | 9d6ed74b505ab559d3635fd4a2f78835c581e5cd (diff) | |
download | qtsvg-910b9e64a95ed89ff4a6f18cecdeb38ba2a00a2c.tar.gz |
Use the bundled zlib in QtCore, if present.
src/3rdparty/zip is used for windows to build QtSvg under normal
builds. See sha: 6cdba02f6c4fc8c6baab7e03e0a2bedcb9a2d334
But QtCore has provided the bundled zlib headers for external access and
exported its public symbols when Qt is configured under normal builds
on windows
So there is no need to keep a seperate 3rdparty/zip copy any more.
Change-Id: Idf9cbce4c28a929f6dc6f7b25e22b28c1165fb55
Reviewed-by: aavit <eirik.aavitsland@digia.com>
Diffstat (limited to 'src/3rdparty/zlib/treebuild.xml')
-rw-r--r-- | src/3rdparty/zlib/treebuild.xml | 116 |
1 files changed, 0 insertions, 116 deletions
diff --git a/src/3rdparty/zlib/treebuild.xml b/src/3rdparty/zlib/treebuild.xml deleted file mode 100644 index 6b8f542..0000000 --- a/src/3rdparty/zlib/treebuild.xml +++ /dev/null @@ -1,116 +0,0 @@ -<?xml version="1.0" ?> -<package name="zlib" version="1.2.5"> - <library name="zlib" dlversion="1.2.5" dlname="z"> - <property name="description"> zip compression library </property> - <property name="include-target-dir" value="$(@PACKAGE/install-includedir)" /> - - <!-- fixme: not implemented yet --> - <property name="compiler/c/inline" value="yes" /> - - <include-file name="zlib.h" scope="public" mode="644" /> - <include-file name="zconf.h" scope="public" mode="644" /> - - <source name="adler32.c"> - <depend name="zlib.h" /> - <depend name="zconf.h" /> - </source> - <source name="compress.c"> - <depend name="zlib.h" /> - <depend name="zconf.h" /> - </source> - <source name="crc32.c"> - <depend name="zlib.h" /> - <depend name="zconf.h" /> - <depend name="crc32.h" /> - </source> - <source name="gzclose.c"> - <depend name="zlib.h" /> - <depend name="zconf.h" /> - <depend name="gzguts.h" /> - </source> - <source name="gzlib.c"> - <depend name="zlib.h" /> - <depend name="zconf.h" /> - <depend name="gzguts.h" /> - </source> - <source name="gzread.c"> - <depend name="zlib.h" /> - <depend name="zconf.h" /> - <depend name="gzguts.h" /> - </source> - <source name="gzwrite.c"> - <depend name="zlib.h" /> - <depend name="zconf.h" /> - <depend name="gzguts.h" /> - </source> - <source name="uncompr.c"> - <depend name="zlib.h" /> - <depend name="zconf.h" /> - </source> - <source name="deflate.c"> - <depend name="zlib.h" /> - <depend name="zconf.h" /> - <depend name="zutil.h" /> - <depend name="deflate.h" /> - </source> - <source name="trees.c"> - <depend name="zlib.h" /> - <depend name="zconf.h" /> - <depend name="zutil.h" /> - <depend name="deflate.h" /> - <depend name="trees.h" /> - </source> - <source name="zutil.c"> - <depend name="zlib.h" /> - <depend name="zconf.h" /> - <depend name="zutil.h" /> - </source> - <source name="inflate.c"> - <depend name="zlib.h" /> - <depend name="zconf.h" /> - <depend name="zutil.h" /> - <depend name="inftrees.h" /> - <depend name="inflate.h" /> - <depend name="inffast.h" /> - </source> - <source name="infback.c"> - <depend name="zlib.h" /> - <depend name="zconf.h" /> - <depend name="zutil.h" /> - <depend name="inftrees.h" /> - <depend name="inflate.h" /> - <depend name="inffast.h" /> - </source> - <source name="inftrees.c"> - <depend name="zlib.h" /> - <depend name="zconf.h" /> - <depend name="zutil.h" /> - <depend name="inftrees.h" /> - </source> - <source name="inffast.c"> - <depend name="zlib.h" /> - <depend name="zconf.h" /> - <depend name="zutil.h" /> - <depend name="inftrees.h" /> - <depend name="inflate.h" /> - <depend name="inffast.h" /> - </source> - </library> -</package> - -<!-- -CFLAGS=-O -#CFLAGS=-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7 -#CFLAGS=-g -DDEBUG -#CFLAGS=-O3 -Wall -Wwrite-strings -Wpointer-arith -Wconversion \ -# -Wstrict-prototypes -Wmissing-prototypes - -# OBJA = -# to use the asm code: make OBJA=match.o -# -match.o: match.S - $(CPP) match.S > _match.s - $(CC) -c _match.s - mv _match.o match.o - rm -f _match.s ---> |