diff options
author | 2018-02-08 22:06:25 +0100 | |
---|---|---|
committer | 2018-02-08 16:06:25 -0500 | |
commit | 8cc758355d51920adb7dc5b5899cf5fdca9fbd74 (patch) | |
tree | c806616593f525c9deba1a8cfd7b9bb1e708c035 /scripts/target | |
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/target')
-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 |
3 files changed, 7 insertions, 1 deletions
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{ |