From a135557bcbdd39b50cc25cbed162bf7046125ead Mon Sep 17 00:00:00 2001 From: WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com> Date: Thu, 22 Jul 2021 14:10:21 +0100 Subject: [PATCH 1/8] Add ARM64 Mac CI file --- .github/azure-workflows/build-mac-arm64.yml | 23 +++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 .github/azure-workflows/build-mac-arm64.yml diff --git a/.github/azure-workflows/build-mac-arm64.yml b/.github/azure-workflows/build-mac-arm64.yml new file mode 100644 index 00000000..fbcf4b09 --- /dev/null +++ b/.github/azure-workflows/build-mac-arm64.yml @@ -0,0 +1,23 @@ +trigger: +- master + +pool: + name: Default + demands: + - agent.name -equals MacStadium-ARM64-Mac + +steps: +- script: mkdir $(Pipeline.Workspace)/build + displayName: 'Create build environment' + +- script: cmake $(Build.SourcesDirectory) -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH="$(brew --prefix qt@6);$(brew --prefix libarchive)" -DMACOS_BUNDLE_LIBS=ON -DMACOS_BUILD_DMG=ON -DUSE_QT6=ON + displayName: 'Configure' + workingDirectory: $(Pipeline.Workspace)/build + +- script: make -j$(sysctl -n hw.logicalcpu) + displayName: 'Make' + workingDirectory: $(Pipeline.Workspace)/build + +- publish: $(Pipeline.Workspace)/build/melonDS.dmg + artifact: melonDS.dmg + From 3bada15e46acb5d24464ceadcb2cc760beafe7f8 Mon Sep 17 00:00:00 2001 From: WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com> Date: Thu, 22 Jul 2021 14:18:52 +0100 Subject: [PATCH 2/8] Use arch -arm64 on ARM64 macOS CI --- .github/azure-workflows/build-mac-arm64.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/azure-workflows/build-mac-arm64.yml b/.github/azure-workflows/build-mac-arm64.yml index fbcf4b09..465ca9c1 100644 --- a/.github/azure-workflows/build-mac-arm64.yml +++ b/.github/azure-workflows/build-mac-arm64.yml @@ -10,11 +10,11 @@ steps: - script: mkdir $(Pipeline.Workspace)/build displayName: 'Create build environment' -- script: cmake $(Build.SourcesDirectory) -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH="$(brew --prefix qt@6);$(brew --prefix libarchive)" -DMACOS_BUNDLE_LIBS=ON -DMACOS_BUILD_DMG=ON -DUSE_QT6=ON +- script: arch -arm64 cmake $(Build.SourcesDirectory) -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH="$(brew --prefix qt@6);$(brew --prefix libarchive)" -DMACOS_BUNDLE_LIBS=ON -DMACOS_BUILD_DMG=ON -DUSE_QT6=ON displayName: 'Configure' workingDirectory: $(Pipeline.Workspace)/build -- script: make -j$(sysctl -n hw.logicalcpu) +- script: arch -arm64 make -j$(sysctl -n hw.logicalcpu) displayName: 'Make' workingDirectory: $(Pipeline.Workspace)/build From efd7d62cec79e92f3e3a3434bc9f930441c067cc Mon Sep 17 00:00:00 2001 From: WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com> Date: Thu, 22 Jul 2021 14:20:21 +0100 Subject: [PATCH 3/8] Use mkdir -p here --- .github/azure-workflows/build-mac-arm64.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/azure-workflows/build-mac-arm64.yml b/.github/azure-workflows/build-mac-arm64.yml index 465ca9c1..4d5f213a 100644 --- a/.github/azure-workflows/build-mac-arm64.yml +++ b/.github/azure-workflows/build-mac-arm64.yml @@ -7,7 +7,7 @@ pool: - agent.name -equals MacStadium-ARM64-Mac steps: -- script: mkdir $(Pipeline.Workspace)/build +- script: mkdir -p $(Pipeline.Workspace)/build displayName: 'Create build environment' - script: arch -arm64 cmake $(Build.SourcesDirectory) -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH="$(brew --prefix qt@6);$(brew --prefix libarchive)" -DMACOS_BUNDLE_LIBS=ON -DMACOS_BUILD_DMG=ON -DUSE_QT6=ON From 3074ee06d73c6076dac9348a678b99beb38f48cc Mon Sep 17 00:00:00 2001 From: WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com> Date: Thu, 22 Jul 2021 14:32:06 +0100 Subject: [PATCH 4/8] Clean workspace before build --- .github/azure-workflows/build-mac-arm64.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/azure-workflows/build-mac-arm64.yml b/.github/azure-workflows/build-mac-arm64.yml index 4d5f213a..721c6acc 100644 --- a/.github/azure-workflows/build-mac-arm64.yml +++ b/.github/azure-workflows/build-mac-arm64.yml @@ -6,8 +6,11 @@ pool: demands: - agent.name -equals MacStadium-ARM64-Mac +workspace: + clean: all + steps: -- script: mkdir -p $(Pipeline.Workspace)/build +- script: mkdir $(Pipeline.Workspace)/build displayName: 'Create build environment' - script: arch -arm64 cmake $(Build.SourcesDirectory) -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH="$(brew --prefix qt@6);$(brew --prefix libarchive)" -DMACOS_BUNDLE_LIBS=ON -DMACOS_BUILD_DMG=ON -DUSE_QT6=ON From ebe8d544e19f8dade46404c892b6c1e43b0b3769 Mon Sep 17 00:00:00 2001 From: WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com> Date: Thu, 22 Jul 2021 14:52:42 +0100 Subject: [PATCH 5/8] Move x86-64 macOS CI file [skip ci] --- .../azure-workflows/build-mac-x86_64.yml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename azure-pipelines.yml => .github/azure-workflows/build-mac-x86_64.yml (100%) diff --git a/azure-pipelines.yml b/.github/azure-workflows/build-mac-x86_64.yml similarity index 100% rename from azure-pipelines.yml rename to .github/azure-workflows/build-mac-x86_64.yml From 7aaee5ddb6b88e944583428b26985883f0a0ce0d Mon Sep 17 00:00:00 2001 From: WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com> Date: Thu, 22 Jul 2021 15:13:33 +0000 Subject: [PATCH 6/8] Add macOS ARM64 build badge --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2d068f04..a4cfbe2e 100644 --- a/README.md +++ b/README.md @@ -8,8 +8,9 @@
- + +

DS emulator, sorta From 9b5d5f673c31b020f22f58cde5a9729136086d57 Mon Sep 17 00:00:00 2001 From: WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com> Date: Thu, 22 Jul 2021 16:50:48 +0100 Subject: [PATCH 7/8] Use CCache if it exists --- CMakeLists.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 66d0461a..eed3a896 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -121,6 +121,12 @@ if (ENABLE_LTO) endif() endif() +find_program(CCACHE "ccache") +if (CCACHE) + set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE}) + set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE}) +endif() + option(BUILD_QT_SDL "Build Qt/SDL frontend" ON) add_subdirectory(src) From 89875204dd4bac1efd321763660ac891e630a32e Mon Sep 17 00:00:00 2001 From: WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com> Date: Thu, 22 Jul 2021 16:58:59 +0100 Subject: [PATCH 8/8] Add message when CCache is being used --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index eed3a896..8f89c314 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -123,6 +123,7 @@ endif() find_program(CCACHE "ccache") if (CCACHE) + message(STATUS "Using CCache to speed up compilation") set(CMAKE_C_COMPILER_LAUNCHER ${CCACHE}) set(CMAKE_CXX_COMPILER_LAUNCHER ${CCACHE}) endif()