diff options
author | 2020-08-05 05:56:30 +0000 | |
---|---|---|
committer | 2020-08-05 05:58:14 +0000 | |
commit | 2dd0985999b8f93afb4a59e89f0d2ec2a9a4d80f (patch) | |
tree | cb568aa1f341384955603ad36ff8cf0387cee07a | |
parent | 96937e900702a782ac33aeed499602839e428fa7 (diff) |
netlist: Fix build under Emscripten (#7031)
netlist: Fix crash under Emscripten by disabling aligned optimizations
-rw-r--r-- | scripts/src/netlist.lua | 5 | ||||
-rw-r--r-- | src/lib/netlist/plib/palloc.h | 4 | ||||
-rw-r--r-- | src/lib/netlist/plib/ptypes.h | 4 |
3 files changed, 13 insertions, 0 deletions
diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua index 2607d419576..c794095115d 100644 --- a/scripts/src/netlist.lua +++ b/scripts/src/netlist.lua @@ -31,6 +31,11 @@ project "netlist" "NL_USE_ACADEMIC_SOLVERS=0", } + configuration { "asmjs" } + defines { + "PUSE_ALIGNED_OPTIMIZATIONS=0", + } + includedirs { MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/netlist", diff --git a/src/lib/netlist/plib/palloc.h b/src/lib/netlist/plib/palloc.h index b0e21924dd7..dd5958ff288 100644 --- a/src/lib/netlist/plib/palloc.h +++ b/src/lib/netlist/plib/palloc.h @@ -25,6 +25,10 @@ #include <malloc.h> #endif +#if defined(PAGESIZE) +#undef PAGESIZE +#endif + namespace plib { //============================================================ diff --git a/src/lib/netlist/plib/ptypes.h b/src/lib/netlist/plib/ptypes.h index 5efac1fbad5..5c5cb37695a 100644 --- a/src/lib/netlist/plib/ptypes.h +++ b/src/lib/netlist/plib/ptypes.h @@ -35,6 +35,10 @@ name(name &&) /*noexcept*/ = def; \ name &operator=(name &&) /*noexcept*/ = def; +#if defined(EMSCRIPTEN) +#undef EMSCRIPTEN +#endif + namespace plib { //============================================================ |