summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
author David Haywood <mamehaze@users.noreply.github.com>2015-10-09 14:30:50 +0100
committer David Haywood <mamehaze@users.noreply.github.com>2015-10-09 14:30:50 +0100
commit8c3375affa313bb841d993d705a370f0999c57a4 (patch)
tree8acf6b6cf471dc3b9d644155340d2ba35cb46643 /scripts/src
parentfb989bb821f049bc41d537a0421e73b8798d48ac (diff)
parentfeef4e980ecc5d2d08cd9c40d1e6f081896fc786 (diff)
Merge branch 'master' of https://github.com/mamedev/mame
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/devices.lua5
-rw-r--r--scripts/src/main.lua14
2 files changed, 14 insertions, 5 deletions
diff --git a/scripts/src/devices.lua b/scripts/src/devices.lua
index 6ec60b29826..c46d0db8427 100644
--- a/scripts/src/devices.lua
+++ b/scripts/src/devices.lua
@@ -47,7 +47,7 @@ function devicesProject(_target, _subtarget)
dofile(path.join("src", "machine.lua"))
-if (_OPTIONS["DRIVERS"] == nil) then
+if (_OPTIONS["SOURCES"] == nil) then
project ("bus")
uuid ("5d782c89-cf7e-4cfe-8f9f-0d4bfc16c91d")
kind (LIBTYPE)
@@ -85,6 +85,7 @@ else
dofile(path.join("src", "bus.lua"))
end
+if #disasm_files > 0 then
project ("dasm")
uuid ("f2d28b0a-6da5-4f78-b629-d834aa00429d")
kind (LIBTYPE)
@@ -129,3 +130,5 @@ end
}
end
end
+
+end
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index 97c213b4620..d4d991dcdfa 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -2,7 +2,7 @@
-- copyright-holders:MAMEdev Team
function mainProject(_target, _subtarget)
-if (_OPTIONS["DRIVERS"] == nil) then
+if (_OPTIONS["SOURCES"] == nil) then
if (_target == _subtarget) then
project (_target)
else
@@ -38,7 +38,7 @@ end
flags {
"Unicode",
}
-if (_OPTIONS["DRIVERS"] == nil) then
+if (_OPTIONS["SOURCES"] == nil) then
configuration { "x64", "Release" }
targetsuffix "64"
if _OPTIONS["PROFILE"] then
@@ -91,7 +91,7 @@ end
links {
"osd_" .. _OPTIONS["osd"],
}
- if (_OPTIONS["DRIVERS"] == nil) then
+ if (_OPTIONS["SOURCES"] == nil) then
links {
"bus",
}
@@ -101,7 +101,13 @@ end
"optional",
"emu",
"formats",
+ }
+if #disasm_files > 0 then
+ links {
"dasm",
+ }
+end
+ links {
"utils",
"expat",
"softfloat",
@@ -226,7 +232,7 @@ end
GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.c",
}
-if (_OPTIONS["DRIVERS"] == nil) then
+if (_OPTIONS["SOURCES"] == nil) then
dependency {
{ "../../../../generated/mame/mame/drivlist.c", MAME_DIR .. "src/mame/mess.lst", true },
{ "../../../../generated/mame/mame/drivlist.c" , MAME_DIR .. "src/mame/arcade.lst", true},