Merge branch 'generic_jit' of https://github.com/Arisotura/melonDS into generic_jit

3 files changed, 52 insertions, 5 deletions

diff --git a/.github/workflows/build-ubuntu-aarch64.yml b/.github/workflows/build-ubuntu-aarch64.yml
new file mode 100644
index 0000000..6d0bfde
--- /dev/null
+++ b/.github/workflows/build-ubuntu-aarch64.yml
@@ -0,0 +1,47 @@
+name: CMake Build (Ubuntu aarch64)
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+env:
+  BUILD_TYPE: Release
+
+jobs:
+  build:
+    runs-on: ubuntu-20.04
+
+    steps:
+    - uses: actions/checkout@v1
+    - 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 qtbase5-dev:arm64
+    - name: Create build environment
+      run: mkdir ${{runner.workspace}}/build
+    - name: Configure
+      shell: bash
+      working-directory: ${{runner.workspace}}/build
+      run: |
+          CC=aarch64-linux-gnu-gcc-10 CXX=aarch64-linux-gnu-g++-10 cmake -DPKG_CONFIG_EXECUTABLE=/usr/bin/aarch64-linux-gnu-pkg-config $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE
+    - name: Make
+      shell: bash
+      working-directory: ${{runner.workspace}}/build
+      run: |
+        make -j$(nproc --all) \
+        && mkdir dist \
+        && cp melonDS dist
+    - uses: actions/upload-artifact@v1
+      with:
+        name: melonDS
+        path: ${{runner.workspace}}/build/dist
diff --git a/.github/workflows/build-ubuntu.yml b/.github/workflows/build-ubuntu.yml
index b57c5b7..4ecdae0 100644
--- a/.github/workflows/build-ubuntu.yml
+++ b/.github/workflows/build-ubuntu.yml
@@ -15,7 +15,7 @@ env:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
     - uses: actions/checkout@v1
@@ -27,7 +27,7 @@ jobs:
         && 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 apt-get update \
-        && sudo apt-get install gtk+-3.0 libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev
+        && sudo apt-get install gtk+-3.0 libcurl4-gnutls-dev libpcap0.8-dev libsdl2-dev qt5-default
     - name: Create build environment
       run: mkdir ${{runner.workspace}}/build
     - name: Configure
@@ -40,7 +40,7 @@ jobs:
       run: |
         make -j$(nproc --all) \
         && mkdir dist \
-        && cp {melonDS,romlist.bin} dist
+        && cp melonDS dist
     - uses: actions/upload-artifact@v1
       with:
         name: melonDS
diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
index ec14e30..b8e8b04 100644
--- a/.github/workflows/build-windows.yml
+++ b/.github/workflows/build-windows.yml
@@ -25,7 +25,7 @@ jobs:
         7z x -y msys64.7z "-oC:\tools\"
         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,toolchain}"
+      run: C:\tools\msys64\usr\bin\bash.exe -lc "pacman -Sq --noconfirm git make mingw-w64-x86_64-{cmake,mesa,SDL2,qt5-static,toolchain}"
     - name: Create build environment
       run: |
         New-Item -ItemType directory -Path ${{runner.workspace}}\melonDS\build
@@ -33,7 +33,7 @@ jobs:
     - name: Configure
       run: |
         C:\tools\msys64\usr\bin\bash.exe -lc "export PATH=`"/mingw64/bin:`$PATH`" \
-        && cd melonDS/build && cmake .. -G 'MSYS Makefiles' -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}"
+        && cd melonDS/build && cmake .. -G 'MSYS Makefiles' -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DBUILD_STATIC=ON -DQT5_STATIC_DIR=C:/tools/msys64/mingw64/qt5-static"
     - name: Make
       run: |
         C:\tools\msys64\usr\bin\bash.exe -lc "export PATH=`"/mingw64/bin:`$PATH`" \