summaryrefslogtreecommitdiffstats
path: root/scripts/src
diff options
context:
space:
mode:
author Julian Sikorski <belegdol+github@gmail.com>2018-02-08 22:06:25 +0100
committer R. Belmont <rb6502@users.noreply.github.com>2018-02-08 16:06:25 -0500
commit8cc758355d51920adb7dc5b5899cf5fdca9fbd74 (patch)
treec806616593f525c9deba1a8cfd7b9bb1e708c035 /scripts/src
parent556bdf249f76f415cc7fc8f2d72762688ef97440 (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/src')
-rw-r--r--scripts/src/devices.lua4
-rw-r--r--scripts/src/emu.lua3
-rw-r--r--scripts/src/mame/frontend.lua4
-rw-r--r--scripts/src/osd/modules.lua4
4 files changed, 8 insertions, 7 deletions
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