Revert "Move native DLL directory to 'lib'"

This reverts commit 20f626dab8.
This commit is contained in:
Joshua Granick
2019-06-24 10:37:22 -07:00
parent f637bdd8ef
commit ef154d2916
15 changed files with 57 additions and 55 deletions

View File

@@ -17,15 +17,30 @@ class RunScript
toolsDirectory = Path.combine(limeDirectory, "../tools");
}
/*var extendedToolsDirectory = Haxelib.getPath (new Haxelib ("lime-extended"), false);
if (extendedToolsDirectory != null && extendedToolsDirectory != "") {
var buildScript = File.getContent (Path.combine (extendedToolsDirectory, "tools.hxml"));
buildScript = StringTools.replace (buildScript, "\r\n", "\n");
buildScript = StringTools.replace (buildScript, "\n", " ");
System.runCommand (toolsDirectory, "haxe", buildScript.split (" "));
} else {*/
System.runCommand(toolsDirectory, "haxe", ["tools.hxml"]);
// }
if (!rebuildBinaries) return;
var platforms = ["Windows", "Mac", "Mac64", "Linux", "Linux64"];
for (platform in platforms)
{
var source = Path.combine(limeDirectory, "lib/" + platform + "/lime.ndll");
var source = Path.combine(limeDirectory, "ndll/" + platform + "/lime.ndll");
// var target = Path.combine (toolsDirectory, "ndll/" + platform + "/lime.ndll");
if (!FileSystem.exists(source))
{
@@ -76,6 +91,10 @@ class RunScript
Log.warn("", "Source path \"" + source + "\" does not exist");
}
}
else
{
// System.copyIfNewer (source, target);
}
}
}