From 3830dbebaf0ab10feeb19d29780790ea1b0b9c4d Mon Sep 17 00:00:00 2001 From: Toad King Date: Wed, 31 Dec 2014 20:26:22 -0600 Subject: [PATCH] fix emscripten build --- Makefile.emscripten | 4 +++- frontend/platform/platform_emscripten.c | 2 +- gfx/video_filter.c | 7 ++++++- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile.emscripten b/Makefile.emscripten index 38ab7ee0b7..b1835ceb9b 100644 --- a/Makefile.emscripten +++ b/Makefile.emscripten @@ -6,13 +6,14 @@ DEFINES := -DRARCH_INTERNAL -DHAVE_OVERLAY DEFINES += -DHAVE_OPENGL -DHAVE_OPENGLES -DHAVE_OPENGLES2 -DHAVE_EGL -DHAVE_OVERLAY -DHAVE_GLSL HAVE_OPENGL = 1 +HAVE_GLES = 1 HAVE_EMSCRIPTEN = 1 HAVE_RGUI = 1 HAVE_SDL = 0 HAVE_ZLIB = 1 HAVE_FBO = 1 WANT_MINIZ = 1 -MEMORY = 67108864 +MEMORY = 268435456 LTO = 0 # XXX: setting this to 1/2 currently crashes Firefox nightly PRECISE_F32 = 2 @@ -84,6 +85,7 @@ clean: rm -f record/*.o rm -f input/*.o rm -f tools/*.o + rm -f libretro-sdk/*/*.o rm -f $(TARGET) rm -f *.d diff --git a/frontend/platform/platform_emscripten.c b/frontend/platform/platform_emscripten.c index f1559ef6fe..8e35ff4b19 100644 --- a/frontend/platform/platform_emscripten.c +++ b/frontend/platform/platform_emscripten.c @@ -23,7 +23,7 @@ static void emscripten_mainloop(void) { - int ret = main_entry_decide(0, NULL, NULL) + int ret = main_entry_decide(0, NULL, NULL); if (ret == -1) { diff --git a/gfx/video_filter.c b/gfx/video_filter.c index d83fbb8d06..403e2ec7e4 100644 --- a/gfx/video_filter.c +++ b/gfx/video_filter.c @@ -288,7 +288,7 @@ static bool append_softfilter_plugs(rarch_softfilter_t *filt, return true; } -#else +#elif defined(HAVE_FILTERS_BUILTIN) extern const struct softfilter_implementation *blargg_ntsc_snes_get_implementation(softfilter_simd_mask_t simd); extern const struct softfilter_implementation *lq2x_get_implementation(softfilter_simd_mask_t simd); extern const struct softfilter_implementation *phosphor2x_get_implementation(softfilter_simd_mask_t simd); @@ -334,6 +334,11 @@ static bool append_softfilter_plugs(rarch_softfilter_t *filt) return true; } +#else +static bool append_softfilter_plugs(rarch_softfilter_t *filt) +{ + return false; +} #endif rarch_softfilter_t *rarch_softfilter_new(const char *filter_config,