Skip to content

Commit

Permalink
Merge pull request libretro#7310 from m4xw/libnx_ci
Browse files Browse the repository at this point in the history
[LIBNX] Add dist-cores target
  • Loading branch information
inactive123 authored Sep 27, 2018
2 parents 0aef172 + 6195f63 commit 4ad6a5f
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile.libnx
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ else
endif
#---------------------------------------------------------------------------------

export OFILES := $(OBJ) libretro_switch.a
export OFILES := $(OBJ) libretro_libnx.a
export HFILES_BIN := $(addsuffix .h,$(subst .,_,$(BINFILES)))

export INCLUDE := $(foreach dir,$(INCLUDES),-I$(CURDIR)/$(dir)) \
Expand Down
16 changes: 16 additions & 0 deletions dist-scripts/dist-cores.sh
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,13 @@ platform=vita
SALAMANDER=yes
EXT=a
mkdir -p ../pkg/vita/vpk

# Nintendo Switch (libnx)
elif [ $PLATFORM = "libnx" ] ; then
platform=libnx
EXT=a
mkdir -p ../pkg/${platform}/build/romfs

# CTR/3DS
elif [ $PLATFORM = "ctr" ] ; then
platform=ctr
Expand Down Expand Up @@ -207,6 +214,8 @@ for f in `ls -v *_${platform}.${EXT}`; do
make -C ../ -f Makefile LINK=g++ $whole_archive $big_stack -j3 || exit 1
elif [ $PLATFORM = "ctr" ]; then
make -C ../ -f Makefile.${platform} $OPTS LIBRETRO=$name $whole_archive $big_stack -j3 || exit 1
elif [ $PLATFORM = "libnx" ]; then
make -C ../ -f Makefile.${platform} $OPTS APP_TITLE="$name" LIBRETRO=$name $whole_archive $big_stack -j3 || exit 1
else
make -C ../ -f Makefile.${platform} $OPTS $whole_archive $big_stack -j3 || exit 1
fi
Expand Down Expand Up @@ -249,6 +258,9 @@ for f in `ls -v *_${platform}.${EXT}`; do
mv -f ../retroarch_3ds.cia ../pkg/${platform}/build/cia/${name}_libretro.cia
mv -f ../retroarch_3ds.3dsx ../pkg/${platform}/build/3dsx/${name}_libretro.3dsx
mv -f ../retroarch_3ds.3ds ../pkg/${platform}/build/rom/${name}_libretro.3ds
elif [ $PLATFORM = "libnx" ] ; then
mkdir -p ../pkg/${platform}/build/libnx/
mv -f ../retroarch_switch.nro ../pkg/${platform}/build/libnx/${name}.nro
elif [ $PLATFORM = "unix" ] ; then
mv -f ../retroarch ../pkg/${platform}/${name}_libretro.elf
elif [ $PLATFORM = "ngc" ] ; then
Expand All @@ -275,6 +287,10 @@ for f in `ls -v *_${platform}.${EXT}`; do
rm -f ../retroarch_3ds.elf
rm -f ../retroarch_3ds.bnr
rm -f ../retroarch_3ds.icn
elif [ $PLATFORM = "libnx" ] ; then
rm -f ../retroarch_switch.elf
rm -f ../retroarch_switch.nacp
rm -f ../retroarch_switch.nso
elif [ $PLATFORM = "unix" ] ; then
rm -f ../retroarch
elif [ $PLATFORM = "ngc" ] ; then
Expand Down

0 comments on commit 4ad6a5f

Please sign in to comment.