From 8cc758355d51920adb7dc5b5899cf5fdca9fbd74 Mon Sep 17 00:00:00 2001 From: Julian Sikorski Date: Thu, 8 Feb 2018 22:06:25 +0100 Subject: 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 --- src/emu/machine.cpp | 4 ++-- src/lib/util/client_https.hpp | 2 +- src/lib/util/client_wss.hpp | 2 +- src/lib/util/server_http_impl.hpp | 2 +- src/lib/util/server_https.hpp | 2 +- src/lib/util/server_ws_impl.hpp | 2 +- src/lib/util/server_wss.hpp | 2 +- src/mame/drivers/prodigy.cpp | 6 +++--- src/mame/includes/model1.h | 2 +- src/mame/video/model1.cpp | 2 +- src/osd/asio.h | 2 +- 11 files changed, 14 insertions(+), 14 deletions(-) (limited to 'src') diff --git a/src/emu/machine.cpp b/src/emu/machine.cpp index 8d84f412de9..72e78e96759 100644 --- a/src/emu/machine.cpp +++ b/src/emu/machine.cpp @@ -84,8 +84,8 @@ #include "network.h" #include "ui/uimain.h" #include -#include "rapidjson/include/rapidjson/writer.h" -#include "rapidjson/include/rapidjson/stringbuffer.h" +#include +#include #if defined(EMSCRIPTEN) #include diff --git a/src/lib/util/client_https.hpp b/src/lib/util/client_https.hpp index 3300ea6865f..835a7ee613d 100644 --- a/src/lib/util/client_https.hpp +++ b/src/lib/util/client_https.hpp @@ -4,7 +4,7 @@ #define CLIENT_HTTPS_HPP #include "client_http.hpp" -#include "asio/ssl.hpp" +#include namespace webpp { using HTTPS = asio::ssl::stream; diff --git a/src/lib/util/client_wss.hpp b/src/lib/util/client_wss.hpp index ef30b459607..6ff51658f30 100644 --- a/src/lib/util/client_wss.hpp +++ b/src/lib/util/client_wss.hpp @@ -4,7 +4,7 @@ #define CLIENT_WSS_HPP #include "client_ws.hpp" -#include "asio/ssl.hpp" +#include namespace webpp { using WSS = asio::ssl::stream; diff --git a/src/lib/util/server_http_impl.hpp b/src/lib/util/server_http_impl.hpp index 4f909c023ef..e949e6b2483 100644 --- a/src/lib/util/server_http_impl.hpp +++ b/src/lib/util/server_http_impl.hpp @@ -9,7 +9,7 @@ #include "server_http.hpp" #include "asio.h" -#include "asio/system_timer.hpp" +#include #include "path_to_regex.hpp" #include diff --git a/src/lib/util/server_https.hpp b/src/lib/util/server_https.hpp index e721cbb3e25..d76aa377762 100644 --- a/src/lib/util/server_https.hpp +++ b/src/lib/util/server_https.hpp @@ -4,7 +4,7 @@ #define SERVER_HTTPS_HPP #include "server_http.hpp" -#include "asio/ssl.hpp" +#include #include #include diff --git a/src/lib/util/server_ws_impl.hpp b/src/lib/util/server_ws_impl.hpp index cbb6f9b4908..9fc5876cab2 100644 --- a/src/lib/util/server_ws_impl.hpp +++ b/src/lib/util/server_ws_impl.hpp @@ -6,7 +6,7 @@ #include "crypto.hpp" #include "asio.h" -#include "asio/system_timer.hpp" +#include #include "server_ws.hpp" #include diff --git a/src/lib/util/server_wss.hpp b/src/lib/util/server_wss.hpp index ecf46fb1524..ea0bc47626e 100644 --- a/src/lib/util/server_wss.hpp +++ b/src/lib/util/server_wss.hpp @@ -4,7 +4,7 @@ #define SERVER_WSS_HPP #include "server_ws.hpp" -#include "asio/ssl.hpp" +#include #include #include diff --git a/src/mame/drivers/prodigy.cpp b/src/mame/drivers/prodigy.cpp index 3d4dadf1684..c134c40cc29 100644 --- a/src/mame/drivers/prodigy.cpp +++ b/src/mame/drivers/prodigy.cpp @@ -81,9 +81,9 @@ #include #include #include -#include "rapidjson/include/rapidjson/document.h" -#include "rapidjson/include/rapidjson/stringbuffer.h" -#include "rapidjson/include/rapidjson/writer.h" +#include +#include +#include #endif // Generated artwork includes diff --git a/src/mame/includes/model1.h b/src/mame/includes/model1.h index 5b09d05d296..a9a7bb4e2b3 100644 --- a/src/mame/includes/model1.h +++ b/src/mame/includes/model1.h @@ -17,7 +17,7 @@ #include "screen.h" -#include +#include #include diff --git a/src/mame/video/model1.cpp b/src/mame/video/model1.cpp index b128650fbbb..2a15cb21157 100644 --- a/src/mame/video/model1.cpp +++ b/src/mame/video/model1.cpp @@ -1,7 +1,7 @@ // license:BSD-3-Clause // copyright-holders:Olivier Galibert -#include +#include #include "emu.h" #include "cpu/mb86233/mb86233.h" diff --git a/src/osd/asio.h b/src/osd/asio.h index 64acfab9674..3ee31a467d7 100644 --- a/src/osd/asio.h +++ b/src/osd/asio.h @@ -31,5 +31,5 @@ #define ASIO_NOEXCEPT_OR_NOTHROW noexcept(true) #define ASIO_ERROR_CATEGORY_NOEXCEPT noexcept(true) -#include "asio/include/asio.hpp" +#include #undef interface -- cgit v1.2.3-70-g09d2