Skip to content

Commit 83c31a8

Browse files
committed
add png 1.6.12
1 parent 31c17c3 commit 83c31a8

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

build_ios.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,10 +80,10 @@ fi
8080
info "Building cocos2d-x third party libraries for iOS"
8181

8282
if [ "$PLATFORM" = "Simulator" ]; then
83-
TARGET="${ARCH}-apple-darwin11"
83+
TARGET="${ARCH}-apple-darwin14"
8484
OPTIM="-O3 -g"
8585
else
86-
TARGET="arm-apple-darwin11"
86+
TARGET="arm-apple-darwin14"
8787
OPTIM="-O3 -g"
8888
fi
8989

@@ -190,7 +190,7 @@ else
190190
fi
191191

192192
# # FIXME: add more convenient
193-
../bootstrap --build=x86_64-apple-darwin11 --host=${TARGET} --prefix=${COCOSROOT}/contrib/${TARGET}-${ARCH} \
193+
../bootstrap --build=x86_64-apple-darwin14 --host=${TARGET} --prefix=${COCOSROOT}/contrib/${TARGET}-${ARCH} \
194194
--disable-lua \
195195
--disable-freetype2 \
196196
--enable-png > ${out}

contrib/src/png/SHA512SUMS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
8820d2741ec2bd75a1ce984e72b56c888037f2db libpng-1.6.2.tar.xz
1+
c3d54f9ab683d63218361487269380fb8e0cf3b6 libpng-1.6.12.tar.xz

contrib/src/png/rules.mak

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# PNG
2-
PNG_VERSION := 1.6.2
2+
PNG_VERSION := 1.6.12
33
PNG_URL := $(SF)/libpng/libpng16/$(PNG_VERSION)/libpng-$(PNG_VERSION).tar.xz
44

55
PKGS += png
@@ -18,10 +18,10 @@ png: libpng-$(PNG_VERSION).tar.xz .sum-png
1818

1919

2020

21-
DEPS_png = zlib $(DEPS_zlib)
21+
# DEPS_png = zlib $(DEPS_zlib)
2222

2323
.png: png
2424
$(RECONF)
25-
cd $< && $(HOSTVARS) ./configure $(HOSTCONF)
25+
cd $< && $(HOSTVARS) ./configure --enable-arm-neon=api $(HOSTCONF)
2626
cd $< && $(MAKE) install
2727
touch $@

0 commit comments

Comments
 (0)