diff options
author | 2016-03-29 08:07:34 +0200 | |
---|---|---|
committer | 2016-03-29 08:07:34 +0200 | |
commit | 7e7cb1a2694d4437ed73795787c830d883bf65e7 (patch) | |
tree | 30a03c487e05b716d4879966abfa0d5bf0572d39 /scripts/src/devices.lua | |
parent | 6cb951b7c42d87e4b52604ecbd5317b6fc8f9665 (diff) | |
parent | c3397ae4a9ad9517f2f4818f4223a338398a92bc (diff) |
Merge pull request #757 from h0tw1r3/master
Extend system library support (nw)
Diffstat (limited to 'scripts/src/devices.lua')
-rw-r--r-- | scripts/src/devices.lua | 24 |
1 files changed, 4 insertions, 20 deletions
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 |