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

Merge pull request #545 from ibilon/tool

Browse Source 
Fix desktop cross build
This commit is contained in:
Joshua Granick
2015-08-16 08:19:38 -07:00
parent 7db169c2ed 8db29b8972
commit 36f9540206
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
lime/project/ProjectXMLParser.hx
View File

@@ -7,6 +7,7 @@ import lime.tools.helpers.ArrayHelper;
import lime.tools.helpers.LogHelper;
import lime.tools.helpers.ObjectHelper;
import lime.tools.helpers.PathHelper;
import lime.tools.helpers.PlatformHelper;
import lime.tools.helpers.StringMapHelper;
import lime.project.Asset;
import lime.project.AssetType;
@@ -78,7 +79,7 @@ class ProjectXMLParser extends HXProject {
}
if (targetFlags.exists ("neko")) {
if (targetFlags.exists ("neko") || (platformType == DESKTOP && target != PlatformHelper.hostPlatform)) {
defines.set ("native", "1");
defines.set ("neko", "1");

6
lime/tools/platforms/MacPlatform.hx
View File

@@ -109,8 +109,8 @@ class MacPlatform extends PlatformTarget {
if (targetType == "neko") {
ProcessHelper.runCommand ("", "haxe", [ hxml ]);
NekoHelper.createExecutable (project.templatePaths, "Mac" + (is64 ? "64" : ""), targetDirectory + "/obj/ApplicationMain.n", executablePath);
NekoHelper.copyLibraries (project.templatePaths, "Mac" + (is64 ? "64" : ""), executableDirectory);
NekoHelper.createExecutable (project.templatePaths, "mac" + (is64 ? "64" : ""), targetDirectory + "/obj/ApplicationMain.n", executablePath);
NekoHelper.copyLibraries (project.templatePaths, "mac" + (is64 ? "64" : ""), executableDirectory);
} else if (targetType == "java") {
@@ -358,4 +358,4 @@ class MacPlatform extends PlatformTarget {
@ignore public override function uninstall ():Void {}
}
}