From 10a11dddeb152ba559c88dd27354e3fc14c9beac Mon Sep 17 00:00:00 2001 From: M4x1m3 Date: Wed, 1 Jul 2020 11:17:35 +0200 Subject: [PATCH] Fixed 3DS build, added 3DS CI --- .github/workflows/ci-workflow.yml | 18 ++++++++++++++++++ ion/src/simulator/3ds/Makefile | 2 ++ 2 files changed, 20 insertions(+) diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index f9e2a0a16..db4114a07 100644 --- a/.github/workflows/ci-workflow.yml +++ b/.github/workflows/ci-workflow.yml @@ -2,6 +2,24 @@ name: Continuous integration on: [pull_request, push] jobs: + nintendo_3ds: + runs-on: ubuntu-latest + steps: + - run: wget https://github.com/devkitPro/pacman/releases/download/v1.0.2/devkitpro-pacman_1.0.2.amd64.deb -O /tmp/devkitpro-pacman.deb + - run: yes | sudo dpkg -i /tmp/devkitpro-pacman.deb + - run: yes | sudo dkp-pacman -Syu --needed devkitARM 3dstools libctru + - run: echo ::set-env name=DEVKITPRO::/opt/devkitpro + - run: echo ::set-env name=DEVKITARM::/opt/devkitpro/devkitARM + - run: echo ::set-env name=PATH::$DEVKITPRO/tools/bin:$DEVKITARM/bin:$PATH + + - uses: actions/checkout@v1 + with: + submodules: true + - run: make -j2 PLATFORM=simulator TARGET=3ds + - uses: actions/upload-artifact@master + with: + name: epsilon-3ds.3dsx + path: output/release/simulator/3ds/epsilon.3dsx android: runs-on: ubuntu-latest steps: diff --git a/ion/src/simulator/3ds/Makefile b/ion/src/simulator/3ds/Makefile index 134842da5..7cb60f65c 100644 --- a/ion/src/simulator/3ds/Makefile +++ b/ion/src/simulator/3ds/Makefile @@ -15,6 +15,8 @@ ion_src += $(addprefix ion/src/simulator/3ds/, \ driver/common.cpp \ ) +ion_src += ion/src/shared/collect_registers.cpp + sdl_simu_needs_to_be_removed += $(addprefix ion/src/simulator/shared/, \ dummy/display.cpp \ dummy/led.cpp \