Fixed macro not copying DLLs properly.

SanicBTW · May 29, 2024 · adfb4b0 · adfb4b0
1 parent ee35ee6
commit adfb4b0
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/source/webview/Macros.hx b/source/webview/Macros.hx
@@ -1,11 +1,11 @@
 package webview;
 
-import haxe.macro.Compiler;
+import sys.io.File;
 import haxe.io.Path;
 import sys.FileSystem;
-import sys.io.File;
 import haxe.macro.Expr;
 import haxe.macro.Context;
+import haxe.macro.Compiler;
 
 using haxe.macro.PositionTools;
 
@@ -14,10 +14,14 @@ class Macros
     // This macro will only run on Windows targets to copy over the EmbeddedBrowserWebView DLL
     macro public static function copyDLLs():Array<Field>
     {
+        var libDir:String = Path.directory(FileSystem.fullPath(Context.currentPos().getInfos().file)); // HxWebView/source/webview
+        libDir = Path.directory(libDir); // HxWebView/source
+        libDir = Path.directory(libDir); // HxWebView
+
         Context.onAfterGenerate(() ->
         {
             var arch:String = #if HXCPP_M64 "x64" #else "x86" #end;
-            var dllsPath:String = Path.join([Sys.getCwd(), "internal", "windows", "EBWebView", arch]);
+            var dllsPath:String = Path.join([libDir, "internal", "windows", "EBWebView", arch]);
             if (FileSystem.exists(dllsPath))
             {
                 dllsPath = Path.join([dllsPath, "EmbeddedBrowserWebView.dll"]);