From 9d9c8fad6a0e5ff433fd6a97b4921af10e074f96 Mon Sep 17 00:00:00 2001 From: Jeffrey Clark Date: Mon, 28 Mar 2016 12:09:19 -0500 Subject: 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 --- scripts/src/lib.lua | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) (limited to 'scripts/src/lib.lua') 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", -- cgit v1.2.3-70-g09d2