From de82391a97c08a127bdf4d5b92a6b0ff1744278e Mon Sep 17 00:00:00 2001 From: Markus Witt Date: Sat, 30 Jun 2018 16:05:34 +0200 Subject: [PATCH 1/3] add travis-ci config --- .travis.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000000..f10b3a55dd --- /dev/null +++ b/.travis.yml @@ -0,0 +1,16 @@ +language: c + +sudo: required + +install: + - wget https://github.com/devkitPro/pacman/releases/download/devkitpro-pacman-1.0.1/devkitpro-pacman.deb + - sudo dpkg -i devkitpro-pacman.deb + - dkp-pacman --noconfirm -Sy + - dkp-pacman --noconfirm -S switch-dev + - dkp-pacman --noconfirm -S devkitARM + +script: + - cd fusee + - export DEVKITPRO=/opt/devkitpro + - export DEVKITARM=/opt/devkitpro/devkitARM + - make From c061343f3b008b2155efb096b19840a73977fbb4 Mon Sep 17 00:00:00 2001 From: Markus Witt Date: Sat, 30 Jun 2018 16:09:49 +0200 Subject: [PATCH 2/3] fix CI: add sudo to dkp-pacman --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index f10b3a55dd..2d623dc023 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,9 @@ sudo: required install: - wget https://github.com/devkitPro/pacman/releases/download/devkitpro-pacman-1.0.1/devkitpro-pacman.deb - sudo dpkg -i devkitpro-pacman.deb - - dkp-pacman --noconfirm -Sy - - dkp-pacman --noconfirm -S switch-dev - - dkp-pacman --noconfirm -S devkitARM + - sudo dkp-pacman --noconfirm -Sy + - sudo dkp-pacman --noconfirm -S switch-dev + - sudo dkp-pacman --noconfirm -S devkitARM script: - cd fusee From 0c1be8d52fea63050b76d1f9156c744392d371ba Mon Sep 17 00:00:00 2001 From: Markus Witt Date: Sat, 30 Jun 2018 16:13:19 +0200 Subject: [PATCH 3/3] fix compiler error in cfb_console.c See also https://github.com/Atmosphere-NX/Atmosphere/commit/172a2b679c7fa6a1b81ea66fbedbbf0f6776c081 --- fusee/src/display/cfb_console.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fusee/src/display/cfb_console.c b/fusee/src/display/cfb_console.c index 9066327489..4e5e3e64e5 100644 --- a/fusee/src/display/cfb_console.c +++ b/fusee/src/display/cfb_console.c @@ -555,7 +555,7 @@ static void console_scrollup (void) CONFIG_VIDEO_VISIBLE_ROWS - video_logo_height - VIDEO_FONT_HEIGHT /* frame height */ ); #else - memcpy(CONSOLE_ROW_FIRST, CONSOLE_ROW_SECOND, + memmove(CONSOLE_ROW_FIRST, CONSOLE_ROW_SECOND, CONSOLE_SCROLL_SIZE); #endif