mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-23 11:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

[EMSCRIPTEN] build fix

Browse Source
This commit is contained in:
Toad King 2013-12-29 16:19:07 -05:00
parent 75ff8e55c7
commit defb6efc5a
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Makefile.emscripten
View File

@ -1,6 +1,7 @@
TARGET = retroarch.js TARGET = retroarch.js
OBJ = frontend/frontend_emscripten.o \ OBJ = frontend/frontend_emscripten.o \
frontend/frontend.o \
retroarch.o \ retroarch.o \
file.o \ file.o \
file_path.o \ file_path.o \
@ -50,7 +51,8 @@ HAVE_FBO = 1
WANT_MINIZ = 1 WANT_MINIZ = 1
MEMORY = 67108864 MEMORY = 67108864
LTO = 0 LTO = 0
FAST_DOUBLES = 1 # XXX: setting this to 1/2 currently crashes Firefox nightly
PRECISE_F32 = 0
ifneq ($(NATIVE_ZLIB),) ifneq ($(NATIVE_ZLIB),)
WANT_MINIZ = 0 WANT_MINIZ = 0
@ -58,7 +60,7 @@ endif
libretro = libretro_emscripten.bc libretro = libretro_emscripten.bc
LIBS = -lm LIBS =
DEFINES = -DHAVE_SCREENSHOTS -DHAVE_CAMERA -DHAVE_NULLAUDIO -DHAVE_BSV_MOVIE -DRARCH_INTERNAL DEFINES = -DHAVE_SCREENSHOTS -DHAVE_CAMERA -DHAVE_NULLAUDIO -DHAVE_BSV_MOVIE -DRARCH_INTERNAL
LDFLAGS = -L. -s TOTAL_MEMORY=$(MEMORY) -s OUTLINING_LIMIT=50000 --js-library emscripten/library_rwebaudio.js --js-library emscripten/library_rwebinput.js --js-library emscripten/library_rwebcam.js --no-heap-copy LDFLAGS = -L. -s TOTAL_MEMORY=$(MEMORY) -s OUTLINING_LIMIT=50000 --js-library emscripten/library_rwebaudio.js --js-library emscripten/library_rwebinput.js --js-library emscripten/library_rwebcam.js --no-heap-copy
@ -108,9 +110,7 @@ ifeq ($(DEBUG), 1)
else else
LDFLAGS += -O2 LDFLAGS += -O2
# WARNING: some optimizations can break some cores (ex: LTO breaks tyrquake) # WARNING: some optimizations can break some cores (ex: LTO breaks tyrquake)
ifeq ($(FAST_DOUBLES), 1) LDFLAGS += -s PRECISE_F32=$(PRECISE_F32)
LDFLAGS += -s DOUBLE_MODE=0
endif
ifeq ($(LTO), 1) ifeq ($(LTO), 1)
LDFLAGS += --llvm-lto 3 LDFLAGS += --llvm-lto 3
endif endif
@ -138,6 +138,7 @@ clean:
rm -f deps/miniz/*.o rm -f deps/miniz/*.o
rm -f frontend/*.o rm -f frontend/*.o
rm -f frontend/menu/*.o rm -f frontend/menu/*.o
rm -f frontend/menu/disp/*.o
rm -f audio/*.o rm -f audio/*.o
rm -f audio/xaudio-c/*.o rm -f audio/xaudio-c/*.o
rm -f compat/*.o rm -f compat/*.o

10
frontend/frontend.c
View File

@ -110,6 +110,16 @@ static void rarch_get_environment_console(void)
#define declare_argc() #define declare_argc()
#define declare_argv() #define declare_argv()
#define args_initial_ptr() NULL #define args_initial_ptr() NULL
#elif defined(EMSCRIPTEN)
#define main_entry _fakemain
#define returntype int
#define signature_expand() argc, argv
#define returnfunc() return 0
#define return_negative() return 1
#define return_var(var) return var
#define declare_argc()
#define declare_argv()
#define args_initial_ptr() NULL
#else #else
#define main_entry main #define main_entry main
#define returntype int #define returntype int