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

Try to fix CI.

Browse Source
This commit is contained in:
Apprentice-Alchemist
2022-04-15 10:49:40 +02:00
parent 668b3f7ba7
commit 1471d8a60d
2 changed files with 42 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
.github/workflows/main.yml vendored
View File

@@ -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

8
tools/platforms/WindowsPlatform.hx
View File

@@ -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"]);