From 1471d8a60df9d0b0d8c4aca49709a196c4a22812 Mon Sep 17 00:00:00 2001
From: Apprentice-Alchemist
 <53486764+Apprentice-Alchemist@users.noreply.github.com>
Date: Fri, 15 Apr 2022 10:49:40 +0200
Subject: [PATCH] Try to fix CI.

---
 .github/workflows/main.yml         | 36 ++++++++++++++++++++++++++++++
 tools/platforms/WindowsPlatform.hx |  8 +++++--
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index b37cb5804..3768bd187 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -66,6 +66,13 @@ jobs:
             !**/.gitignore
           if-no-files-found: error
 
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Linux64-Hashlink
+          path: |
+            templates/bin/hl/linux
+          if-no-files-found: error
+
   macos-ndll:
     runs-on: macos-10.15
     steps:
@@ -115,6 +122,13 @@ jobs:
             !**/.gitignore
           if-no-files-found: error
 
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Mac64-Hashlink
+          path: |
+            templates/bin/hl/mac
+          if-no-files-found: error
+
   windows-ndll:
     runs-on: windows-latest
     steps:
@@ -169,6 +183,13 @@ jobs:
             !**/.gitignore
           if-no-files-found: error
 
+      - uses: actions/upload-artifact@v2
+        with:
+          name: Windows-Hashlink
+          path: |
+            templates/bin/hl/windows
+          if-no-files-found: error
+
   android-ndll:
     needs: macos-ndll
     runs-on: macos-10.15
@@ -355,6 +376,21 @@ jobs:
           name: Windows64-NDLL
           path: ndll/Windows64/
 
+      - uses: actions/download-artifact@v2
+        with:
+          name: Windows-Hashlink
+          path: templates/bin/hl/windows
+
+      - uses: actions/download-artifact@v2
+        with:
+          name: Mac64-Hashlink
+          path: templates/bin/hl/mac
+
+      - uses: actions/download-artifact@v2
+        with:
+          name: Linux64-Hashlink
+          path: templates/bin/hl/linux
+
       - uses: actions/upload-artifact@v2
         with:
           name: lime-haxelib
diff --git a/tools/platforms/WindowsPlatform.hx b/tools/platforms/WindowsPlatform.hx
index 12c4bb345..8a4510abc 100644
--- a/tools/platforms/WindowsPlatform.hx
+++ b/tools/platforms/WindowsPlatform.hx
@@ -659,13 +659,17 @@ class WindowsPlatform extends PlatformTarget
 
 			if (!targetFlags.exists("32")
 				&& System.hostArchitecture == X64
-				&& (command != "rebuild" || targetType == "cpp" || targetType == "winrt")
-				&& targetType != "hl")
+				&& (command != "rebuild" || targetType == "cpp" || targetType == "winrt"))
 			{
 				if (targetType == "winrt")
 				{
 					commands.push(["-Dwinrt", "-DHXCPP_M64"]);
 				}
+				else if (targetType == "hl")
+				{
+					// TODO: Support single binary
+					commands.push(["-Dwindows", "-DHXCPP_M64", "-Dhashlink"]);
+				}
 				else
 				{
 					commands.push(["-Dwindows", "-DHXCPP_M64"]);