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

Add WinRT 64-bit support to tools

Browse Source
This commit is contained in:
Joshua Granick
2018-11-27 12:24:23 -08:00
parent e7c38e55f6
commit 465aa7418d
1 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tools/platforms/WindowsPlatform.hx
View File

@@ -84,7 +84,7 @@ class WindowsPlatform extends PlatformTarget {
for (architecture in project.architectures) {
if (targetType == "cpp" && architecture == Architecture.X64) {
if ((targetType == "cpp" || targetType == "winrt") && architecture == Architecture.X64) {
is64 = true;
@@ -174,7 +174,7 @@ class WindowsPlatform extends PlatformTarget {
for (ndll in project.ndlls) {
ProjectHelper.copyLibrary (project, ndll, "WinRT", "", (ndll.haxelib != null && (ndll.haxelib.name == "hxcpp" || ndll.haxelib.name == "hxlibc")) ? ".dll" : ".ndll", applicationDirectory, project.debug, null);
ProjectHelper.copyLibrary (project, ndll, "WinRT" + (is64 ? "64" : ""), "", (ndll.haxelib != null && (ndll.haxelib.name == "hxcpp" || ndll.haxelib.name == "hxlibc")) ? ".dll" : ".ndll", applicationDirectory, project.debug, null);
}
@@ -270,6 +270,20 @@ class WindowsPlatform extends PlatformTarget {
haxeArgs.push ("winrt");
flags.push ("-Dwinrt");
// TODO: ARM support
if (is64) {
haxeArgs.push ("-D");
haxeArgs.push ("HXCPP_M64");
flags.push ("-DHXCPP_M64");
} else {
flags.push ("-DHXCPP_M32");
}
if (!project.environment.exists ("SHOW_CONSOLE")) {
haxeArgs.push ("-D");
@@ -467,7 +481,7 @@ class WindowsPlatform extends PlatformTarget {
var commands = [];
if (!targetFlags.exists ("64") && (command == "rebuild" || System.hostArchitecture == X86 || targetType != "cpp")) {
if (!targetFlags.exists ("64") && (command == "rebuild" || System.hostArchitecture == X86 || (targetType != "cpp" && targetType != "winrt"))) {
if (targetFlags.exists ("winrt")) {
@@ -485,7 +499,7 @@ class WindowsPlatform extends PlatformTarget {
// as previous Windows builds. For now, force -64 to be done last
// so that it can be debugged in a default "rebuild"
if (!targetFlags.exists ("32") && System.hostArchitecture == X64 && (command != "rebuild" || targetType == "cpp")) {
if (!targetFlags.exists ("32") && System.hostArchitecture == X64 && (command != "rebuild" || targetType == "cpp" || targetType == "winrt")) {
if (targetFlags.exists ("winrt")) {