summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src/tools.lua
diff options
context:
space:
mode:
author couriersud <couriersud@gmx.org>2017-02-07 20:07:56 +0100
committer couriersud <couriersud@gmx.org>2017-02-10 21:52:09 +0100
commitab17457707eaab1ec5d3f4719704ccd25a235651 (patch)
tree42e034a901f16f281a65049a64eb72f76e3ba55f /scripts/src/tools.lua
parent041f7bb54952193083f5bbf507c1585fcaf21504 (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/tools.lua')
-rw-r--r--scripts/src/tools.lua24
1 files changed, 7 insertions, 17 deletions
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*" }