Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
pyrosphere 2017-04-14 02:35:09 +01:00 committed by minggo
parent 487490def0
commit 72c558e070
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
build/cocos2d_libs.xcodeproj/project.pbxproj
View File

@ -17773,21 +17773,21 @@
HEADER_SEARCH_PATHS = ""; HEADER_SEARCH_PATHS = "";
IPHONEOS_DEPLOYMENT_TARGET = 9.1; IPHONEOS_DEPLOYMENT_TARGET = 9.1;
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
"\"$(SRCROOT)/../external/png/prebuilt/ios\"", "\"$(SRCROOT)/../external/png/prebuilt/tvos\"",
"\"$(SRCROOT)/../external/jpeg/prebuilt/ios\"", "\"$(SRCROOT)/../external/jpeg/prebuilt/tvos\"",
"\"$(SRCROOT)/../external/tiff/prebuilt/ios\"", "\"$(SRCROOT)/../external/tiff/prebuilt/tvos\"",
"\"$(SRCROOT)/../external/webp/prebuilt/ios\"", "\"$(SRCROOT)/../external/webp/prebuilt/tvos\"",
"\"$(SRCROOT)/../external/freetype2/prebuilt/ios\"", "\"$(SRCROOT)/../external/freetype2/prebuilt/tvos\"",
"\"$(SRCROOT)/../external/curl/prebuilt/ios\"", "\"$(SRCROOT)/../external/curl/prebuilt/tvos\"",
"\"$(SRCROOT)/../external/websockets/prebuilt/ios\"", "\"$(SRCROOT)/../external/websockets/prebuilt/tvos\"",
"\"$(SRCROOT)/../external/chipmunk/prebuilt/ios\"", "\"$(SRCROOT)/../external/chipmunk/prebuilt/tvos\"",
"\"$(SRCROOT)/../external/openssl/prebuilt/ios\"", "\"$(SRCROOT)/../external/openssl/prebuilt/tvos\"",
); );
OTHER_LDFLAGS = "-llibsql3"; OTHER_LDFLAGS = "-llibsql3";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos; SDKROOT = appletvos;
TVOS_DEPLOYMENT_TARGET = 9.0; 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; name = Debug;
}; };
@ -17807,21 +17807,21 @@
HEADER_SEARCH_PATHS = ""; HEADER_SEARCH_PATHS = "";
IPHONEOS_DEPLOYMENT_TARGET = 9.1; IPHONEOS_DEPLOYMENT_TARGET = 9.1;
LIBRARY_SEARCH_PATHS = ( LIBRARY_SEARCH_PATHS = (
"\"$(SRCROOT)/../external/png/prebuilt/ios\"", "\"$(SRCROOT)/../external/png/prebuilt/tvos\"",
"\"$(SRCROOT)/../external/jpeg/prebuilt/ios\"", "\"$(SRCROOT)/../external/jpeg/prebuilt/tvos\"",
"\"$(SRCROOT)/../external/tiff/prebuilt/ios\"", "\"$(SRCROOT)/../external/tiff/prebuilt/tvos\"",
"\"$(SRCROOT)/../external/webp/prebuilt/ios\"", "\"$(SRCROOT)/../external/webp/prebuilt/tvos\"",
"\"$(SRCROOT)/../external/freetype2/prebuilt/ios\"", "\"$(SRCROOT)/../external/freetype2/prebuilt/tvos\"",
"\"$(SRCROOT)/../external/curl/prebuilt/ios\"", "\"$(SRCROOT)/../external/curl/prebuilt/tvos\"",
"\"$(SRCROOT)/../external/websockets/prebuilt/ios\"", "\"$(SRCROOT)/../external/websockets/prebuilt/tvos\"",
"\"$(SRCROOT)/../external/chipmunk/prebuilt/ios\"", "\"$(SRCROOT)/../external/chipmunk/prebuilt/tvos\"",
"\"$(SRCROOT)/../external/openssl/prebuilt/ios\"", "\"$(SRCROOT)/../external/openssl/prebuilt/tvos\"",
); );
OTHER_LDFLAGS = "-llibsql3"; OTHER_LDFLAGS = "-llibsql3";
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = appletvos; SDKROOT = appletvos;
TVOS_DEPLOYMENT_TARGET = 9.0; 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; name = Release;
}; };

4
external/config.json vendored
View File

@ -1,6 +1,6 @@
{ {
"version": "v3-deps-130", "version": "v3-deps-131",
"zip_file_size": "112893722", "zip_file_size": "136974507",
"repo_name": "cocos2d-x-3rd-party-libs-bin", "repo_name": "cocos2d-x-3rd-party-libs-bin",
"repo_parent": "https://github.com/cocos2d/", "repo_parent": "https://github.com/cocos2d/",
"move_dirs": { "move_dirs": {