diff --git a/build_libzip.sh b/build_libzip.sh index 7fa8dbc..f830e1a 100755 --- a/build_libzip.sh +++ b/build_libzip.sh @@ -12,7 +12,7 @@ export CFLAGS="$CFLAGS --use-port=zlib" export LDFLAGS="$LDFLAGS -L${INSTALL_DIR}/lib --use-port=zlib" emcmake cmake \ - -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" + -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" -DBUILD_SHARED_LIBS=OFF -DBUILD_TOOLS=OFF -DBUILD_REGRESS=OFF -DBUILD_OSSFUZZ=OFF -DBUILD_EXAMPLES=OFF -DBUILD_DOC=OFF emmake make emmake make install diff --git a/build_luanti.sh b/build_luanti.sh index 38bb0a7..afd0ec4 100755 --- a/build_luanti.sh +++ b/build_luanti.sh @@ -13,12 +13,12 @@ pushd luanti export EMSDK_PORTS="--use-port=zlib --use-port=libjpeg --use-port=libpng --use-port=freetype --use-port=ogg --use-port=vorbis --use-port=sqlite3" export EMSDK_CANVAS="-sPROXY_TO_PTHREAD=1 -sOFFSCREENCANVAS_SUPPORT=1 -sJSPI" -export EMSDK_MODULE="-sINCOMING_MODULE_JS_API=mainScriptUrlOrBlob,canvas,monitorRunDependencies,preRun,postRun,print,printErr,setStatus,onFullScreen" +export EMSDK_MODULE="-sINCOMING_MODULE_JS_API=canvas,print,printErr,locateFile,onAbort" export EMSDK_EXTRA="-sUSE_SDL=2 $EMSDK_PORTS $EMSDK_CANVAS $EMSDK_MODULE" export CFLAGS="$CFLAGS $EMSDK_EXTRA" export CXXFLAGS="$CXXFLAGS $EMSDK_EXTRA" -export LDFLAGS="$LDFLAGS $EMSDK_EXTRA -sPTHREAD_POOL_SIZE=22 -s EXPORTED_RUNTIME_METHODS=ccall,cwrap -s INITIAL_MEMORY=2013265920 -sMIN_WEBGL_VERSION=2 -sUSE_WEBGL2 -sWASMFS=1" -export LDFLAGS="$LDFLAGS -L$INSTALL_DIR/lib -larchive -lssl -lcrypto -lemsocket -lwebsocket.js" +export LDFLAGS="$LDFLAGS $EMSDK_EXTRA -sPTHREAD_POOL_SIZE=22 -sEXPORTED_RUNTIME_METHODS=ccall,cwrap,FS,wasmMemory -sEXPORTED_FUNCTIONS=_main,_malloc,_free -sFORCE_FILESYSTEM -sALLOW_MEMORY_GROWTH -sINITIAL_MEMORY=268435456 -sMAXIMUM_MEMORY=2147483648 -sMIN_WEBGL_VERSION=2 -sUSE_WEBGL2 -sWASMFS=1" +export LDFLAGS="$LDFLAGS -L$INSTALL_DIR/lib -larchive -lemsocket -lwebsocket.js" # Create a dummy .o file to use as a substitute for the OpenGLES2 / EGL libraries, # since Emscripten doesn't actually provide those. (the symbols are resolved through @@ -37,6 +37,8 @@ if ! $INCREMENTAL; then -DRUN_IN_PLACE=TRUE \ -DENABLE_GLES=TRUE \ -DENABLE_UPDATE_CHECKER=0 \ + -DENABLE_CURL=OFF \ + -DBUILD_UNITTESTS=FALSE \ -DFREETYPE_LIBRARY="$DUMMY_OBJECT" \ -DPNG_LIBRARY="$DUMMY_OBJECT" \ -DVORBISFILE_LIBRARY="$DUMMY_OBJECT" \ @@ -48,8 +50,6 @@ if ! $INCREMENTAL; then -DZSTD_INCLUDE_DIR="$INSTALL_DIR/include" \ -DEGL_LIBRARY="$DUMMY_OBJECT" \ -DEGL_INCLUDE_DIR="$DUMMY_INCLUDE_DIR" \ - -DCURL_LIBRARY="$INSTALL_DIR/lib/libcurl.a" \ - -DCURL_INCLUDE_DIR="$INSTALL_DIR/include" \ -DCMAKE_INSTALL_PREFIX="$BUILD_DIR/luanti-install" \ -DLIBZIP_LIBRARY="$INSTALL_DIR/lib/libzip.a" \ -DLIBZIP_INCLUDE_DIR="$INSTALL_DIR/include" \ diff --git a/build_zstd.sh b/build_zstd.sh index 2a89096..c610d87 100755 --- a/build_zstd.sh +++ b/build_zstd.sh @@ -14,7 +14,7 @@ export MAKEFLAGS="" export CFLAGS="$CFLAGS -D_POSIX_SOURCE=1" export CXXFLAGS="$CXXFLAGS -D_POSIX_SOURCE=1" emcmake cmake \ - -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" \ + -DCMAKE_INSTALL_PREFIX="$INSTALL_DIR" -DZSTD_BUILD_SHARED=OFF \ "$SOURCES_DIR/zstd/build/cmake" emmake make