diff options
| author | axis <qt-info@nokia.com> | 2010-02-23 15:23:05 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-23 15:23:05 (GMT) |
| commit | f67062af3a076468442c29127cb48bb13937ce0e (patch) | |
| tree | a12cd4c644fb528dd5f95cb58559732a0b8b6311 /src/3rdparty/libpng/scripts/makefile.dec | |
| parent | a670009fd378d48ff891602ec31204614e8a476f (diff) | |
| parent | c15307e9e916aa613096275919ca91deba64454f (diff) | |
| download | Qt-f67062af3a076468442c29127cb48bb13937ce0e.zip Qt-f67062af3a076468442c29127cb48bb13937ce0e.tar.gz Qt-f67062af3a076468442c29127cb48bb13937ce0e.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public
Conflicts:
mkspecs/features/symbian/qt.prf
qmake/Makefile.unix
qmake/Makefile.win32
qmake/Makefile.win32-g++
qmake/Makefile.win32-g++-sh
qmake/generators/symbian/initprojectdeploy_symbian.cpp
src/src.pro
Diffstat (limited to 'src/3rdparty/libpng/scripts/makefile.dec')
| -rw-r--r-- | src/3rdparty/libpng/scripts/makefile.dec | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/3rdparty/libpng/scripts/makefile.dec b/src/3rdparty/libpng/scripts/makefile.dec index b8f99db..eb1fd14 100644 --- a/src/3rdparty/libpng/scripts/makefile.dec +++ b/src/3rdparty/libpng/scripts/makefile.dec @@ -1,24 +1,24 @@ # makefile for libpng on DEC Alpha Unix # Copyright (C) 2000-2002, 2006 Glenn Randers-Pehrson # Copyright (C) 1995 Guy Eric Schalnat, Group 42, Inc. - +# # This code is released under the libpng license. # For conditions of distribution and use, see the disclaimer # and license in png.h # Library name: -PNGMAJ = 0 -PNGMIN = 1.2.40 +PNGMAJ = 14 +PNGMIN = 1.4.0 PNGVER = $(PNGMAJ).$(PNGMIN) -LIBNAME = libpng12 +LIBNAME = libpng14 # Shared library names: LIBSO=$(LIBNAME).so LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ) LIBSOVER=$(LIBNAME).so.$(PNGVER) OLDSO=libpng.so -OLDSOMAJ=libpng.so.3 -OLDSOVER=libpng.so.3.$(PNGMIN) +OLDSOMAJ=libpng.so.14 +OLDSOVER=libpng.so.14.$(PNGMIN) # Utilities: AR_RC=ar rc @@ -75,7 +75,7 @@ libpng.pc: -e s!@exec_prefix@!$(exec_prefix)! \ -e s!@libdir@!$(LIBPATH)! \ -e s!@includedir@!$(INCPATH)! \ - -e s!-lpng12!-lpng12\ -lz\ -lm! > libpng.pc + -e s!-lpng14!-lpng14\ -lz\ -lm! > libpng.pc libpng-config: ( cat scripts/libpng-config-head.in; \ @@ -83,7 +83,7 @@ libpng-config: echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \ echo ccopts=\"-std\"; \ echo L_opts=\"-L$(LIBPATH)\"; \ - echo libs=\"-lpng12 -lz -lm\"; \ + echo libs=\"-lpng14 -lz -lm\"; \ cat scripts/libpng-config-body.in ) > libpng-config chmod +x libpng-config @@ -198,20 +198,20 @@ clean: # DO NOT DELETE THIS LINE -- make depend depends on it. -png.o: png.h pngconf.h -pngerror.o: png.h pngconf.h -pngrio.o: png.h pngconf.h -pngwio.o: png.h pngconf.h -pngmem.o: png.h pngconf.h -pngset.o: png.h pngconf.h -pngget.o: png.h pngconf.h -pngread.o: png.h pngconf.h -pngrtran.o: png.h pngconf.h -pngrutil.o: png.h pngconf.h -pngtrans.o: png.h pngconf.h -pngwrite.o: png.h pngconf.h -pngwtran.o: png.h pngconf.h -pngwutil.o: png.h pngconf.h -pngpread.o: png.h pngconf.h +png.o: png.h pngconf.h pngpriv.h +pngerror.o: png.h pngconf.h pngpriv.h +pngrio.o: png.h pngconf.h pngpriv.h +pngwio.o: png.h pngconf.h pngpriv.h +pngmem.o: png.h pngconf.h pngpriv.h +pngset.o: png.h pngconf.h pngpriv.h +pngget.o: png.h pngconf.h pngpriv.h +pngread.o: png.h pngconf.h pngpriv.h +pngrtran.o: png.h pngconf.h pngpriv.h +pngrutil.o: png.h pngconf.h pngpriv.h +pngtrans.o: png.h pngconf.h pngpriv.h +pngwrite.o: png.h pngconf.h pngpriv.h +pngwtran.o: png.h pngconf.h pngpriv.h +pngwutil.o: png.h pngconf.h pngpriv.h +pngpread.o: png.h pngconf.h pngpriv.h pngtest.o: png.h pngconf.h |