From 0aa5aea84f6749553837c9ef28cdc75e8d4b773d Mon Sep 17 00:00:00 2001 From: couriersud Date: Tue, 25 Aug 2020 19:41:32 +0200 Subject: netlist: Fix various issues around include directories. * removed include directory src/lib/netlist from various genie files to avoid potential issues. * Code using netlist should use #include "netlist/*". * Updated includes. * Fixed standalone makefile depend target to properly deal with relative paths. --- scripts/src/netlist.lua | 2 +- scripts/target/mame/arcade.lua | 1 - scripts/target/mame/dummy.lua | 1 - scripts/target/mame/mess.lua | 1 - scripts/target/mame/nl.lua | 1 - 5 files changed, 1 insertion(+), 5 deletions(-) (limited to 'scripts') diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua index 7e3b1c3c8e5..9ec867d3db0 100644 --- a/scripts/src/netlist.lua +++ b/scripts/src/netlist.lua @@ -32,7 +32,7 @@ project "netlist" } includedirs { - MAME_DIR .. "src/lib", + -- MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/netlist", } diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index 9355fb09dd6..522b736373b 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -961,7 +961,6 @@ function createMAMEProjects(_target, _subtarget, _name) MAME_DIR .. "src/mame", MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", - MAME_DIR .. "src/lib/netlist", MAME_DIR .. "3rdparty", GEN_DIR .. "mame/layout", } diff --git a/scripts/target/mame/dummy.lua b/scripts/target/mame/dummy.lua index ef4d7d69199..b939c1eb0ad 100644 --- a/scripts/target/mame/dummy.lua +++ b/scripts/target/mame/dummy.lua @@ -27,7 +27,6 @@ function createProjects_mame_dummy(_target, _subtarget) MAME_DIR .. "src/mame", MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", - MAME_DIR .. "src/lib/netlist", MAME_DIR .. "3rdparty", GEN_DIR .. "mame/layout", } diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua index 31bc1a1972c..dc6560cc99c 100644 --- a/scripts/target/mame/mess.lua +++ b/scripts/target/mame/mess.lua @@ -1398,7 +1398,6 @@ function createMESSProjects(_target, _subtarget, _name) MAME_DIR .. "src/mame", MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", - MAME_DIR .. "src/lib/netlist", MAME_DIR .. "3rdparty", GEN_DIR .. "mame/layout", } diff --git a/scripts/target/mame/nl.lua b/scripts/target/mame/nl.lua index dbfb9cb1f21..1124c49b641 100644 --- a/scripts/target/mame/nl.lua +++ b/scripts/target/mame/nl.lua @@ -133,7 +133,6 @@ function createProjects_mame_nl(_target, _subtarget) MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", MAME_DIR .. "src/devices", - MAME_DIR .. "src/lib/netlist", MAME_DIR .. "src/mame", MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", -- cgit v1.2.3-70-g09d2