From 44d36c94dc185e68d9bbee4e7487feac0d628061 Mon Sep 17 00:00:00 2001 From: Romain Graillot Date: Wed, 29 May 2019 19:53:10 +0200 Subject: [PATCH] Fix Switch port build --- .install-switch-toolchain.sh | 2 +- src/Makefile | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.install-switch-toolchain.sh b/.install-switch-toolchain.sh index 07956fb1..316fd4e9 100755 --- a/.install-switch-toolchain.sh +++ b/.install-switch-toolchain.sh @@ -30,6 +30,6 @@ fi cd / $SUDO apt-get install "${TMP}/${FILE}" || exit 1 echo "devkitpro pacman installed" -yes Y | $SUDO dkp-pacman -S devkitA64 devkit-env libnx switch-tools switch-sdl2 switch-sdl2_ttf switch-sdl2_image switch-zlib switch-bzip2 switch-libpng switch-libjpeg-turbo switch-freetype || exit 1 +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.." rm -r ${TMP} diff --git a/src/Makefile b/src/Makefile index a0aa31da..cc843429 100644 --- a/src/Makefile +++ b/src/Makefile @@ -585,9 +585,10 @@ endif COPT += $(ARCH) -Wall -ffunction-sections -O$(OPTIM) 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 += -lSDL2_image `$(DEVKITPRO)/portlibs/switch/bin/sdl2-config --libs` - LOPT += -lSDL2_ttf `$(DEVKITPRO)/portlibs/switch/bin/freetype-config --libs` - LOPT += -ljpeg -lstdc++ -lnx + 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 += -lstdc++ -lnx else ifdef AROS32CROSS #cross compile an AROS 32 bit executable