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

Fix switch makefile and enable switch build again

Browse Source
This commit is contained in:
Romain Graillot 2019-07-30 10:01:00 +02:00
parent 7c58f10721
commit 9709d5dfc7
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -97,15 +97,15 @@ job_gp2x:
- "*.zip" - "*.zip"
- "GP2X_JOB_ID" - "GP2X_JOB_ID"
.job_switch: job_switch:
stage: build stage: build
before_script: before_script:
- apt-get update -qq && apt-get install -y -qq zip - apt-get update -qq && apt-get install -y -qq zip
- "sh ./.install-switch-toolchain.sh" - "sh ./.install-switch-toolchain.sh"
- "source /etc/profile.d/devkit-env.sh" - "source /etc/profile.d/devkit-env.sh"
script: script:
- "SWITCH=1 make -j2 grafx2" - "SWITCH=1 make -j2 grafx2 || exit 1"
- "SWITCH=1 make ziprelease" - "SWITCH=1 make ziprelease || exit 1"
after_script: after_script:
- "echo $CI_JOB_ID > SWITCH_JOB_ID" - "echo $CI_JOB_ID > SWITCH_JOB_ID"
artifacts: artifacts:

2
.install-switch-toolchain.sh
View File

@ -28,7 +28,7 @@ if ! echo "$SHA256 $FILE" | shasum -c - ; then
fi fi
cd / cd /
$SUDO apt-get install "${TMP}/${FILE}" || exit 1 $SUDO dpkg -i "${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-pkg-config 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.."

4
src/Makefile
View File

@ -587,8 +587,8 @@ endif
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 += `$(DEVKITPRO)/portlibs/switch/bin/sdl2-config --libs` 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 += `$(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_ttf`
LOPT += -lstdc++ -lnx LOPT += -lstdc++ -lnx
else else
ifdef AROS32CROSS ifdef AROS32CROSS