summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Justin Kerk <dopefishjustin@gmail.com>2024-03-13 23:03:49 -0700
committer Justin Kerk <dopefishjustin@gmail.com>2024-03-13 23:03:49 -0700
commit663464d169d4bf4e51e5e50dd837ccb42ee6afd6 (patch)
tree2ceb442291299b2f424acac39a840a064778d7a1
parentf65fb7586d9d86564fecb7eafab9b94e4ae83ea8 (diff)
Slightly different fix for asio compilation with newer Emscripten (#12098)
This restores the previous status quo from Emscripten 3.1.28 where asio is always compiled with pthread support, however threading is still not actually functional in the Emscripten target. The change in behaviour appears to be due to emscripten-core/emscripten@690f1bdb9ecac731a071225d33cb5b4a192144e9
-rw-r--r--scripts/genie.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua
index 961b22a90b0..3fe609600be 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -1174,7 +1174,7 @@ configuration { "asmjs" }
"-s EXCEPTION_CATCHING_ALLOWED=\"['_ZN15running_machine17start_all_devicesEv','_ZN12cli_frontend7executeEiPPc','_ZN8chd_file11open_commonEb','_ZN8chd_file13read_metadataEjjRNSt3__212basic_stringIcNS0_11char_traitsIcEENS0_9allocatorIcEEEE','_ZN8chd_file13read_metadataEjjRNSt3__26vectorIhNS0_9allocatorIhEEEE','_ZNK19netlist_mame_device19base_validity_checkER16validity_checker']\"",
}
defines {
- "ASIO_DISABLE_THREADS",
+ "ASIO_HAS_PTHREADS",
}
linkoptions {
"-Wl,--start-group",