diff options
| author | Chris Craik <ccraik@google.com> | 2013-07-29 15:28:30 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-04-15 13:45:45 -0700 |
| commit | b50c217251b086440efcdb273c22f86a06c80cba (patch) | |
| tree | 7217508741aa8a759ac9236f096f27dbfb9bcce2 /scripts/makefile.ne12bsd | |
| parent | a900dab475d480d0b080b85423f0ca37d41be840 (diff) | |
| download | android_external_libpng-b50c217251b086440efcdb273c22f86a06c80cba.tar.gz android_external_libpng-b50c217251b086440efcdb273c22f86a06c80cba.tar.bz2 android_external_libpng-b50c217251b086440efcdb273c22f86a06c80cba.zip | |
Update libpng to version 1.6.3
(cherry picked from commit ca2bf81b02c99afa2e76b3b2c6eb232c239221e0)
Change-Id: I313493fa630be9812e503ae24820b2923ed717f3
Diffstat (limited to 'scripts/makefile.ne12bsd')
| -rw-r--r-- | scripts/makefile.ne12bsd | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/scripts/makefile.ne12bsd b/scripts/makefile.ne12bsd index d4687da..9edc266 100644 --- a/scripts/makefile.ne12bsd +++ b/scripts/makefile.ne12bsd @@ -13,15 +13,15 @@ LOCALBASE?=/usr/local LIBDIR= ${LOCALBASE}/lib MANDIR= ${LOCALBASE}/man -INCSDIR=${LOCALBASE}/include/libpng12 +INCSDIR=${LOCALBASE}/include/libpng16 -LIB= png12 +LIB= png16 SHLIB_MAJOR= 0 -SHLIB_MINOR= 1.2.46 +SHLIB_MINOR= 1.6.3 SRCS= png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \ pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \ pngwtran.c pngmem.c pngerror.c pngpread.c -INCS= png.h pngconf.h +INCS= png.h pngconf.h pnglibconf.h MAN= libpng.3 libpngpf.3 png.5 CPPFLAGS+=-I${.CURDIR} @@ -29,13 +29,14 @@ CPPFLAGS+=-I${.CURDIR} # We should be able to do something like this instead of the manual # uncommenting, but it core dumps for me at the moment: # .if ${MACHINE_ARCH} == "i386" -# CPPFLAGS+=-DPNG_THREAD_UNSAFE_OK # MKLINT= no -# .else - CPPFLAGS+=-DPNG_NO_MMX_CODE # .endif -CLEANFILES+=pngtest.o pngtest +CLEANFILES+=pngtest.o pngtest pnglibconf.h + +# see scripts/pnglibconf.mak for more options +pnglibconf.h: scripts/pnglibconf.h.prebuilt + cp scripts/pnglibconf.h.prebuilt $@ pngtest.o: pngtest.c ${CC} -c ${CPPFLAGS} ${CFLAGS} ${.ALLSRC} -o ${.TARGET} |