38 lines
1.5 KiB
Diff
38 lines
1.5 KiB
Diff
|
From 0b5b13cf1e28550b49c387dec93f9801f029e313 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Julian Sikorski <belegdol+github@gmail.com>
|
||
|
|
Date: Mon, 5 Aug 2019 21:16:54 +0200
|
||
|
|
Subject: [PATCH] Fix building using system rapidjson
|
||
|
|
|
||
|
|
---
|
||
|
|
scripts/target/mame/arcade.lua | 1 +
|
||
|
|
src/mame/video/midtunit.cpp | 4 ++--
|
||
|
|
2 files changed, 3 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
|
||
|
|
index 964daa3572f..ef30ae3c2c2 100644
|
||
|
|
--- a/scripts/target/mame/arcade.lua
|
||
|
|
+++ b/scripts/target/mame/arcade.lua
|
||
|
|
@@ -930,6 +930,7 @@ function createMAMEProjects(_target, _subtarget, _name)
|
||
|
|
ext_includedir("flac"),
|
||
|
|
ext_includedir("glm"),
|
||
|
|
ext_includedir("jpeg"),
|
||
|
|
+ ext_includedir("rapidjson"),
|
||
|
|
}
|
||
|
|
|
||
|
|
end
|
||
|
|
diff --git a/src/mame/video/midtunit.cpp b/src/mame/video/midtunit.cpp
|
||
|
|
index b4cb98abacf..b307f3f722b 100644
|
||
|
|
--- a/src/mame/video/midtunit.cpp
|
||
|
|
+++ b/src/mame/video/midtunit.cpp
|
||
|
|
@@ -20,8 +20,8 @@
|
||
|
|
#include "emuopts.h" // Used by PNG logging
|
||
|
|
#include "png.h" // Used by PNG logging
|
||
|
|
|
||
|
|
-#include "rapidjson/include/rapidjson/prettywriter.h" // Used by JSON logging
|
||
|
|
-#include "rapidjson/include/rapidjson/stringbuffer.h" // Used by JSON logging
|
||
|
|
+#include <rapidjson/prettywriter.h> // Used by JSON logging
|
||
|
|
+#include <rapidjson/stringbuffer.h> // Used by JSON logging
|
||
|
|
|
||
|
|
DEFINE_DEVICE_TYPE(MIDTUNIT_VIDEO, midtunit_video_device, "tunitvid", "Midway T-Unit Video")
|
||
|
|
DEFINE_DEVICE_TYPE(MIDWUNIT_VIDEO, midwunit_video_device, "wunitvid", "Midway W-Unit Video")
|