mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-01 00:32:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3685 from fr500/master

Browse Source 
Use asyncify for dosbox
This commit is contained in:
Andrés Suárez 2016-09-28 19:53:53 -05:00 committed by GitHub
commit 46decc8c3b
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile.emscripten
View File

@ -21,8 +21,7 @@ HAVE_ZLIB = 1
HAVE_FBO = 1
WANT_ZLIB = 1
MEMORY = 536870912
LTO = 0
ASYNC = 0
# XXX: setting this to 1/2 currently crashes Firefox nightly
PRECISE_F32 = 2
@ -46,7 +45,7 @@ ifneq ($(PTHREAD), 0)
LDFLAGS += -s USE_PTHREADS=$(PTHREAD) -s PTHREAD_POOL_SIZE=2
endif
ifneq ($(ASYNC), 0)
ifeq ($(ASYNC), 1)
LDFLAGS += -s ASYNCIFY=$(ASYNC)
endif

11
dist-scripts/dist-cores.sh
View File

@ -134,11 +134,12 @@ COUNTER=0
#for f in *_${platform}.${EXT} ; do
for f in `ls -v *_${platform}.${EXT}`; do
name=`echo "$f" | sed "s/\(_libretro_${platform}\|\).${EXT}$//"`
async=0
pthread=0
lto=0
whole_archive=
big_stack=
async=0
pthread=0
if [ $name = "nxengine" ] ; then
echo "Applying whole archive linking..."
whole_archive="WHOLE_ARCHIVE_LINK=1"
@ -148,6 +149,8 @@ for f in `ls -v *_${platform}.${EXT}`; do
big_stack="BIG_STACK=1"
elif [ $name = "mupen64plus" ] ; then
async=1
elif [ $name = "dosbox" ] ; then
async=1
fi
echo "-- Building core: $name --"
if [ $PLATFORM = "unix" ]; then
@ -155,6 +158,9 @@ for f in `ls -v *_${platform}.${EXT}`; do
else
cp -f "$f" ../libretro_${platform}.${EXT}
fi
echo NAME: $name
echo ASYNC: $async
echo LTO: $lto
# Do cleanup if this is a big stack core
if [ "$big_stack" = "BIG_STACK=1" ] ; then
@ -173,6 +179,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
echo "BUILD COMMAND: make -C ../ -f Makefile.emscripten PTHREAD=$pthread ASYNC=$async LTO=$lto -j7 TARGET=${name}_libretro.js"
make -C ../ -f Makefile.emscripten PTHREAD=$pthread ASYNC=$async 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