Get rid of library.js

emscripten/library.js

@@ -1,14 +0,0 @@
-mergeInto(LibraryManager.library, {
-	wait_vsync: function() {
-		Asyncify.handleSleep(function(wakeUp) {
-			window.requestAnimationFrame(function() {
-				wakeUp();
-			});
-		});
-	},
-	load_mincho_font: function() {
-		return Asyncify.handleSleep(function(wakeUp) {
-			xsystem35.load_mincho_font().then(wakeUp);
-		});
-	},
-});

src/CMakeLists.txt

@@ -71,8 +71,6 @@ if (EMSCRIPTEN)
 	"SHELL:-s EXPORTED_FUNCTIONS=\"['_main','_ags_setAntialiasedStringMode', '_ald_getdata', '_ald_freedata', '_va_alarm_handler']\""
 	"SHELL:-s EXTRA_EXPORTED_RUNTIME_METHODS=\"['getValue','getMemory','addRunDependency','removeRunDependency']\"")
 
-  em_link_js_library(xsystem35 ../emscripten/library.js)
-
   target_link_options(xsystem35 PRIVATE ${LINK_OPTS})
 
 else()  # non-emscripten

src/font.c

@@ -21,6 +21,10 @@
 */
 /* $Id: font.c,v 1.1 2002/09/18 13:16:22 chikama Exp $ */
 
+#ifdef __EMSCRIPTEN__
+#include <emscripten.h>
+#endif
+
 #include "config.h"
 
 #include "portab.h"
@@ -47,3 +51,11 @@ void font_init(int dev) {
 		break;
 	}
 }
+
+#ifdef __EMSCRIPTEN__
+EM_JS(int, load_mincho_font, (void), {
+	return Asyncify.handleSleep(function(wakeUp) {
+		xsystem35.load_mincho_font().then(wakeUp);
+	});
+});
+#endif

src/sdl_core.h

@@ -175,9 +175,4 @@ extern void sdl_sync();
 #define Sleep(ms) sdl_sleep(ms)
 #define WaitVsync() sdl_wait_vsync()
 
-#ifdef __EMSCRIPTEN__
-// library.js
-void wait_vsync(void);
-#endif
-
 #endif /* !__SDL_CORE__ */

src/sdl_draw.c

@@ -84,6 +84,16 @@ void sdl_sleep(int msec) {
 #endif
 }
 
+#ifdef __EMSCRIPTEN__
+EM_JS(void, wait_vsync, (void), {
+	Asyncify.handleSleep(function(wakeUp) {
+		window.requestAnimationFrame(function() {
+			wakeUp();
+		});
+	});
+});
+#endif
+
 void sdl_wait_vsync() {
 	sdl_updateScreen();
 #ifdef __EMSCRIPTEN__