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/main.lua | |
parent | 6cb951b7c42d87e4b52604ecbd5317b6fc8f9665 (diff) | |
parent | c3397ae4a9ad9517f2f4818f4223a338398a92bc (diff) |
Merge pull request #757 from h0tw1r3/master
Extend system library support (nw)
Diffstat (limited to 'scripts/src/main.lua')
-rw-r--r-- | scripts/src/main.lua | 51 |
1 files changed, 11 insertions, 40 deletions
diff --git a/scripts/src/main.lua b/scripts/src/main.lua index 9914509184e..52211bf92fe 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -192,53 +192,29 @@ if #disasm_files > 0 then end links { "utils", - "expat", + ext_lib("expat"), "softfloat", - "jpeg", + ext_lib("jpeg"), "7z", - "lua", + ext_lib("lua"), "lualibs", } if _OPTIONS["USE_LIBUV"]=="1" then links { - "uv", + ext_lib("uv"), "http-parser", } end - if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } - else - links { - "z", - } - end - - if _OPTIONS["with-bundled-flac"] then - links { - "flac", - } - else - links { - "FLAC", - } - end - - if _OPTIONS["with-bundled-sqlite3"] then - links { - "sqllite3", - } - else - links { - "sqlite3", - } - end + links { + ext_lib("zlib"), + ext_lib("flac"), + ext_lib("sqlite3"), + } if _OPTIONS["NO_USE_MIDI"]~="1" then links { - "portmidi", + ext_lib("portmidi"), } end links { @@ -260,14 +236,9 @@ end MAME_DIR .. "3rdparty", GEN_DIR .. _target .. "/layout", GEN_DIR .. "resource", + ext_includedir("zlib"), } - if _OPTIONS["with-bundled-zlib"] then - includedirs { - MAME_DIR .. "3rdparty/zlib", - } - end - if _OPTIONS["targetos"]=="macosx" and (not override_resources) then linkoptions { "-sectcreate __TEXT __info_plist " .. _MAKE.esc(GEN_DIR) .. "resource/" .. _subtarget .. "-Info.plist" |