diff options
| author | aavit <qt-info@nokia.com> | 2009-10-15 12:48:31 (GMT) |
|---|---|---|
| committer | aavit <qt-info@nokia.com> | 2009-10-22 09:56:09 (GMT) |
| commit | ed1892665111f900e4d831a41b4ec79666931f0d (patch) | |
| tree | ca66edcdd61cbe36aa80f450953bf02a8e267df7 /src/3rdparty/libpng/scripts/makefile.solaris-x86 | |
| parent | d4a136dc3f1176665c19eec24fa43f40e5180a89 (diff) | |
| download | Qt-ed1892665111f900e4d831a41b4ec79666931f0d.zip Qt-ed1892665111f900e4d831a41b4ec79666931f0d.tar.gz Qt-ed1892665111f900e4d831a41b4ec79666931f0d.tar.bz2 | |
Upgrade libpng to version 1.2.40
This commit contains a clean copy of the libpng source distribution.
The Qt patches will follow in a separate commit.
Diffstat (limited to 'src/3rdparty/libpng/scripts/makefile.solaris-x86')
| -rw-r--r-- | src/3rdparty/libpng/scripts/makefile.solaris-x86 | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/3rdparty/libpng/scripts/makefile.solaris-x86 b/src/3rdparty/libpng/scripts/makefile.solaris-x86 index 03c1de4..581916e 100644 --- a/src/3rdparty/libpng/scripts/makefile.solaris-x86 +++ b/src/3rdparty/libpng/scripts/makefile.solaris-x86 @@ -1,14 +1,17 @@ # makefile for libpng on Solaris 2.x with gcc -# Copyright (C) 2004, 2006, 2007 Glenn Randers-Pehrson +# Copyright (C) 2004, 2006-2008 Glenn Randers-Pehrson # Contributed by William L. Sebok, based on makefile.linux # Copyright (C) 1998 Greg Roelofs # Copyright (C) 1996, 1997 Andreas Dilger -# For conditions of distribution and use, see copyright notice in png.h + +# This code is released under the libpng license. +# For conditions of distribution and use, see the disclaimer +# and license in png.h # Library name: LIBNAME = libpng12 PNGMAJ = 0 -PNGMIN = 1.2.29 +PNGMIN = 1.2.40 PNGVER = $(PNGMAJ).$(PNGMIN) # Shared library names: @@ -43,7 +46,7 @@ ZLIBINC=/usr/local/include WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ -Wmissing-declarations -Wtraditional -Wcast-align \ -Wstrict-prototypes -Wmissing-prototypes #-Wconversion -CFLAGS=-I$(ZLIBINC) -Wall -O \ +CFLAGS=-I$(ZLIBINC) -W -Wall -O \ # $(WARNMORE) -g -DPNG_DEBUG=5 LDFLAGS=-L. -R. -L$(ZLIBLIB) -R$(ZLIBLIB) -lpng12 -lz -lm |