Skip to content

Commit 72c558e

Browse files
filipe-lemosminggo
authored andcommitted
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.
1 parent 487490d commit 72c558e

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

build/cocos2d_libs.xcodeproj/project.pbxproj

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -17773,21 +17773,21 @@
1777317773
HEADER_SEARCH_PATHS = "";
1777417774
IPHONEOS_DEPLOYMENT_TARGET = 9.1;
1777517775
LIBRARY_SEARCH_PATHS = (
17776-
"\"$(SRCROOT)/../external/png/prebuilt/ios\"",
17777-
"\"$(SRCROOT)/../external/jpeg/prebuilt/ios\"",
17778-
"\"$(SRCROOT)/../external/tiff/prebuilt/ios\"",
17779-
"\"$(SRCROOT)/../external/webp/prebuilt/ios\"",
17780-
"\"$(SRCROOT)/../external/freetype2/prebuilt/ios\"",
17781-
"\"$(SRCROOT)/../external/curl/prebuilt/ios\"",
17782-
"\"$(SRCROOT)/../external/websockets/prebuilt/ios\"",
17783-
"\"$(SRCROOT)/../external/chipmunk/prebuilt/ios\"",
17784-
"\"$(SRCROOT)/../external/openssl/prebuilt/ios\"",
17776+
"\"$(SRCROOT)/../external/png/prebuilt/tvos\"",
17777+
"\"$(SRCROOT)/../external/jpeg/prebuilt/tvos\"",
17778+
"\"$(SRCROOT)/../external/tiff/prebuilt/tvos\"",
17779+
"\"$(SRCROOT)/../external/webp/prebuilt/tvos\"",
17780+
"\"$(SRCROOT)/../external/freetype2/prebuilt/tvos\"",
17781+
"\"$(SRCROOT)/../external/curl/prebuilt/tvos\"",
17782+
"\"$(SRCROOT)/../external/websockets/prebuilt/tvos\"",
17783+
"\"$(SRCROOT)/../external/chipmunk/prebuilt/tvos\"",
17784+
"\"$(SRCROOT)/../external/openssl/prebuilt/tvos\"",
1778517785
);
1778617786
OTHER_LDFLAGS = "-llibsql3";
1778717787
PRODUCT_NAME = "$(TARGET_NAME)";
1778817788
SDKROOT = appletvos;
1778917789
TVOS_DEPLOYMENT_TARGET = 9.0;
17790-
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";
17790+
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";
1779117791
};
1779217792
name = Debug;
1779317793
};
@@ -17807,21 +17807,21 @@
1780717807
HEADER_SEARCH_PATHS = "";
1780817808
IPHONEOS_DEPLOYMENT_TARGET = 9.1;
1780917809
LIBRARY_SEARCH_PATHS = (
17810-
"\"$(SRCROOT)/../external/png/prebuilt/ios\"",
17811-
"\"$(SRCROOT)/../external/jpeg/prebuilt/ios\"",
17812-
"\"$(SRCROOT)/../external/tiff/prebuilt/ios\"",
17813-
"\"$(SRCROOT)/../external/webp/prebuilt/ios\"",
17814-
"\"$(SRCROOT)/../external/freetype2/prebuilt/ios\"",
17815-
"\"$(SRCROOT)/../external/curl/prebuilt/ios\"",
17816-
"\"$(SRCROOT)/../external/websockets/prebuilt/ios\"",
17817-
"\"$(SRCROOT)/../external/chipmunk/prebuilt/ios\"",
17818-
"\"$(SRCROOT)/../external/openssl/prebuilt/ios\"",
17810+
"\"$(SRCROOT)/../external/png/prebuilt/tvos\"",
17811+
"\"$(SRCROOT)/../external/jpeg/prebuilt/tvos\"",
17812+
"\"$(SRCROOT)/../external/tiff/prebuilt/tvos\"",
17813+
"\"$(SRCROOT)/../external/webp/prebuilt/tvos\"",
17814+
"\"$(SRCROOT)/../external/freetype2/prebuilt/tvos\"",
17815+
"\"$(SRCROOT)/../external/curl/prebuilt/tvos\"",
17816+
"\"$(SRCROOT)/../external/websockets/prebuilt/tvos\"",
17817+
"\"$(SRCROOT)/../external/chipmunk/prebuilt/tvos\"",
17818+
"\"$(SRCROOT)/../external/openssl/prebuilt/tvos\"",
1781917819
);
1782017820
OTHER_LDFLAGS = "-llibsql3";
1782117821
PRODUCT_NAME = "$(TARGET_NAME)";
1782217822
SDKROOT = appletvos;
1782317823
TVOS_DEPLOYMENT_TARGET = 9.0;
17824-
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";
17824+
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";
1782517825
};
1782617826
name = Release;
1782717827
};

external/config.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"version": "v3-deps-130",
3-
"zip_file_size": "112893722",
2+
"version": "v3-deps-131",
3+
"zip_file_size": "136974507",
44
"repo_name": "cocos2d-x-3rd-party-libs-bin",
55
"repo_parent": "https://github.com/cocos2d/",
66
"move_dirs": {

0 commit comments

Comments
 (0)