Fixed arcade build and merged libbus with liboptional due to circular dependencies (nw)

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")

scripts/src/main.lua

@@ -137,11 +137,6 @@ end
 	links {
 		"qtdbg_" .. _OPTIONS["osd"],
 	}
-	if (_OPTIONS["SOURCES"] == nil) then 
-		links {
-			"bus",
-		}
-	end
 	links {
 		"netlist",
 		"optional",

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