diff --git a/.ci/wasm/build.sh b/.ci/wasm/build.sh index 49c1123db6..3b6dc932d3 100644 --- a/.ci/wasm/build.sh +++ b/.ci/wasm/build.sh @@ -65,7 +65,6 @@ done # This seems to be fixed in later versions but occurs atleast on 4.0.3-git and below. emcmake cmake -B "$OUTDIR" -G "Unix Makefiles" \ -DCMAKE_BUILD_TYPE=${TYPE} \ - -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \ -DENABLE_OPENGL=OFF \ -DENABLE_LTO=OFF \ -DENABLE_QT=OFF \ @@ -76,7 +75,9 @@ emcmake cmake -B "$OUTDIR" -G "Unix Makefiles" \ -DENABLE_UPDATE_CHECKER=OFF \ -DENABLE_WEB_SERVICE=OFF \ -DUSE_DISCORD_PRESENCE=OFF \ + -DENABLE_WIFI_SCAN=OFF \ -DUSE_FASTER_LINKER=ON \ + -DYUZU_STATIC_BUILD=ON \ -DYUZU_USE_BUNDLED_OPENSSL=OFF \ -DYUZU_USE_EXTERNAL_FFMPEG=ON \ -Dzstd_FORCE_BUNDLED=ON \ @@ -84,8 +85,8 @@ emcmake cmake -B "$OUTDIR" -G "Unix Makefiles" \ -DEMSCRIPTEN_SYSTEM_PROCESSOR=wasm \ -DCMAKE_C_FLAGS="-s MEMORY64 -m64 -pipe -sMEMORY64=1" \ -DCMAKE_CXX_FLAGS="-s MEMORY64 -m64 -pipe -sMEMORY64=1" \ - -DCMAKE_EXE_LINKER_FLAGS="-sMEMORY64=1 -m64 -Wl,-mwasm64 -sASYNCIFY=1 -pthread" \ - -DCMAKE_C_LINK_FLAGS="-sMEMORY64=1 -m64 -Wl,-mwasm64 -sASYNCIFY=1 -pthread" \ - -DCMAKE_CXX_LINK_FLAGS="-sMEMORY64=1 -m64 -Wl,-mwasm64 -sASYNCIFY=1 -pthread" \ + -DCMAKE_EXE_LINKER_FLAGS="-sMEMORY64=1 -m64 -Wl,-mwasm64 -sASYNCIFY=1" \ + -DCMAKE_C_LINK_FLAGS="-sMEMORY64=1 -m64 -Wl,-mwasm64 -sASYNCIFY=1" \ + -DCMAKE_CXX_LINK_FLAGS="-sMEMORY64=1 -m64 -Wl,-mwasm64 -sASYNCIFY=1" cmake --build "$OUTDIR" -- -j$NUM_JOBS diff --git a/cpmfile.json b/cpmfile.json index f7b2871a94..9df8a6f2d4 100644 --- a/cpmfile.json +++ b/cpmfile.json @@ -121,7 +121,7 @@ "find_args": "MODULE GLOBAL", "hash": "159ed94965018f2a371d45a3bfc1961e5fb1549e501ded70a6b4532d7fe99d0579c18b5195aff6e35f96f399b426cea2650ec9fb75ef80d4c9edeccb51f2e6c9", "options": [ - "HTTPLIB_REQUIRE_OPENSSL ON", + "HTTPLIB_REQUIRE_OPENSSL OFF", "HTTPLIB_DISABLE_MACOSX_AUTOMATIC_ROOT_CERTIFICATES ON" ], "patches": [ @@ -207,7 +207,8 @@ "min_version": "3.0.0", "package": "OpenSSL", "patches": [ - "0001-add-bundled-cert.patch" + "0001-add-bundled-cert.patch", + "0002-wasm-support.patch" ], "repo": "openssl/openssl", "tag": "openssl-%VERSION%",