aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/makefile.solaris-x86
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-03-09 11:52:12 -0700
committerThe Android Open Source Project <initial-contribution@android.com>2009-03-09 11:52:12 -0700
commit4215dd1533c56e1a89ae6f1d6ea68677fac27fda (patch)
tree99318267166103602095f7af976be5b7f0e25d04 /scripts/makefile.solaris-x86
parent893912bfc2683463dc3e2c445336752d012563d3 (diff)
downloadexternal_libpng-4215dd1533c56e1a89ae6f1d6ea68677fac27fda.zip
external_libpng-4215dd1533c56e1a89ae6f1d6ea68677fac27fda.tar.gz
external_libpng-4215dd1533c56e1a89ae6f1d6ea68677fac27fda.tar.bz2
auto import from //branches/cupcake/...@137197
Diffstat (limited to 'scripts/makefile.solaris-x86')
-rw-r--r--scripts/makefile.solaris-x866
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/makefile.solaris-x86 b/scripts/makefile.solaris-x86
index 03c1de4..338d49d 100644
--- a/scripts/makefile.solaris-x86
+++ b/scripts/makefile.solaris-x86
@@ -1,5 +1,5 @@
# 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
@@ -8,7 +8,7 @@
# Library name:
LIBNAME = libpng12
PNGMAJ = 0
-PNGMIN = 1.2.29
+PNGMIN = 1.2.35
PNGVER = $(PNGMAJ).$(PNGMIN)
# Shared library names:
@@ -43,7 +43,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