From 29c85aad36dd9f9b42e155755c33fa10e3a55fc8 Mon Sep 17 00:00:00 2001 From: kichikuou Date: Sun, 17 Jan 2021 14:16:37 +0900 Subject: [PATCH] emscripten: Remove EXPORTED_FUNCTIONS build option --- src/CMakeLists.txt | 1 - src/ags.c | 4 ++++ src/ald_manager.c | 5 +++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cf634a4..0ac497e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -93,7 +93,6 @@ if (EMSCRIPTEN) "SHELL:-s ASYNCIFY_IMPORTS=\"['muspcm_load_no','muspcm_load_mixlr','muspcm_waitend','wait_vsync','load_mincho_font']\"" "SHELL:-s ALLOW_MEMORY_GROWTH=1" "SHELL:-s NO_EXIT_RUNTIME=1" - "SHELL:-s EXPORTED_FUNCTIONS=\"['_main','_ags_setAntialiasedStringMode', '_ald_getdata', '_ald_freedata']\"" "SHELL:-s EXTRA_EXPORTED_RUNTIME_METHODS=\"['getValue','addRunDependency','removeRunDependency']\"") elseif (ANDROID) diff --git a/src/ags.c b/src/ags.c index 602bdaa..206cf94 100644 --- a/src/ags.c +++ b/src/ags.c @@ -27,6 +27,9 @@ #include #include #include +#ifdef __EMSCRIPTEN__ +#include +#endif #include "portab.h" #include "xsystem35.h" @@ -782,6 +785,7 @@ void ags_setCursorLocation(int x, int y, boolean is_dibgeo) { } } +EMSCRIPTEN_KEEPALIVE void ags_setAntialiasedStringMode(boolean on) { if (!nact->noantialias) { font_set_antialias(on); diff --git a/src/ald_manager.c b/src/ald_manager.c index 0059db7..fb3a441 100644 --- a/src/ald_manager.c +++ b/src/ald_manager.c @@ -26,6 +26,9 @@ #include "dri.h" #include "cache.h" #include "ald_manager.h" +#ifdef __EMSCRIPTEN__ +#include +#endif /* drifiles object */ static drifiles *dri[DRIFILETYPEMAX]; @@ -53,6 +56,7 @@ static void ald_free(dridata *dfile) { * no : file no ( >= 0 ) * return: loaded dridata object */ +EMSCRIPTEN_KEEPALIVE dridata *ald_getdata(DRIFILETYPE type, int no) { dridata *ddata; @@ -86,6 +90,7 @@ dridata *ald_getdata(DRIFILETYPE type, int no) { * free dri object * data: object to be free */ +EMSCRIPTEN_KEEPALIVE void ald_freedata(dridata *data) { if (data == NULL) return;