From 41a489a94769b19e10c91b27934bf9351d53b4f1 Mon Sep 17 00:00:00 2001 From: Justin Kerk Date: Fri, 29 Apr 2016 04:40:21 +0000 Subject: Work around linker issues with Emscripten (nw) --- scripts/src/devices.lua | 9 ++++++--- scripts/src/mame/frontend.lua | 10 +++++++--- 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/scripts/src/devices.lua b/scripts/src/devices.lua index 1248bcc0fe5..cbdb046f397 100644 --- a/scripts/src/devices.lua +++ b/scripts/src/devices.lua @@ -19,9 +19,12 @@ function devicesProject(_target, _subtarget) uuid (os.uuid("optional-" .. _target .."_" .. _subtarget)) kind (LIBTYPE) targetsubdir(_target .."_" .. _subtarget) - options { - "ArchiveSplit", - } + + if (_OPTIONS["targetos"] ~= "asmjs") then + options { + "ArchiveSplit", + } + end addprojectflags() precompiledheaders() diff --git a/scripts/src/mame/frontend.lua b/scripts/src/mame/frontend.lua index 2e4a35bf8a9..a0723e826a6 100644 --- a/scripts/src/mame/frontend.lua +++ b/scripts/src/mame/frontend.lua @@ -16,9 +16,13 @@ kind (LIBTYPE) addprojectflags() precompiledheaders() -options { - "ArchiveSplit", -} + +if (_OPTIONS["targetos"] ~= "asmjs") then + options { + "ArchiveSplit", + } +end + includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", -- cgit v1.2.3-70-g09d2