summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src/tools.lua
diff options
context:
space:
mode:
author Jeffrey Clark <dude@zaplabs.com>2016-03-28 12:09:19 -0500
committer Jeffrey Clark <dude@zaplabs.com>2016-03-28 22:26:52 -0500
commit9d9c8fad6a0e5ff433fd6a97b4921af10e074f96 (patch)
treea7382cf895f9dd372061d8bf3094ed59046fe1ce /scripts/src/tools.lua
parent6cb951b7c42d87e4b52604ecbd5317b6fc8f9665 (diff)
Extend system library support (nw)
Extend USE_SYSTEM_LIB_* to support providing the library name and include directory. To link against system specific lib names and header path: (ref #711) USE_SYSTEM_LIB_LUA=lua5.3:/usr/include/lua5.3
Diffstat (limited to 'scripts/src/tools.lua')
-rw-r--r--scripts/src/tools.lua296
1 files changed, 40 insertions, 256 deletions
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua
index 0339e9920b2..95710ad9799 100644
--- a/scripts/src/tools.lua
+++ b/scripts/src/tools.lua
@@ -27,21 +27,12 @@ end
links {
"utils",
- "expat",
+ ext_lib("expat"),
"7z",
"ocore_" .. _OPTIONS["osd"],
+ ext_lib("zlib"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -77,31 +68,13 @@ end
links {
"utils",
- "expat",
+ ext_lib("expat"),
"7z",
"ocore_" .. _OPTIONS["osd"],
+ ext_lib("zlib"),
+ ext_lib("flac"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
-if _OPTIONS["with-bundled-flac"] then
- links {
- "flac",
- }
-else
- links {
- "FLAC",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -139,20 +112,11 @@ end
links {
"utils",
- "expat",
+ ext_lib("expat"),
"ocore_" .. _OPTIONS["osd"],
+ ext_lib("zlib"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -189,31 +153,13 @@ end
links {
"dasm",
"utils",
- "expat",
+ ext_lib("expat"),
"7z",
"ocore_" .. _OPTIONS["osd"],
+ ext_lib("zlib"),
+ ext_lib("flac"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
-if _OPTIONS["with-bundled-flac"] then
- links {
- "flac",
- }
-else
- links {
- "FLAC",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu",
@@ -251,31 +197,13 @@ end
links {
"utils",
- "expat",
+ ext_lib("expat"),
"7z",
"ocore_" .. _OPTIONS["osd"],
+ ext_lib("zlib"),
+ ext_lib("flac"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
-if _OPTIONS["with-bundled-flac"] then
- links {
- "flac",
- }
-else
- links {
- "FLAC",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -312,31 +240,13 @@ end
links {
"utils",
- "expat",
+ ext_lib("expat"),
"7z",
"ocore_" .. _OPTIONS["osd"],
+ ext_lib("zlib"),
+ ext_lib("flac"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
-if _OPTIONS["with-bundled-flac"] then
- links {
- "flac",
- }
-else
- links {
- "FLAC",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -373,20 +283,11 @@ end
links {
"utils",
- "expat",
+ ext_lib("expat"),
"ocore_" .. _OPTIONS["osd"],
+ ext_lib("zlib"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -422,20 +323,11 @@ end
links {
"utils",
- "expat",
+ ext_lib("expat"),
"ocore_" .. _OPTIONS["osd"],
+ ext_lib("zlib"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -471,20 +363,11 @@ end
links {
"utils",
- "expat",
+ ext_lib("expat"),
"ocore_" .. _OPTIONS["osd"],
+ ext_lib("zlib"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -520,31 +403,13 @@ end
links {
"utils",
- "expat",
+ ext_lib("expat"),
"7z",
"ocore_" .. _OPTIONS["osd"],
+ ext_lib("zlib"),
+ ext_lib("flac"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
-if _OPTIONS["with-bundled-flac"] then
- links {
- "flac",
- }
-else
- links {
- "FLAC",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -580,20 +445,11 @@ end
links {
"utils",
- "expat",
+ ext_lib("expat"),
"ocore_" .. _OPTIONS["osd"],
+ ext_lib("zlib"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -629,32 +485,14 @@ end
links {
"utils",
- "expat",
+ ext_lib("expat"),
"7z",
"ocore_" .. _OPTIONS["osd"],
"netlist",
+ ext_lib("zlib"),
+ ext_lib("flac"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
-if _OPTIONS["with-bundled-flac"] then
- links {
- "flac",
- }
-else
- links {
- "FLAC",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
@@ -732,31 +570,13 @@ end
links {
"formats",
"utils",
- "expat",
+ ext_lib("expat"),
"7z",
"ocore_" .. _OPTIONS["osd"],
+ ext_lib("zlib"),
+ ext_lib("flac"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
-if _OPTIONS["with-bundled-flac"] then
- links {
- "flac",
- }
-else
- links {
- "FLAC",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib",
@@ -795,31 +615,13 @@ links {
"formats",
"emu",
"utils",
- "expat",
+ ext_lib("expat"),
"7z",
"ocore_" .. _OPTIONS["osd"],
+ ext_lib("zlib"),
+ ext_lib("flac"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
-if _OPTIONS["with-bundled-flac"] then
- links {
- "flac",
- }
-else
- links {
- "FLAC",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib",
@@ -858,36 +660,18 @@ links {
"formats",
"emu",
"utils",
- "expat",
+ ext_lib("expat"),
"7z",
"ocore_" .. _OPTIONS["osd"],
+ ext_lib("zlib"),
+ ext_lib("flac"),
}
-if _OPTIONS["with-bundled-zlib"] then
- links {
- "zlib",
- }
-else
- links {
- "z",
- }
-end
-
-if _OPTIONS["with-bundled-flac"] then
- links {
- "flac",
- }
-else
- links {
- "FLAC",
- }
-end
-
includedirs {
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
- MAME_DIR .. "3rdparty/zlib",
+ ext_includedir("zlib"),
MAME_DIR .. "src/tools/imgtool",
}