diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-22 11:48:04 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-10-22 11:48:12 (GMT) |
| commit | 43b2248cc3765848ca3763c36b91ed7290fddfe0 (patch) | |
| tree | 200e2c52c8e44d43c80400079bd2b038609d87df /src/3rdparty/libpng/scripts/makefile.solaris-x86 | |
| parent | 9c136d34c1d15d077ab5103a84dfb2449b796d1f (diff) | |
| parent | 9dec5247be84ae4606d5d9baf5b99612c5feba8d (diff) | |
| download | Qt-43b2248cc3765848ca3763c36b91ed7290fddfe0.zip Qt-43b2248cc3765848ca3763c36b91ed7290fddfe0.tar.gz Qt-43b2248cc3765848ca3763c36b91ed7290fddfe0.tar.bz2 | |
Merge branch 'origin/4.6' into widgets-team/4.6
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 |