summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src/lib.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/lib.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/lib.lua')
-rw-r--r--scripts/src/lib.lua19
1 files changed, 3 insertions, 16 deletions
diff --git a/scripts/src/lib.lua b/scripts/src/lib.lua
index 6890bceb5bc..18d6563edfa 100644
--- a/scripts/src/lib.lua
+++ b/scripts/src/lib.lua
@@ -19,17 +19,9 @@ project "utils"
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util",
MAME_DIR .. "3rdparty",
+ ext_includedir("expat"),
+ ext_includedir("zlib"),
}
- if _OPTIONS["with-bundled-expat"] then
- includedirs {
- MAME_DIR .. "3rdparty/expat/lib",
- }
- end
- if _OPTIONS["with-bundled-zlib"] then
- includedirs {
- MAME_DIR .. "3rdparty/zlib",
- }
- end
files {
MAME_DIR .. "src/lib/util/bitstream.h",
@@ -119,14 +111,9 @@ project "formats"
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
MAME_DIR .. "3rdparty",
+ ext_includedir("zlib"),
}
- if _OPTIONS["with-bundled-zlib"] then
- includedirs {
- MAME_DIR .. "3rdparty/zlib",
- }
- end
-
files {
MAME_DIR .. "src/lib/formats/2d_dsk.cpp",
MAME_DIR .. "src/lib/formats/2d_dsk.h",