Fix more driver building, going deeper in checks (nw)

This commit is contained in:
Miodrag Milanovic 2015-06-20 19:19:03 +02:00
parent c665cb017b
commit 449a851e34
5 changed files with 9 additions and 12 deletions

View File

@ -53,7 +53,6 @@ SOUNDS = {}
MACHINES = {}
VIDEOS = {}
BUSES = {}
bus_count = 0
newoption {
trigger = "with-tools",

View File

@ -408,15 +408,7 @@ function emuProject(_target, _subtarget)
dofile(path.join("src", "machine.lua"))
-- netlist now defines a project
dofile(path.join("src", "netlist.lua"))
bus_count = 0
for k,v in pairs(BUSES) do
bus_count = bus_count + 1
end
if (bus_count > 0) then
if (_OPTIONS["DRIVERS"] == nil) then
project ("bus")
uuid ("5d782c89-cf7e-4cfe-8f9f-0d4bfc16c91d")
kind (LIBTYPE)
@ -453,9 +445,14 @@ if (bus_count > 0) then
}
end
dofile(path.join("src", "bus.lua"))
else
dofile(path.join("src", "bus.lua"))
end
-- netlist now defines a project
dofile(path.join("src", "netlist.lua"))
project ("dasm")
uuid ("f2d28b0a-6da5-4f78-b629-d834aa00429d")

View File

@ -87,7 +87,7 @@ function mainProject(_target, _subtarget)
links {
"osd_" .. _OPTIONS["osd"],
}
if (bus_count > 0) then
if (_OPTIONS["DRIVERS"] == nil) then
links {
"bus",
}

View File

@ -1130,6 +1130,7 @@ end
--@src/emu/sound/ymf262.h,SOUNDS["YMF262"] = true
--@src/emu/sound/ymf271.h,SOUNDS["YMF271"] = true
--@src/emu/sound/ymf278b.h,SOUNDS["YMF278B"] = true
--@src/emu/sound/262intf.h,SOUNDS["YMF262"] = true
---------------------------------------------------
if (SOUNDS["YM2151"]~=null) then

View File

@ -108,7 +108,6 @@ def parse_file(root, srcfile, folder):
try:
fp = open(root + srcfile, 'rb')
except IOError:
sys.stderr.write("Unable to open source file '%s'\n" % srcfile)
return 1
in_comment = 0
linenum = 0
@ -153,6 +152,7 @@ def parse_file(root, srcfile, folder):
files_included.append(fullname)
newfolder = fullname.rsplit('/', 1)[0] + '/'
parse_file(root, fullname, newfolder)
parse_file(root, fullname.replace('.h','.c'), newfolder)
continue
return 0