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

Merge pull request #1538 from player-03/programPath

Browse Source 
Allow running native apps from other directories.
This commit is contained in:
player-03
2022-10-10 13:35:54 -04:00
committed by GitHub
parent fe6f1db7fd 0e6bfa830b
commit 76e1df8ef4
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/lime/system/CFFI.hx
View File

@@ -1,6 +1,7 @@
package lime.system;
#if (!lime_doc_gen || lime_cffi)
import haxe.io.Path;
import lime._internal.macros.CFFIMacro;
#if (sys && !macro)
import sys.io.Process;
@@ -135,11 +136,16 @@ class CFFI
__moduleNames.set(library, library);
result = __tryLoad("./" + library, library, method, args);
var programPath:String = ".";
#if sys
programPath = Path.directory(Sys.programPath());
#end
result = __tryLoad(programPath + "/" + library, library, method, args);
if (result == null)
{
result = __tryLoad(".\\" + library, library, method, args);
result = __tryLoad(programPath + "\\" + library, library, method, args);
}
if (result == null)

3
templates/haxe/ManifestResources.hx
View File

@@ -1,6 +1,7 @@
package;
import haxe.io.Bytes;
import haxe.io.Path;
import lime.utils.AssetBundle;
import lime.utils.AssetLibrary;
import lime.utils.AssetManifest;
@@ -60,6 +61,8 @@ import sys.FileSystem;
rootPath = "";
#elseif console
rootPath = lime.system.System.applicationDirectory;
#elseif sys
rootPath = Path.directory(Sys.programPath()) + "/";
#else
rootPath = "./";
#end