diff options
author | 2015-06-07 06:20:28 +0200 | |
---|---|---|
committer | 2015-06-07 06:20:28 +0200 | |
commit | cee210f47e9454ec2adadc5ab346e69661e38cff (patch) | |
tree | a1a5361a5da9d9f508276f39c6b75b19c3dbc9a9 /scripts/src/main.lua | |
parent | 0cf27a8f7dd959e93daff61851166e9830b7195e (diff) | |
parent | 9027ce95756981dc2efa87a91049d5273ea34c8a (diff) |
Merge pull request #203 from belegdol/master
Added the ability to use system flac, jpeg, lua, sqlite3, portmidi and zlib based on wallyweek's work
This brings the system lib capabilities back to where they were prior to build system rewrite [Julian Sikorski]
Diffstat (limited to 'scripts/src/main.lua')
-rw-r--r-- | scripts/src/main.lua | 41 |
1 files changed, 37 insertions, 4 deletions
diff --git a/scripts/src/main.lua b/scripts/src/main.lua index 809a18be70a..6bbdc01833c 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -95,16 +95,44 @@ function mainProject(_target, _subtarget) "expat", "softfloat", "jpeg", - "flac", "7z", "formats", "lua", "lsqlite3", - "sqllite3", - "zlib", "jsoncpp", "mongoose", } + + 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 + if _OPTIONS["NO_USE_MIDI"]~="1" then links { "portmidi", @@ -130,11 +158,16 @@ function mainProject(_target, _subtarget) MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", - MAME_DIR .. "3rdparty/zlib", GEN_DIR .. _target .. "/layout", GEN_DIR .. "resource", } + 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 " .. GEN_DIR .. "/resource/" .. _subtarget .. "-Info.plist" |