m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Switch port build

Browse Source
This commit is contained in:
Romain Graillot 2019-05-29 19:53:10 +02:00
parent 6f97932ae1
commit 44d36c94dc
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.install-switch-toolchain.sh
View File

@ -30,6 +30,6 @@ fi
cd / cd /
$SUDO apt-get install "${TMP}/${FILE}" || exit 1 $SUDO apt-get install "${TMP}/${FILE}" || exit 1
echo "devkitpro pacman installed" 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.." echo "Switch toolchain and library extracted to /opt/devkitpro.."
rm -r ${TMP} rm -r ${TMP}

7
src/Makefile
View File

@ -585,9 +585,10 @@ endif
COPT += $(ARCH) -Wall -ffunction-sections -O$(OPTIM) COPT += $(ARCH) -Wall -ffunction-sections -O$(OPTIM)
COPT += -D__SWITCH__ -D_XOPEN_SOURCE=500 -DUSE_JOYSTICK -D__no_tifflib__ 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 = -specs=$(DEVKITPRO)/libnx/switch.specs -g $(ARCH) -Wl,-Map,$(OBJDIR)/$*.map
LOPT += -lSDL2_image `$(DEVKITPRO)/portlibs/switch/bin/sdl2-config --libs` LOPT += `$(DEVKITPRO)/portlibs/switch/bin/sdl2-config --libs`
LOPT += -lSDL2_ttf `$(DEVKITPRO)/portlibs/switch/bin/freetype-config --libs` LOPT += `/opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-pkg-config --libs-only-l SDL2_image`
LOPT += -ljpeg -lstdc++ -lnx LOPT += `/opt/devkitpro/portlibs/switch/bin/aarch64-none-elf-pkg-config --libs-only-l SDL2_ttf`
LOPT += -lstdc++ -lnx
else else
ifdef AROS32CROSS ifdef AROS32CROSS
#cross compile an AROS 32 bit executable #cross compile an AROS 32 bit executable