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

Merge pull request #1661 from tobil4sk/mingw-fixes-develop

Browse Source 
Allow cross compiling Windows projects with MinGW
This commit is contained in:
player-03
2024-01-12 13:56:37 -05:00
committed by GitHub
parent b021dbeae7 940eb2083d
commit 24bc9b2495
3 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lime/system/System.hx
View File

@@ -32,9 +32,9 @@ import sys.io.Process;
@:access(lime._internal.backend.native.NativeCFFI) @:access(lime._internal.backend.native.NativeCFFI)
@:access(lime.system.Display) @:access(lime.system.Display)
@:access(lime.system.DisplayMode) @:access(lime.system.DisplayMode)
#if (cpp && windows && !HXCPP_MINGW && !lime_disable_gpu_hint) #if (cpp && windows && !lime_disable_gpu_hint)
@:cppFileCode(' @:cppFileCode('
#if defined(HX_WINDOWS) #if defined(HX_WINDOWS) && !defined(__MINGW32__)
extern "C" { extern "C" {
_declspec(dllexport) unsigned long NvOptimusEnablement = 0x00000001; _declspec(dllexport) unsigned long NvOptimusEnablement = 0x00000001;
_declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1; _declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;

2
src/lime/tools/ProjectXMLParser.hx
View File

@@ -128,7 +128,7 @@ class ProjectXMLParser extends HXProject
{ {
defines.set("native", "1"); defines.set("native", "1");
if (target == Platform.WINDOWS) if (target == Platform.WINDOWS && targetFlags.exists("mingw"))
{ {
defines.set("targetType", "cpp"); defines.set("targetType", "cpp");
defines.set("cpp", "1"); defines.set("cpp", "1");

20
tools/platforms/WindowsPlatform.hx
View File

@@ -138,7 +138,7 @@ class WindowsPlatform extends PlatformTarget
{ {
targetType = "winjs"; targetType = "winjs";
} }
else if (project.targetFlags.exists("neko") || project.target != cast System.hostPlatform) else if (project.targetFlags.exists("neko"))
{ {
targetType = "neko"; targetType = "neko";
} }
@@ -496,6 +496,24 @@ class WindowsPlatform extends PlatformTarget
CPPHelper.compile(project, targetDirectory + "/obj", flags); CPPHelper.compile(project, targetDirectory + "/obj", flags);
System.copyFile(targetDirectory + "/obj/ApplicationMain" + (project.debug ? "-debug" : "") + ".exe", executablePath); System.copyFile(targetDirectory + "/obj/ApplicationMain" + (project.debug ? "-debug" : "") + ".exe", executablePath);
if (project.targetFlags.exists("mingw"))
{
var libraries = ["libwinpthread-1.dll", "libstdc++-6.dll"];
if (is64)
{
libraries.push("libgcc_s_seh-1.dll");
}
else
{
libraries.push("libgcc_s_dw2-1.dll");
}
for (library in libraries)
{
System.copyIfNewer(targetDirectory + "/obj/" + library, Path.combine(applicationDirectory, library));
}
}
} }
else else
{ {