summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-03-06 09:09:18 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-03-06 09:09:18 +0100
commit98f0e800f455fe8ebea42036d4adcc17ff4753c7 (patch)
tree8e2a672bf854caa9e8c8bdda22773b97faef3aac /scripts
parent7e2777df2a46ac09a030d70ef46e5bac90422b58 (diff)
Fixed arcade build and merged libbus with liboptional due to circular dependencies (nw)
Diffstat (limited to 'scripts')
-rw-r--r--scripts/src/devices.lua37
-rw-r--r--scripts/src/main.lua5
-rw-r--r--scripts/target/mame/arcade.lua2
3 files changed, 1 insertions, 43 deletions
diff --git a/scripts/src/devices.lua b/scripts/src/devices.lua
index 15e53a17cfb..c4a6c9fe0ac 100644
--- a/scripts/src/devices.lua
+++ b/scripts/src/devices.lua
@@ -57,44 +57,7 @@ function devicesProject(_target, _subtarget)
dofile(path.join("src", "machine.lua"))
-if (_OPTIONS["SOURCES"] == nil) then
- project ("bus")
- uuid ("5d782c89-cf7e-4cfe-8f9f-0d4bfc16c91d")
- kind (LIBTYPE)
- targetsubdir(_target .."_" .. _subtarget)
- addprojectflags()
- precompiledheaders()
- options {
- "ArchiveSplit",
- }
-
- includedirs {
- MAME_DIR .. "src/osd",
- MAME_DIR .. "src/emu",
- MAME_DIR .. "src/devices",
- MAME_DIR .. "src/lib/netlist",
- MAME_DIR .. "src/lib",
- MAME_DIR .. "src/lib/util",
- MAME_DIR .. "3rdparty",
- MAME_DIR .. "src/mame", -- used for nes bus devices,some mess bus devices need this
- GEN_DIR .. "emu",
- GEN_DIR .. "emu/layout",
- }
- if _OPTIONS["with-bundled-expat"] then
- includedirs {
- MAME_DIR .. "3rdparty/expat/lib",
- }
- end
- if _OPTIONS["with-bundled-lua"] then
- includedirs {
- MAME_DIR .. "3rdparty/lua/src",
- }
- end
-
dofile(path.join("src", "bus.lua"))
-else
- dofile(path.join("src", "bus.lua"))
-end
if #disasm_files > 0 then
project ("dasm")
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index daa73731b90..c9c99a354c3 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -137,11 +137,6 @@ end
links {
"qtdbg_" .. _OPTIONS["osd"],
}
- if (_OPTIONS["SOURCES"] == nil) then
- links {
- "bus",
- }
- end
links {
"netlist",
"optional",
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index 6a4157c1bf8..17f8df2f760 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -620,7 +620,7 @@ BUSES["NEOGEO"] = true
--BUSES["ORICEXT"] = true
--BUSES["PCE"] = true
BUSES["PC_JOY"] = true
---BUSES["PC_KBD"] = true
+BUSES["PC_KBD"] = true
--BUSES["PET"] = true
--BUSES["PLUS4"] = true
--BUSES["PSX_CONTROLLER"] = true