diff options
author | 2018-02-08 22:06:25 +0100 | |
---|---|---|
committer | 2018-02-08 16:06:25 -0500 | |
commit | 8cc758355d51920adb7dc5b5899cf5fdca9fbd74 (patch) | |
tree | c806616593f525c9deba1a8cfd7b9bb1e708c035 /scripts | |
parent | 556bdf249f76f415cc7fc8f2d72762688ef97440 (diff) |
Enable use of system-wide asio, glm and rapidjson (#3172)
* Fixed building using system utf8proc
* Fixed building using system portaudio
* Allow using system-wide asio headers (1.11.0 or higher required).
* Allow using system-wide glm headers
* Allow using system-wide rapidjson headers
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/extlib.lua | 18 | ||||
-rw-r--r-- | scripts/src/devices.lua | 4 | ||||
-rw-r--r-- | scripts/src/emu.lua | 3 | ||||
-rw-r--r-- | scripts/src/mame/frontend.lua | 4 | ||||
-rw-r--r-- | scripts/src/osd/modules.lua | 4 | ||||
-rw-r--r-- | scripts/target/mame/arcade.lua | 5 | ||||
-rw-r--r-- | scripts/target/mame/mess.lua | 2 | ||||
-rw-r--r-- | scripts/target/mame/nl.lua | 1 |
8 files changed, 33 insertions, 8 deletions
diff --git a/scripts/extlib.lua b/scripts/extlib.lua index 674f1b1d881..ad97ac220b8 100644 --- a/scripts/extlib.lua +++ b/scripts/extlib.lua @@ -6,6 +6,7 @@ local extlibs = { -- 3rdparty system 3rdparty -- lib name: lib name, include dir -- + asio = { "asio", "3rdparty/asio/include" }, expat = { "expat", "3rdparty/expat/lib" }, zlib = { "z", "3rdparty/zlib" }, jpeg = { "jpeg", "3rdparty/libjpeg" }, @@ -15,10 +16,17 @@ local extlibs = { portaudio = { "portaudio", "3rdparty/portaudio/include" }, lua = { "lua", "3rdparty/lua/src" }, utf8proc = { "utf8proc", "3rdparty/utf8proc" }, + glm = { "glm", "3rdparty/glm" }, + rapidjson = { "rapidjson", "3rdparty/rapidjson/include" }, } -- system lib options newoption { + trigger = 'with-system-asio', + description = 'Use system Asio library', +} + +newoption { trigger = 'with-system-expat', description = 'Use system Expat library', } @@ -63,6 +71,16 @@ newoption { description = "Use system utf8proc library", } +newoption { + trigger = "with-system-glm", + description = "Use system glm library", +} + +newoption { + trigger = "with-system-rapidjson", + description = "Use system rapidjson library", +} + -- build helpers function ext_lib(lib) local opt = _OPTIONS["with-system-" .. lib] diff --git a/scripts/src/devices.lua b/scripts/src/devices.lua index 89d88fd7274..79bcdec11d4 100644 --- a/scripts/src/devices.lua +++ b/scripts/src/devices.lua @@ -39,9 +39,9 @@ function devicesProject(_target, _subtarget) MAME_DIR .. "3rdparty", GEN_DIR .. "emu", GEN_DIR .. "emu/layout", + ext_includedir("asio"), ext_includedir("expat"), ext_includedir("flac"), - MAME_DIR .. "3rdparty/asio/include", } dofile(path.join("src", "cpu.lua")) @@ -69,8 +69,8 @@ if #disasm_files > 0 then MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", - MAME_DIR .. "3rdparty/asio/include", GEN_DIR .. "emu", + ext_includedir("asio"), ext_includedir("expat"), } diff --git a/scripts/src/emu.lua b/scripts/src/emu.lua index b0188cde94d..3a135d39c44 100644 --- a/scripts/src/emu.lua +++ b/scripts/src/emu.lua @@ -29,11 +29,12 @@ includedirs { } includedirs { + ext_includedir("asio"), ext_includedir("expat"), ext_includedir("zlib"), ext_includedir("flac"), ext_includedir("jpeg"), - MAME_DIR .. "3rdparty/asio/include", + ext_includedir("rapidjson"), } files { diff --git a/scripts/src/mame/frontend.lua b/scripts/src/mame/frontend.lua index 452c812dd03..60e955f8773 100644 --- a/scripts/src/mame/frontend.lua +++ b/scripts/src/mame/frontend.lua @@ -29,18 +29,18 @@ includedirs { MAME_DIR .. "src/devices", -- till deps are fixed MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", - MAME_DIR .. "3rdparty/rapidjson/include", MAME_DIR .. "3rdparty", GEN_DIR .. "emu", GEN_DIR .. "emu/layout", } includedirs { + ext_includedir("asio"), ext_includedir("expat"), ext_includedir("lua"), ext_includedir("zlib"), ext_includedir("flac"), - MAME_DIR .. "3rdparty/asio/include", + ext_includedir("rapidjson") } configuration { } diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua index 06392a6c34e..ddd2e4b06f2 100644 --- a/scripts/src/osd/modules.lua +++ b/scripts/src/osd/modules.lua @@ -116,7 +116,7 @@ function osdmodulesbuild() MAME_DIR .. "src/osd/modules/monitor/monitor_sdl.cpp", } includedirs { - MAME_DIR .. "3rdparty/asio/include", + ext_includedir("asio"), } if _OPTIONS["targetos"]=="windows" then @@ -215,7 +215,7 @@ function osdmodulesbuild() MAME_DIR .. "3rdparty/bgfx/include", MAME_DIR .. "3rdparty/bgfx/3rdparty", MAME_DIR .. "3rdparty/bx/include", - MAME_DIR .. "3rdparty/rapidjson/include", + ext_includedir("rapidjson") } if _OPTIONS["NO_USE_PORTAUDIO"]=="1" then diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index efe9a981e51..e477cc695be 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -3156,6 +3156,11 @@ files { } createMAMEProjects(_target, _subtarget, "sega") + +includedirs { + ext_includedir("glm"), +} + files { MAME_DIR .. "src/mame/drivers/angelkds.cpp", MAME_DIR .. "src/mame/includes/angelkds.h", diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua index bae57cbc9b8..bf08e0d8f44 100644 --- a/scripts/target/mame/mess.lua +++ b/scripts/target/mame/mess.lua @@ -2706,7 +2706,7 @@ files { MAME_DIR .. "src/mame/machine/nl_prodigy.h", } includedirs { - MAME_DIR .. "3rdparty/rapidjson/include", + ext_includedir("rapidjson"), } createMESSProjects(_target, _subtarget, "psion") diff --git a/scripts/target/mame/nl.lua b/scripts/target/mame/nl.lua index c47cea4deb4..53f16ba42cc 100644 --- a/scripts/target/mame/nl.lua +++ b/scripts/target/mame/nl.lua @@ -114,6 +114,7 @@ function createProjects_mame_nl(_target, _subtarget) MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", GEN_DIR .. "mame/layout", + ext_includedir("rapidjson"), } files{ |