From 46ad92f11e0b5403e5e79caded5bf54b8b6337b5 Mon Sep 17 00:00:00 2001 From: Apprentice-Alchemist <53486764+Apprentice-Alchemist@users.noreply.github.com> Date: Fri, 20 May 2022 08:11:02 +0200 Subject: [PATCH] Why are we still supporting haxe 3? --- .github/workflows/main.yml | 18 +++++++++--------- src/lime/tools/HashlinkHelper.hx | 11 +++++++---- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 24353aa12..45e7dde41 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -185,11 +185,11 @@ jobs: !**/.gitignore if-no-files-found: error - - uses: actions/upload-artifact@v2 - with: - name: Windows-Hashlink - path: | - templates/bin/hl/Windows + # - uses: actions/upload-artifact@v2 + # with: + # name: Windows-Hashlink + # path: | + # templates/bin/hl/Windows if-no-files-found: error - uses: actions/upload-artifact@v2 with: @@ -384,10 +384,10 @@ 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: Windows-Hashlink + # path: templates/bin/hl/Windows - uses: actions/download-artifact@v2 with: diff --git a/src/lime/tools/HashlinkHelper.hx b/src/lime/tools/HashlinkHelper.hx index 2a23b859e..dc600a2a8 100644 --- a/src/lime/tools/HashlinkHelper.hx +++ b/src/lime/tools/HashlinkHelper.hx @@ -13,16 +13,19 @@ class HashlinkHelper public static function copyHashlink(project:HXProject, targetDirectory:String, applicationDirectory:String, executablePath:String, ?is64 = true) { var platform = project.target; - var bindir = (switch project.target + var bindir = switch project.target { case LINUX: "Linux"; case MAC: "Mac"; case WINDOWS: "Windows"; - case var target: - Log.error('Hashlink is not supported on $target (Supported: Windows, Mac and Linux)'); + default: + Log.error('Hashlink is not supported on ${project.target} (Supported: Windows, Mac and Linux)'); Sys.exit(1); ""; - }) + (is64 ? "64" : ""); + }; + if(is64) { + bindir += "64"; + } var hlPath = ConfigHelper.getConfigValue("HL_PATH"); if (hlPath == null)