mirror of
https://github.com/melonDS-emu/melonDS.git
synced 2025-07-25 15:19:53 -06:00
Merge branch 'master' into feature/zip-support
This commit is contained in:
18
.github/workflows/build-ubuntu-aarch64.yml
vendored
18
.github/workflows/build-ubuntu-aarch64.yml
vendored
@ -17,16 +17,22 @@ jobs:
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v1
|
||||
- name: Upgrade system
|
||||
shell: bash
|
||||
working-directory: ${{runner.workspace}}
|
||||
run: |
|
||||
sudo apt update
|
||||
sudo apt full-upgrade
|
||||
- name: Install dependencies
|
||||
shell: bash
|
||||
working-directory: ${{runner.workspace}}
|
||||
run: |
|
||||
sudo dpkg --add-architecture arm64 \
|
||||
&& sudo sh -c "sed \"s|^deb \([a-z\.:/]*\) \([a-z\-]*\) \(.*\)$|deb [arch=amd64] \1 \2 \3\ndeb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports \2 \3|\" /etc/apt/sources.list > /etc/apt/sources.list.new" \
|
||||
&& sudo rm /etc/apt/sources.list \
|
||||
&& sudo mv /etc/apt/sources.list{.new,} \
|
||||
&& sudo apt-get update \
|
||||
&& sudo apt-get install {gcc-10,g++-10,pkg-config}-aarch64-linux-gnu libsdl2-dev:arm64 libzip-dev:arm64 qtbase5-dev:arm64
|
||||
sudo dpkg --add-architecture arm64
|
||||
sudo sh -c "sed \"s|^deb \([a-z\.:/]*\) \([a-z\-]*\) \(.*\)$|deb [arch=amd64] \1 \2 \3\ndeb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports \2 \3|\" /etc/apt/sources.list > /etc/apt/sources.list.new"
|
||||
sudo rm /etc/apt/sources.list
|
||||
sudo mv /etc/apt/sources.list{.new,}
|
||||
sudo apt update
|
||||
sudo apt install {gcc-10,g++-10,pkg-config}-aarch64-linux-gnu libsdl2-dev:arm64 qtbase5-dev:arm64 libslirp-dev:arm64 libzip-dev:arm64
|
||||
- name: Create build environment
|
||||
run: mkdir ${{runner.workspace}}/build
|
||||
- name: Configure
|
||||
|
8
.github/workflows/build-ubuntu.yml
vendored
8
.github/workflows/build-ubuntu.yml
vendored
@ -23,17 +23,15 @@ jobs:
|
||||
shell: bash
|
||||
working-directory: ${{runner.workspace}}
|
||||
run: | # Fetch a new version of CMake, because the default is too old.
|
||||
wget -nv https://github.com/Kitware/CMake/releases/download/v$CMAKE_VERSION/cmake-$CMAKE_VERSION-Linux-x86_64.tar.gz \
|
||||
&& tar -zxf cmake-$CMAKE_VERSION-Linux-x86_64.tar.gz \
|
||||
&& sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list \
|
||||
sudo rm -f /etc/apt/sources.list.d/dotnetdev.list /etc/apt/sources.list.d/microsoft-prod.list \
|
||||
&& sudo apt-get update \
|
||||
&& sudo apt-get install gtk+-3.0 libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev libzip-dev qt5-default
|
||||
&& sudo apt-get install cmake libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev qt5-default libslirp-dev libzip-dev
|
||||
- name: Create build environment
|
||||
run: mkdir ${{runner.workspace}}/build
|
||||
- name: Configure
|
||||
shell: bash
|
||||
working-directory: ${{runner.workspace}}/build
|
||||
run: ${{runner.workspace}}/cmake-$CMAKE_VERSION-Linux-x86_64/bin/cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
|
||||
run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
|
||||
- name: Make
|
||||
shell: bash
|
||||
working-directory: ${{runner.workspace}}/build
|
||||
|
5
.github/workflows/build-windows.yml
vendored
5
.github/workflows/build-windows.yml
vendored
@ -21,11 +21,10 @@ jobs:
|
||||
- name: Install MSYS2
|
||||
working-directory: ${{runner.workspace}}
|
||||
run: | # Fetch MSYS2 build from XQEmu. Official distribution causes a CI failure due to permission errors.
|
||||
Invoke-WebRequest -Uri "https://github.com/xqemu/ci-environment-msys2/releases/latest/download/msys64.7z" -OutFile "msys64.7z"
|
||||
7z x -y msys64.7z "-oC:\tools\"
|
||||
choco install msys2
|
||||
C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Syuq --noconfirm"
|
||||
- name: Install dependencies
|
||||
run: C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Sq --noconfirm git make mingw-w64-x86_64-{cmake,mesa,SDL2,qt5-static,libzip,toolchain}"
|
||||
run: C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Sq --noconfirm git make mingw-w64-x86_64-{cmake,mesa,SDL2,qt5-static,libslirp,libzip,toolchain}"
|
||||
- name: Create build environment
|
||||
run: |
|
||||
New-Item -ItemType directory -Path ${{runner.workspace}}\melonDS\build
|
||||
|
Reference in New Issue
Block a user