summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Justin Kerk <dopefishjustin@gmail.com>2016-04-29 04:40:21 +0000
committer Justin Kerk <dopefishjustin@gmail.com>2016-04-29 04:40:34 +0000
commit41a489a94769b19e10c91b27934bf9351d53b4f1 (patch)
treeb11d5723c6b521e908ce500fedda9f2a66355ca9
parent5adfc5b2a5f9415b311e3958c92dc19e19bfdbe1 (diff)
Work around linker issues with Emscripten (nw)
-rw-r--r--scripts/src/devices.lua9
-rw-r--r--scripts/src/mame/frontend.lua10
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",