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

Revert "Move native DLL directory to 'lib'"

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/CommandLineTools.hx
View File

@@ -439,11 +439,11 @@ class CommandLineTools
if (FileSystem.exists("tools.n"))
{
path = Path.combine(Sys.getCwd(), "../lib/");
path = Path.combine(Sys.getCwd(), "../ndll/");
}
else if (FileSystem.exists("run.n"))
{
path = Sys.getCwd() + "/lib/";
path = Sys.getCwd() + "/ndll/";
}
if (path == "")
@@ -456,21 +456,9 @@ class CommandLineTools
{
var line = StringTools.trim(process.stdout.readLine());
if (line.length > 0 && !StringTools.startsWith(line, "-"))
if (StringTools.startsWith(line, "-L "))
{
path = StringTools.trim(line);
if (FileSystem.exists(Path.combine(path, "../lib")))
{
path = Path.combine(path, "../lib");
}
else
{
path = Path.combine(path, "../ndll");
}
if (!StringTools.endsWith(path, "/"))
{
path += "/";
}
path = StringTools.trim(line.substr(2));
break;
}
}