From ee3af240d79ffd26f20aa7a926a8c4999630750d Mon Sep 17 00:00:00 2001 From: radius Date: Sun, 28 Aug 2016 19:14:42 -0500 Subject: [PATCH] update emscripten dist-cores for buildbot duty --- Makefile.emscripten | 2 +- dist-scripts/dist-cores.sh | 8 +++++--- pkg/emscripten/webplayer.html | 2 +- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Makefile.emscripten b/Makefile.emscripten index 5e5a2951d0..30ceb950a2 100644 --- a/Makefile.emscripten +++ b/Makefile.emscripten @@ -1,4 +1,4 @@ -TARGET = retroarch.js +TARGET := retroarch.js OS = Emscripten OBJ := diff --git a/dist-scripts/dist-cores.sh b/dist-scripts/dist-cores.sh index ce97d40000..cf2e7293b7 100755 --- a/dist-scripts/dist-cores.sh +++ b/dist-scripts/dist-cores.sh @@ -169,7 +169,7 @@ for f in `ls -v *_${platform}.${EXT}`; do if [ $MAKEFILE_GRIFFIN = "yes" ]; then make -C ../ -f Makefile.griffin platform=${platform} $whole_archive $big_stack -j3 || exit 1 elif [ $PLATFORM = "emscripten" ]; then - make -C ../ -f Makefile.emscripten LTO=$lto -j7 || exit 1 + make -C ../ -f Makefile.emscripten LTO=$lto -j7 TARGET=${name}_libretro.js || exit 1 elif [ $PLATFORM = "unix" ]; then make -C ../ -f Makefile LINK=g++ $whole_archive $big_stack -j3 || exit 1 elif [ $PLATFORM = "ctr" ]; then @@ -243,7 +243,9 @@ for f in `ls -v *_${platform}.${EXT}`; do elif [ $PLATFORM = "wii" ] ; then mv -f ../retroarch_${platform}.dol ../pkg/${platform}/${name}_libretro_${platform}.dol elif [ $PLATFORM = "emscripten" ] ; then - mv -f ../retroarch.js ../emscripten/$name.js + mkdir -p ../pkg/emscripten/ + mv -f ../${name}_libretro.js ../pkg/emscripten/${name}_libretro.js + mv -f ../${name}_libretro.js.mem ../pkg/emscripten/${name}_libretro.js.mem fi # Remove executable files @@ -264,7 +266,7 @@ for f in `ls -v *_${platform}.${EXT}`; do elif [ $PLATFORM = "wii" ] ; then rm -f ../retroarch_${platform}.dol ../retroarch_${platform}.elf ../retroarch_${platform}.elf.map elif [ $platform = "emscripten" ] ; then - rm -f ../retroarch.js + rm -f ../${name}_libretro.js fi # Do cleanup if this is a big stack core diff --git a/pkg/emscripten/webplayer.html b/pkg/emscripten/webplayer.html index 379066d675..1aa0a075c6 100644 --- a/pkg/emscripten/webplayer.html +++ b/pkg/emscripten/webplayer.html @@ -85,6 +85,6 @@ - +