From 171b50f6bb74e11ef08aded9f713f27794cdfd69 Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Wed, 18 Dec 2024 14:40:24 +0000 Subject: [PATCH 1/2] Add missing neko target flag on cross compile Otherwise, we end up with a cpp build instead. For cross compiling with mingw, this breaks the build since no mingw flag is set. --- src/lime/tools/HXProject.hx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/lime/tools/HXProject.hx b/src/lime/tools/HXProject.hx index 26e90bdee3..81a9d02634 100644 --- a/src/lime/tools/HXProject.hx +++ b/src/lime/tools/HXProject.hx @@ -773,6 +773,8 @@ class HXProject extends Script } else { + targetFlags.set("neko", "1"); + defines.set("targetType", "neko"); defines.set("neko", "1"); } From bc2a17bfd1f84d9bf57cf5979465d8c2a875d66b Mon Sep 17 00:00:00 2001 From: Tobiasz Laskowski Date: Wed, 18 Dec 2024 14:44:45 +0000 Subject: [PATCH 2/2] Respect `-cpp` flag for windows cross compile --- src/lime/tools/HXProject.hx | 2 +- tools/platforms/WindowsPlatform.hx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lime/tools/HXProject.hx b/src/lime/tools/HXProject.hx index 81a9d02634..52a6813f21 100644 --- a/src/lime/tools/HXProject.hx +++ b/src/lime/tools/HXProject.hx @@ -765,7 +765,7 @@ class HXProject extends Script defines.set("targetType", "cpp"); defines.set("cpp", "1"); } - else if (target == Platform.WINDOWS && targetFlags.exists("mingw")) + else if (target == Platform.WINDOWS && (targetFlags.exists("cpp") || targetFlags.exists("mingw"))) { defines.set("targetType", "cpp"); defines.set("cpp", "1"); diff --git a/tools/platforms/WindowsPlatform.hx b/tools/platforms/WindowsPlatform.hx index 9cf73d685f..a3019c0aed 100644 --- a/tools/platforms/WindowsPlatform.hx +++ b/tools/platforms/WindowsPlatform.hx @@ -580,7 +580,7 @@ class WindowsPlatform extends PlatformTarget System.copyFile(targetDirectory + "/obj/ApplicationMain" + (project.debug ? "-debug" : "") + ".exe", executablePath); - if (project.targetFlags.exists("mingw")) + if (project.defines.exists("mingw")) { var libraries = ["libwinpthread-1.dll", "libstdc++-6.dll"]; if (is64)