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/devices.lua | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) (limited to 'scripts/src/devices.lua') diff --git a/scripts/src/devices.lua b/scripts/src/devices.lua index c4a6c9fe0ac..3922d3328ac 100644 --- a/scripts/src/devices.lua +++ b/scripts/src/devices.lua @@ -37,17 +37,9 @@ function devicesProject(_target, _subtarget) MAME_DIR .. "3rdparty", GEN_DIR .. "emu", GEN_DIR .. "emu/layout", + ext_includedir("expat"), + ext_includedir("lua"), } - if _OPTIONS["with-bundled-expat"] then - includedirs { - MAME_DIR .. "3rdparty/expat/lib", - } - end - if _OPTIONS["with-bundled-lua"] then - includedirs { - MAME_DIR .. "3rdparty/lua/src", - } - end dofile(path.join("src", "cpu.lua")) @@ -75,17 +67,9 @@ if #disasm_files > 0 then MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", GEN_DIR .. "emu", + ext_includedir("expat"), + ext_includedir("lua"), } - if _OPTIONS["with-bundled-expat"] then - includedirs { - MAME_DIR .. "3rdparty/expat/lib", - } - end - if _OPTIONS["with-bundled-lua"] then - includedirs { - MAME_DIR .. "3rdparty/lua/src", - } - end files { disasm_files -- cgit v1.2.3-70-g09d2