diff options
| -rw-r--r-- | .github/workflows/build-macos.yml | 37 | ||||
| -rw-r--r-- | README.md | 7 | ||||
| -rw-r--r-- | azure-pipelines.yml | 29 |
3 files changed, 20 insertions, 53 deletions
diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml deleted file mode 100644 index e007e13..0000000 --- a/.github/workflows/build-macos.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: CMake Build (macOS x86-64) - -on: - push: - branches: - - master - pull_request: - branches: - - master - -env: - BUILD_TYPE: Release - -jobs: - build: - - runs-on: macos-latest - - steps: - - uses: actions/checkout@v1 - - name: Install dependencies - working-directory: ${{runner.workspace}} - run: brew install sdl2 qt@5 libslirp libarchive libepoxy - - name: Create build environment - run: mkdir ${{runner.workspace}}/build - - name: Configure - working-directory: ${{runner.workspace}}/build - run: | - cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH="$(brew --prefix qt@5);$(brew --prefix libarchive)" -DMACOS_BUNDLE_LIBS=ON -DMACOS_BUILD_DMG=ON - - name: Make - working-directory: ${{runner.workspace}}/build - run: | - make -j$(sysctl -n hw.ncpu) - - uses: actions/upload-artifact@v1 - with: - name: melonDS.dmg - path: ${{runner.workspace}}/build/melonDS.dmg @@ -8,7 +8,7 @@ <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://github.com/Arisotura/melonDS/actions?query=workflow%3A%22CMake+Build+%28macOS+x86-64%29%22+event%3Apush"><img src="https://img.shields.io/github/workflow/status/Arisotura/melonDS/CMake%20Build%20(macOS%20x86-64)?label=macOS%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> </p> DS emulator, sorta @@ -97,9 +97,8 @@ If everything went well, melonDS should now be in the `dist` folder. ``` 4. Compile: ```zsh - export PKG_CONFIG_PATH="$(brew --prefix libarchive)/lib/pkgconfig" - cmake .. -DQt5_DIR=$(brew --prefix qt5)/lib/cmake/Qt5 - make -j$(sysctl -n hw.ncpu) + cmake .. -DCMAKE_PREFIX_PATH="$(brew --prefix qt@5);$(brew --prefix libarchive)" -DMACOS_BUNDLE_LIBS=ON + make -j$(sysctl -n hw.logicalcpu) mkdir dist && cp -r melonDS.app dist ``` If everything went well, melonDS.app should now be in the `dist` folder. diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 27a798a..ca95b78 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -1,19 +1,24 @@ -# Starter pipeline -# Start with a minimal pipeline that you can customize to build and deploy your code. -# Add steps that build, run tests, deploy, and more: -# https://aka.ms/yaml - trigger: - master pool: - vmImage: ubuntu-latest + vmImage: macOS-10.14 steps: -- script: echo Hello, world! - displayName: 'Run a one-line script' +- script: brew install sdl2 qt@5 libslirp libarchive libepoxy + displayName: 'Install dependencies' + +- script: mkdir $(Pipeline.Workspace)/build + displayName: 'Create build environment' + +- script: cmake $(Build.SourcesDirectory) -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_PREFIX_PATH="$(brew --prefix qt@5);$(brew --prefix libarchive)" -DMACOS_BUNDLE_LIBS=ON -DMACOS_BUILD_DMG=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 -- script: | - echo Add other tasks to build, test, and deploy your project. - echo See https://aka.ms/yaml - displayName: 'Run a multi-line script' |