From 9709d5dfc7fcff6f37bcb48b09849441f88c43d0 Mon Sep 17 00:00:00 2001
From: Romain Graillot <graillot.romain@gmail.com>
Date: Tue, 30 Jul 2019 10:01:00 +0200
Subject: [PATCH] Fix switch makefile and enable switch build again

---
 .gitlab-ci.yml               | 6 +++---
 .install-switch-toolchain.sh | 2 +-
 src/Makefile                 | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6e298da5..ff0e37cc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -97,15 +97,15 @@ job_gp2x:
             - "*.zip"
             - "GP2X_JOB_ID"
 
-.job_switch:
+job_switch:
     stage: build
     before_script:
         - apt-get update -qq && apt-get install -y -qq zip
         - "sh ./.install-switch-toolchain.sh"
         - "source /etc/profile.d/devkit-env.sh"
     script:
-        - "SWITCH=1 make -j2 grafx2"
-        - "SWITCH=1 make ziprelease"
+        - "SWITCH=1 make -j2 grafx2 || exit 1"
+        - "SWITCH=1 make ziprelease || exit 1"
     after_script:
         - "echo $CI_JOB_ID > SWITCH_JOB_ID"
     artifacts:
diff --git a/.install-switch-toolchain.sh b/.install-switch-toolchain.sh
index 316fd4e9..c1845cd1 100755
--- a/.install-switch-toolchain.sh
+++ b/.install-switch-toolchain.sh
@@ -28,7 +28,7 @@ if ! echo "$SHA256  $FILE" | shasum -c - ; then
 fi
 
 cd /
-$SUDO apt-get install "${TMP}/${FILE}" || exit 1
+$SUDO dpkg -i "${TMP}/${FILE}" || exit 1
 echo "devkitpro pacman installed"
 yes Y | $SUDO dkp-pacman -S devkitA64 devkit-env libnx switch-tools switch-pkg-config switch-sdl2 switch-sdl2_ttf switch-sdl2_image switch-zlib switch-bzip2 switch-libpng switch-libjpeg-turbo switch-freetype || exit 1
 echo "Switch toolchain and library extracted to /opt/devkitpro.."
diff --git a/src/Makefile b/src/Makefile
index 6407ddbc..6889b859 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -587,8 +587,8 @@ endif
         COPT += -D__SWITCH__ -D_XOPEN_SOURCE=500 -DUSE_JOYSTICK -D__no_tifflib__
         LOPT = -specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(OBJDIR)/$*.map
         LOPT += `$(DEVKITPRO)/portlibs/switch/bin/sdl2-config --libs`
-        LOPT += `/opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-pkg-config --libs-only-l SDL2_image`
-        LOPT += `/opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-pkg-config --libs-only-l SDL2_ttf`
+        LOPT += `$(DEVKITPRO)/portlibs/switch/bin/aarch64-none-elf-pkg-config --libs-only-l SDL2_image`
+        LOPT += `$(DEVKITPRO)/portlibs/switch/bin/aarch64-none-elf-pkg-config --libs-only-l SDL2_ttf`
         LOPT += -lstdc++ -lnx
       else
       ifdef AROS32CROSS