cpp/openttd-patchpack/source Changeset - r24680:911676af1512

Changeset - r24680:911676af1512

Parent rev.

Child rev.

[Not reviewed]

master

0 2 0

Owen Rudge - 3 years ago 2021-01-16 21:31:20
owen@owenrudge.net

Feature: [Actions] ARM64 builds for Windows

2 files changed with 11 insertions and 5 deletions:

.github/workflows/release.yml

cmake/InstallAndPackage.cmake

0 comments (0 inline, 0 general)

.github/workflows/release.yml

➞

Show inline comments

@@ @@ -513,6 +513,7 @@ jobs: @@
         include:
         - arch: x86
         - arch: x64
         - arch: arm64
     runs-on: windows-latest
@@ @@ -560,7 +561,7 @@ jobs: @@
       uses: ammaraskar/msvc-problem-matcher@master
     - name: Build (with installer)
-      if: needs.source.outputs.is_tag == 'true' && matrix.arch != 'arm64'
       if: needs.source.outputs.is_tag == 'true'
       uses: lukka/run-cmake@v3
       with:
         cmakeListsOrSettingsJson: CMakeListsTxtAdvanced
@@ @@ -569,7 +570,7 @@ jobs: @@
         cmakeAppendedArgs: ' -GNinja -DOPTION_USE_NSIS=ON -DHOST_BINARY_DIR=${{ github.workspace }}/build-host -DCMAKE_BUILD_TYPE=RelWithDebInfo'
     - name: Build (without installer)
-      if: needs.source.outputs.is_tag != 'true' || matrix.arch == 'arm64'
       if: needs.source.outputs.is_tag != 'true'
       uses: lukka/run-cmake@v3
       with:
         cmakeListsOrSettingsJson: CMakeListsTxtAdvanced

cmake/InstallAndPackage.cmake

➞

Show inline comments

@@ @@ -70,10 +70,15 @@ endif() @@
 # Windows is a bit more annoying to detect; using the size of void pointer
 # seems to be the most robust.
 if(WIN32)
     if(CMAKE_SIZEOF_VOID_P EQUAL 8)
         set(ARCHITECTURE "win64")
     # Check if the MSVC platform has been defined
     if ("$ENV{Platform}" STREQUAL "arm64")
         set(ARCHITECTURE "arm64")
     else()
         set(ARCHITECTURE "win32")
         if(CMAKE_SIZEOF_VOID_P EQUAL 8)
             set(ARCHITECTURE "win64")
         else()
             set(ARCHITECTURE "win32")
         endif()
     endif()
 endif()
 if(APPLE AND CMAKE_OSX_ARCHITECTURES)

0 comments (0 inline, 0 general)