From 72c558e070f5f5926150f809e91e65b9781ec567 Mon Sep 17 00:00:00 2001 From: pyrosphere Date: Fri, 14 Apr 2017 02:35:09 +0100 Subject: [PATCH] Change library/header search paths of external libraries for tvOS. (#17547) * Fixes cocos2d build for tvOS. * Support for the tvOS micro gamepad as a CCController. * Changes library/header search paths for external libraries from iOS to tvOS. * Updated 3rd party libraries. --- build/cocos2d_libs.xcodeproj/project.pbxproj | 40 ++++++++++---------- external/config.json | 4 +- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/build/cocos2d_libs.xcodeproj/project.pbxproj b/build/cocos2d_libs.xcodeproj/project.pbxproj index 6253309005..79f9df23bf 100644 --- a/build/cocos2d_libs.xcodeproj/project.pbxproj +++ b/build/cocos2d_libs.xcodeproj/project.pbxproj @@ -17773,21 +17773,21 @@ HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 9.1; LIBRARY_SEARCH_PATHS = ( - "\"$(SRCROOT)/../external/png/prebuilt/ios\"", - "\"$(SRCROOT)/../external/jpeg/prebuilt/ios\"", - "\"$(SRCROOT)/../external/tiff/prebuilt/ios\"", - "\"$(SRCROOT)/../external/webp/prebuilt/ios\"", - "\"$(SRCROOT)/../external/freetype2/prebuilt/ios\"", - "\"$(SRCROOT)/../external/curl/prebuilt/ios\"", - "\"$(SRCROOT)/../external/websockets/prebuilt/ios\"", - "\"$(SRCROOT)/../external/chipmunk/prebuilt/ios\"", - "\"$(SRCROOT)/../external/openssl/prebuilt/ios\"", + "\"$(SRCROOT)/../external/png/prebuilt/tvos\"", + "\"$(SRCROOT)/../external/jpeg/prebuilt/tvos\"", + "\"$(SRCROOT)/../external/tiff/prebuilt/tvos\"", + "\"$(SRCROOT)/../external/webp/prebuilt/tvos\"", + "\"$(SRCROOT)/../external/freetype2/prebuilt/tvos\"", + "\"$(SRCROOT)/../external/curl/prebuilt/tvos\"", + "\"$(SRCROOT)/../external/websockets/prebuilt/tvos\"", + "\"$(SRCROOT)/../external/chipmunk/prebuilt/tvos\"", + "\"$(SRCROOT)/../external/openssl/prebuilt/tvos\"", ); OTHER_LDFLAGS = "-llibsql3"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; TVOS_DEPLOYMENT_TARGET = 9.0; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/freetype2/include/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/webp/include/ios $(SRCROOT)/../external/tiff/include/ios $(SRCROOT)/../external/jpeg/include/ios $(SRCROOT)/../external/png/include/ios $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/freetype2/include/ios/freetype2 $(SRCROOT)/../external/openssl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/freetype2/include/tvos $(SRCROOT)/../external/curl/include/tvos $(SRCROOT)/../external/webp/include/tvos $(SRCROOT)/../external/tiff/include/tvos $(SRCROOT)/../external/jpeg/include/tvos $(SRCROOT)/../external/png/include/tvos $(SRCROOT)/../external/websockets/include/tvos $(SRCROOT)/../external/freetype2/include/tvos/freetype2 $(SRCROOT)/../external/openssl/include/tvos"; }; name = Debug; }; @@ -17807,21 +17807,21 @@ HEADER_SEARCH_PATHS = ""; IPHONEOS_DEPLOYMENT_TARGET = 9.1; LIBRARY_SEARCH_PATHS = ( - "\"$(SRCROOT)/../external/png/prebuilt/ios\"", - "\"$(SRCROOT)/../external/jpeg/prebuilt/ios\"", - "\"$(SRCROOT)/../external/tiff/prebuilt/ios\"", - "\"$(SRCROOT)/../external/webp/prebuilt/ios\"", - "\"$(SRCROOT)/../external/freetype2/prebuilt/ios\"", - "\"$(SRCROOT)/../external/curl/prebuilt/ios\"", - "\"$(SRCROOT)/../external/websockets/prebuilt/ios\"", - "\"$(SRCROOT)/../external/chipmunk/prebuilt/ios\"", - "\"$(SRCROOT)/../external/openssl/prebuilt/ios\"", + "\"$(SRCROOT)/../external/png/prebuilt/tvos\"", + "\"$(SRCROOT)/../external/jpeg/prebuilt/tvos\"", + "\"$(SRCROOT)/../external/tiff/prebuilt/tvos\"", + "\"$(SRCROOT)/../external/webp/prebuilt/tvos\"", + "\"$(SRCROOT)/../external/freetype2/prebuilt/tvos\"", + "\"$(SRCROOT)/../external/curl/prebuilt/tvos\"", + "\"$(SRCROOT)/../external/websockets/prebuilt/tvos\"", + "\"$(SRCROOT)/../external/chipmunk/prebuilt/tvos\"", + "\"$(SRCROOT)/../external/openssl/prebuilt/tvos\"", ); OTHER_LDFLAGS = "-llibsql3"; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; TVOS_DEPLOYMENT_TARGET = 9.0; - USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/freetype2/include/ios $(SRCROOT)/../external/curl/include/ios $(SRCROOT)/../external/webp/include/ios $(SRCROOT)/../external/tiff/include/ios $(SRCROOT)/../external/jpeg/include/ios $(SRCROOT)/../external/png/include/ios $(SRCROOT)/../external/websockets/include/ios $(SRCROOT)/../external/freetype2/include/ios/freetype2 $(SRCROOT)/../external/openssl/include/ios"; + USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/../external/freetype2/include/tvos $(SRCROOT)/../external/curl/include/tvos $(SRCROOT)/../external/webp/include/tvos $(SRCROOT)/../external/tiff/include/tvos $(SRCROOT)/../external/jpeg/include/tvos $(SRCROOT)/../external/png/include/tvos $(SRCROOT)/../external/websockets/include/tvos $(SRCROOT)/../external/freetype2/include/tvos/freetype2 $(SRCROOT)/../external/openssl/include/tvos"; }; name = Release; }; diff --git a/external/config.json b/external/config.json index bb91389eaf..6b971da852 100644 --- a/external/config.json +++ b/external/config.json @@ -1,6 +1,6 @@ { - "version": "v3-deps-130", - "zip_file_size": "112893722", + "version": "v3-deps-131", + "zip_file_size": "136974507", "repo_name": "cocos2d-x-3rd-party-libs-bin", "repo_parent": "https://github.com/cocos2d/", "move_dirs": {