diff options
-rw-r--r-- | scripts/genie.lua | 1 | ||||
-rw-r--r-- | scripts/src/emu.lua | 15 | ||||
-rw-r--r-- | scripts/src/main.lua | 2 | ||||
-rw-r--r-- | scripts/src/sound.lua | 1 | ||||
-rw-r--r-- | src/build/makedep.py | 2 |
5 files changed, 9 insertions, 12 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua index fd8a2ae5647..150c6d73294 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -53,7 +53,6 @@ SOUNDS = {} MACHINES = {} VIDEOS = {} BUSES = {} -bus_count = 0 newoption { trigger = "with-tools", diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index 12e7525aca1..1205b8e6ab8 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -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) @@ -454,8 +446,13 @@ 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") diff --git a/scripts/src/main.lua b/scripts/src/main.lua index c76cbbf3028..e34295829d6 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -87,7 +87,7 @@ function mainProject(_target, _subtarget) links { "osd_" .. _OPTIONS["osd"], } - if (bus_count > 0) then + if (_OPTIONS["DRIVERS"] == nil) then links { "bus", } diff --git a/scripts/src/sound.lua b/scripts/src/sound.lua index f92098a7a3d..1bd78f8ed35 100644 --- a/scripts/src/sound.lua +++ b/scripts/src/sound.lua @@ -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 diff --git a/src/build/makedep.py b/src/build/makedep.py index f82292324fa..573960dfb89 100644 --- a/src/build/makedep.py +++ b/src/build/makedep.py @@ -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 |