aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.github/azure-workflows/build-mac-arm64.yml26
-rw-r--r--.github/azure-workflows/build-mac-x86_64.yml (renamed from azure-pipelines.yml)0
-rw-r--r--CMakeLists.txt7
-rw-r--r--README.md3
4 files changed, 35 insertions, 1 deletions
diff --git a/.github/azure-workflows/build-mac-arm64.yml b/.github/azure-workflows/build-mac-arm64.yml
new file mode 100644
index 0000000..721c6ac
--- /dev/null
+++ b/.github/azure-workflows/build-mac-arm64.yml
@@ -0,0 +1,26 @@
+trigger:
+- master
+
+pool:
+ name: Default
+ demands:
+ - agent.name -equals MacStadium-ARM64-Mac
+
+workspace:
+ clean: all
+
+steps:
+- 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
+ displayName: 'Configure'
+ workingDirectory: $(Pipeline.Workspace)/build
+
+- script: arch -arm64 make -j$(sysctl -n hw.logicalcpu)
+ displayName: 'Make'
+ workingDirectory: $(Pipeline.Workspace)/build
+
+- publish: $(Pipeline.Workspace)/build/melonDS.dmg
+ artifact: melonDS.dmg
+
diff --git a/azure-pipelines.yml b/.github/azure-workflows/build-mac-x86_64.yml
index e2e14c6..e2e14c6 100644
--- a/azure-pipelines.yml
+++ b/.github/azure-workflows/build-mac-x86_64.yml
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66d0461..8f89c31 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,6 +121,13 @@ if (ENABLE_LTO)
endif()
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()
+
option(BUILD_QT_SDL "Build Qt/SDL frontend" ON)
add_subdirectory(src)
diff --git a/README.md b/README.md
index 2d068f0..a4cfbe2 100644
--- a/README.md
+++ b/README.md
@@ -8,8 +8,9 @@
<br>
<a href="https://github.com/Arisotura/melonDS/actions?query=workflow%3A%22CMake+Build+%28Windows+x86-64%29%22+event%3Apush"><img src="https://img.shields.io/github/workflow/status/Arisotura/melonDS/CMake%20Build%20(Windows%20x86-64)?label=Windows%20x86-64&logo=GitHub"></img></a>
<a href="https://github.com/Arisotura/melonDS/actions?query=workflow%3A%22CMake+Build+%28Ubuntu+x86-64%29%22+event%3Apush"><img src="https://img.shields.io/github/workflow/status/Arisotura/melonDS/CMake%20Build%20(Ubuntu%20x86-64)?label=Linux%20x86-64&logo=GitHub"></img></a>
-<a href="https://dev.azure.com/melonDS/melonDS/_build?definitionId=1&repositoryFilter=1&branchFilter=2%2C2%2C2%2C2%2C2%2C2%2C2%2C2%2C2%2C2%2C2%2C2%2C2"><img src="https://img.shields.io/azure-devops/build/melonDS/7c9c08a1-669f-42a4-bef4-a6c74eadf723/1/master?label=macOS%20x86-64&logo=Azure%20Pipelines"></img></a>
<a href="https://github.com/Arisotura/melonDS/actions?query=workflow%3A%22CMake+Build+%28Ubuntu+aarch64%29%22+event%3Apush"><img src="https://img.shields.io/github/workflow/status/Arisotura/melonDS/CMake%20Build%20(Ubuntu%20aarch64)?label=Linux%20ARM64&logo=GitHub"></img></a>
+<a href="https://dev.azure.com/melonDS/melonDS/_build?definitionId=1&repositoryFilter=1&branchFilter=2%2C2%2C2%2C2%2C2%2C2%2C2%2C2%2C2%2C2%2C2%2C2%2C2"><img src="https://img.shields.io/azure-devops/build/melonDS/7c9c08a1-669f-42a4-bef4-a6c74eadf723/1/master?label=macOS%20x86-64&logo=Azure%20Pipelines"></img></a>
+<a href="https://dev.azure.com/melonDS/melonDS/_build?definitionId=2&_a=summary&repositoryFilter=1&branchFilter=2%2C2%2C2%2C2%2C2"><img src="https://img.shields.io/azure-devops/build/melonDS/7c9c08a1-669f-42a4-bef4-a6c74eadf723/2/master?label=macOS%20ARM64&logo=Azure%20Pipelines"></img></a>
</p>
DS emulator, sorta