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.beos | |
| 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.beos')
| -rw-r--r-- | src/3rdparty/libpng/scripts/makefile.beos | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/3rdparty/libpng/scripts/makefile.beos b/src/3rdparty/libpng/scripts/makefile.beos index 341a57c..5dbf14c 100644 --- a/src/3rdparty/libpng/scripts/makefile.beos +++ b/src/3rdparty/libpng/scripts/makefile.beos @@ -1,14 +1,17 @@ # makefile for libpng on BeOS x86 ELF with gcc # modified from makefile.linux by Sander Stoks -# Copyright (C) 2002, 2006 Glenn Randers-Pehrson +# Copyright (C) 2002, 2006, 2008 Glenn Randers-Pehrson # Copyright (C) 1999 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: @@ -41,7 +44,7 @@ WARNMORE=-Wwrite-strings -Wpointer-arith -Wshadow \ # On BeOS, -O1 is actually better than -O3. This is a known bug but it's # still here in R4.5 -CFLAGS=-I$(ZLIBINC) -Wall -O1 -funroll-loops \ +CFLAGS=-I$(ZLIBINC) -W -Wall -O1 -funroll-loops \ $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 # LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz LDFLAGS=-L. -Wl,-soname=$(LIBSOMAJ) -L$(ZLIBLIB) -lz @@ -223,4 +226,5 @@ pngwrite.o pngwrite.pic.o: png.h pngconf.h pngwtran.o pngwtran.pic.o: png.h pngconf.h pngwutil.o pngwutil.pic.o: png.h pngconf.h pngpread.o pngpread.pic.o: png.h pngconf.h + pngtest.o: png.h pngconf.h |