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

Move native DLL directory to 'lib'

Browse Source
This commit is contained in:
Joshua Granick
2019-04-11 12:09:26 -07:00
parent b78837602e
commit 20f626dab8
15 changed files with 55 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
tools/CommandLineTools.hx
View File

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