summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/target
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/target
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/target')
-rw-r--r--scripts/target/mame/arcade.lua5
-rw-r--r--scripts/target/mame/mess.lua2
-rw-r--r--scripts/target/mame/nl.lua1
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{
n class='insertions'>+2 * Added dummy license headers for MAME part (nw) Miodrag Milanovic2015-05-071-0/+2 * galaxold / scramble: Removed some unused code (nw) Osso2015-01-011-1/+0 * Cleanups and version bumpmame0157 Miodrag Milanovic2014-12-311-12/+12 * video/galaxold.c: added a missing save state, improves but doesn't totally fi... Osso2014-12-221-33/+43 * Moved optional_device<screen_device> m_screen and optional_device<palette_dev... Miodrag Milanovic2014-03-051-1/+5 * moved optional_device<gfxdecode_device> to specific drivers state classes (nw) Miodrag Milanovic2014-02-171-1/+3 * Added write_sense to S2650 CPU and use it for pipbug serial port, Hunchback (... smf-2014-01-101-1/+0 * standardised 7474 MCFG and reduced number of run time lookups (nw) smf-2014-01-101-1/+9 * Misc legacy handlers cleanups. (nw) Ivan Vangelista2013-11-211-6/+0 * new clones David Haywood2013-08-181-0/+1 * Fix long-standing architectural wart: the priority bitmap is no longer owned Aaron Giles2013-07-261-10/+10 * Cleanups and version bumpmame0149 Miodrag Milanovic2013-06-111-1/+1 * guttangt - added rom banking so that the music plays (because they had to rew... David Haywood2013-06-011-0/+5 * new clones David Haywood2013-05-221-0/+1 * changed machine().device("audiocpu") with m_maincpu (nw) Miodrag Milanovic2013-04-111-1/+3 * added m_maincpu to the rest of drivers in mame (nw) Miodrag Milanovic2013-04-101-2/+3 * Modernization of drivers part 6 (no whatsnew) Miodrag Milanovic2013-02-081-11/+56 * IRQ_CALLBACK modernization part 1 (no whatsnew) Miodrag Milanovic2013-01-311-0/+1 * Cleanups and version bumpmame0148 Miodrag Milanovic2013-01-111-14/+14 * Ozon1 : fixed cocktail mode [Kevin Pickell] Robbbert2013-01-031-0/+1 * Improved bagmanmc. Add new working clone. [Robbbert] Robbbert2012-11-161-0/+1 * Decrypted code in "Harem" [Luca Elia] Luca Elia2012-11-111-2/+2 * moved harem to scramble.c Michaƫl Banaan Ananas2012-10-171-4/+2 * changed 7474 to use devcb2 (no whatsnew) Miodrag Milanovic2012-10-171-5/+4 * TIMER_CALLBACK_DEVICE_MEMBER modernization part 1 (no whatsnew) Miodrag Milanovic2012-09-251-2/+1 * Introducing TIMER_CALLBACK_MEMBER and modernization part 1 (no whatsnew)