diff options
author | 2017-02-07 20:07:56 +0100 | |
---|---|---|
committer | 2017-02-10 21:52:09 +0100 | |
commit | ab17457707eaab1ec5d3f4719704ccd25a235651 (patch) | |
tree | 42e034a901f16f281a65049a64eb72f76e3ba55f /scripts/src | |
parent | 041f7bb54952193083f5bbf507c1585fcaf21504 (diff) |
Make sure netlist includes are not found directly on include path.
Instead, they have to be prefixed by "netlist/". Removed unneeded link
librariers for nltool and nlwav along the way. (nw)
Diffstat (limited to 'scripts/src')
-rw-r--r-- | scripts/src/devices.lua | 1 | ||||
-rw-r--r-- | scripts/src/netlist.lua | 6 | ||||
-rw-r--r-- | scripts/src/tools.lua | 24 |
3 files changed, 10 insertions, 21 deletions
diff --git a/scripts/src/devices.lua b/scripts/src/devices.lua index cd90ffe30a4..ede4d8b0a86 100644 --- a/scripts/src/devices.lua +++ b/scripts/src/devices.lua @@ -33,7 +33,6 @@ function devicesProject(_target, _subtarget) MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", MAME_DIR .. "src/devices", - MAME_DIR .. "src/lib/netlist", MAME_DIR .. "src/mame", -- used for sound amiga MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", diff --git a/scripts/src/netlist.lua b/scripts/src/netlist.lua index 4fc5a6ed27b..66387c572df 100644 --- a/scripts/src/netlist.lua +++ b/scripts/src/netlist.lua @@ -21,9 +21,9 @@ project "netlist" } includedirs { - MAME_DIR .. "src/lib/netlist", - MAME_DIR .. "src/osd", - MAME_DIR .. "src/lib/util", + MAME_DIR .. "src/lib", + -- MAME_DIR .. "src/osd", + -- MAME_DIR .. "src/lib/util", -- ext_includedir("expat"), } diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua index 54bff0efb43..fa1b5740d5f 100644 --- a/scripts/src/tools.lua +++ b/scripts/src/tools.lua @@ -505,25 +505,15 @@ if _OPTIONS["SEPARATE_BIN"]~="1" then end links { - "utils", - ext_lib("expat"), - "7z", - "ocore_" .. _OPTIONS["osd"], "netlist", - ext_lib("zlib"), - ext_lib("flac"), - ext_lib("utf8proc"), } includedirs { - MAME_DIR .. "src/osd", - MAME_DIR .. "src/lib/util", - MAME_DIR .. "src/lib/netlist", + MAME_DIR .. "src/lib", } files { MAME_DIR .. "src/lib/netlist/prg/nltool.cpp", - MAME_DIR .. "src/emu/emucore.cpp", } configuration { "mingw*" or "vs*" } @@ -550,20 +540,20 @@ if _OPTIONS["SEPARATE_BIN"]~="1" then end links { - "utils", - "ocore_" .. _OPTIONS["osd"], +-- "utils", +-- "ocore_" .. _OPTIONS["osd"], "netlist", } includedirs { - MAME_DIR .. "src/osd", - MAME_DIR .. "src/lib/util", - MAME_DIR .. "src/lib/netlist", +-- MAME_DIR .. "src/osd", +-- MAME_DIR .. "src/lib/util", + MAME_DIR .. "src/lib", } files { MAME_DIR .. "src/lib/netlist/prg/nlwav.cpp", - MAME_DIR .. "src/emu/emucore.cpp", +-- MAME_DIR .. "src/emu/emucore.cpp", } configuration { "mingw*" or "vs*" } |