kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge commit 'd48e7dbc2d1072fec69998fd163ea099702b1684' into develop

Browse Source 
* commit 'd48e7dbc2d1072fec69998fd163ea099702b1684':
  Allow to include TBD dependencies in XML for tvOS
This commit is contained in:
Federico Bricker
2016-05-31 12:52:00 -03:00
parent fc93259125 d48e7dbc2d
commit 15875bce73
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
lime/tools/platforms/TVOSPlatform.hx
View File

@@ -132,7 +132,7 @@ class TVOSPlatform extends PlatformTarget {
for (dependency in project.dependencies) {
if (!StringTools.endsWith (dependency.name, ".framework") && !StringTools.endsWith (dependency.path, ".framework")) {
if (!StringTools.endsWith (dependency.name, ".framework") && !StringTools.endsWith (dependency.name, ".tbd") && !StringTools.endsWith (dependency.path, ".framework")) {
if (dependency.path != "") {
@@ -254,16 +254,25 @@ class TVOSPlatform extends PlatformTarget {
var name = null;
var path = null;
var fileType = null;
if (Path.extension (dependency.name) == "framework") {
name = dependency.name;
path = "/System/Library/Frameworks/" + dependency.name;
fileType = "wrapper.framework";
} else if (Path.extension (dependency.name) == "tbd") {
name = dependency.name;
path = "usr/lib/" + dependency.name;
fileType = "sourcecode.text-based-dylib-definition";
} else if (Path.extension (dependency.path) == "framework") {
name = Path.withoutDirectory (dependency.path);
path = PathHelper.tryFullPath (dependency.path);
fileType = "wrapper.framework";
}
@@ -275,7 +284,7 @@ class TVOSPlatform extends PlatformTarget {
ArrayHelper.addUnique (context.frameworkSearchPaths, Path.directory (path));
context.ADDL_PBX_BUILD_FILE += " " + frameworkID + " /* " + name + " in Frameworks */ = {isa = PBXBuildFile; fileRef = " + fileID + " /* " + name + " */; };\n";
context.ADDL_PBX_FILE_REFERENCE += " " + fileID + " /* " + name + " */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = \"" + name + "\"; path = \"" + path + "\"; sourceTree = SDKROOT; };\n";
context.ADDL_PBX_FILE_REFERENCE += " " + fileID + " /* " + name + " */ = {isa = PBXFileReference; lastKnownFileType = \"" + fileType + "\"; name = \"" + name + "\"; path = \"" + path + "\"; sourceTree = SDKROOT; };\n";
context.ADDL_PBX_FRAMEWORKS_BUILD_PHASE += " " + frameworkID + " /* " + name + " in Frameworks */,\n";
context.ADDL_PBX_FRAMEWORK_GROUP += " " + fileID + " /* " + name + " */,\n";