Switch to module output for emscripten builds

Results in smaller outputs, and unblocks the switch to Vite. Updates mihaip/infinite-mac#155
mihaip · May 28, 2023 · 49787f8 · 49787f8
1 parent c9b4223
commit 49787f8
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 16 deletions.
diff --git a/BasiliskII/src/Unix/Makefile.in b/BasiliskII/src/Unix/Makefile.in
@@ -32,6 +32,12 @@ DEFS = @DEFS@ @DEFINES@ -D_REENTRANT -DDATADIR=\"$(datadir)/$(APP)\"
 LDFLAGS = @LDFLAGS@
 LIBS = @LIBS@
 ifeq ($(EMSCRIPTEN),yes)
+	# We can't specify these flags in _emconfigure.sh because then the autoconf
+	# tests will fail (the version of node that they conftest program is run
+	# under does not support modules).
+	LDFLAGS += -s INITIAL_MEMORY=268435456 # 256 MB
+	LDFLAGS += -s MODULARIZE -s EXPORT_ES6 -s EXPORT_NAME=emulator
+	LDFLAGS += -s EXPORTED_RUNTIME_METHODS=FS
 	# Breaks emscripten because it can't link with libm.a or SDL (which are
 	# built for the host OS)
 	SKIP_LIBS = -lm -lSDL -L/usr/lib/x86_64-linux-gnu -L/usr/lib/aarch64-linux-gnu

diff --git a/BasiliskII/src/Unix/_emconfigure.sh b/BasiliskII/src/Unix/_emconfigure.sh
@@ -4,10 +4,6 @@ set -euo pipefail
 em_flags=""
 em_ldflags=""
 
-em_ldflags+=" -s INITIAL_MEMORY=268435456"
-em_ldflags+=" -s FORCE_FILESYSTEM=1"
-em_ldflags+=" -s WASM=1"
-
 em_defines=""
 if [[ -z "${macemujs_conf_debug:-}" ]]; then
   em_flags+=" -O3 -gsource-map"
@@ -19,16 +15,13 @@ else
   em_defines+=" -DDEBUG"
 fi
 
-export CC="emcc"
-export CXX="em++"
-export AR="emar"
 export EMSCRIPTEN=1
 export DEFINES=$em_defines
 export CFLAGS="$em_flags -g"
 export CPPFLAGS="$em_flags -g"
 export LDFLAGS="$em_flags $em_ldflags"
 
-./autogen.sh \
+emconfigure ./autogen.sh \
   --without-esd \
   --without-gtk \
   --disable-sdl-video \

diff --git a/SheepShaver/src/Unix/Makefile.in b/SheepShaver/src/Unix/Makefile.in
@@ -11,6 +11,8 @@ datadir = @datadir@
 mandir = @mandir@
 man1dir = $(mandir)/man1
 
+EMSCRIPTEN = @EMSCRIPTEN@
+
 DESTDIR =
 
 CC = @CC@
@@ -83,6 +85,15 @@ CXXFLAGS += $(GUI_CFLAGS)
 LIBS += $(GUI_LIBS)
 endif
 
+ifeq ($(EMSCRIPTEN),yes)
+	# We can't specify these flags in _emconfigure.sh because then the autoconf
+	# tests will fail (the version of node that they conftest program is run
+	# under does not support modules).
+	LDFLAGS += -s INITIAL_MEMORY=268435456 # 256 MB
+	LDFLAGS += -s MODULARIZE -s EXPORT_ES6 -s EXPORT_NAME=emulator
+	LDFLAGS += -s EXPORTED_RUNTIME_METHODS=FS
+endif
+
 ## Rules
 .PHONY: modules install uninstall clean distclean depend dep
 .SUFFIXES:

diff --git a/SheepShaver/src/Unix/_emconfigure.sh b/SheepShaver/src/Unix/_emconfigure.sh
@@ -4,10 +4,6 @@ set -euo pipefail
 em_flags=""
 em_ldflags=""
 
-em_ldflags+=" -s INITIAL_MEMORY=268435456"
-em_ldflags+=" -s FORCE_FILESYSTEM=1"
-em_ldflags+=" -s WASM=1"
-
 em_defines=""
 if [[ -z "${macemujs_conf_debug:-}" ]]; then
   em_flags+=" -O3 -gsource-map"
@@ -19,16 +15,13 @@ else
   em_defines+=" -DDEBUG"
 fi
 
-export CC="emcc"
-export CXX="em++"
-export AR="emar"
 export EMSCRIPTEN=1
 export DEFINES=$em_defines
 export CFLAGS="$em_flags -g"
 export CPPFLAGS="$em_flags -g"
 export LDFLAGS="$em_flags $em_ldflags"
 
-./autogen.sh \
+emconfigure ./autogen.sh \
   --without-esd \
   --without-gtk \
   --disable-sdl-video \