Merge pull request #1 from pyrosphere/tvos

Libs for tvOS
cocos2d · Oct 9, 2015 · 5ec0e4f · 5ec0e4f
2 parents ea13ec2 + 66fec5f
commit 5ec0e4f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/contrib/src/main.mak b/contrib/src/main.mak
@@ -162,6 +162,10 @@ RANLIB=xcrun ranlib
 # CXXCPP=xcrun c++ -E
 endif
 
+ifdef HAVE_TVOS
+EXTRA_CFLAGS += -fembed-bitcode
+endif
+
 ifdef HAVE_WIN32
 ifneq ($(shell $(CC) $(CFLAGS) -E -dM -include _mingw.h - < /dev/null | grep -E __MINGW64_VERSION_MAJOR),)
 HAVE_MINGW_W64 := 1

diff --git a/contrib/src/webp/SHA512SUMS b/contrib/src/webp/SHA512SUMS
@@ -1 +1 @@
-0213f92cc9a4303b9ae51ffbc72c083880bcd5c1d8b2f92fe514e0a11167925934d01155f89dc9e571dee51293ea26f8b8b486c5b980db20e921d653320a4d13  libwebp-0.4.2.tar.gz
+4975c055e94668cc3b8198443d141de91db6c9d99a79164631854b9b91eea2d9d92aefa361cb8e0fa8963a3deeb5ba6cc6ab55db1d7b038ae495b7e7cf5b2572  libwebp-0.4.3.tar.gz
diff --git a/contrib/src/webp/rules.mak b/contrib/src/webp/rules.mak
@@ -1,6 +1,6 @@
 # webp
 
-WEBP_VERSION := 0.4.2
+WEBP_VERSION := 0.4.3
 WEBP_URL := http://downloads.webmproject.org/releases/webp/libwebp-$(WEBP_VERSION).tar.gz
 
 $(TARBALLS)/libwebp-$(WEBP_VERSION).tar.gz:
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		0213f92cc9a4303b9ae51ffbc72c083880bcd5c1d8b2f92fe514e0a11167925934d01155f89dc9e571dee51293ea26f8b8b486c5b980db20e921d653320a4d13 libwebp-0.4.2.tar.gz
		4975c055e94668cc3b8198443d141de91db6c9d99a79164631854b9b91eea2d9d92aefa361cb8e0fa8963a3deeb5ba6cc6ab55db1d7b038ae495b7e7cf5b2572 libwebp-0.4.3.tar.gz