summaryrefslogtreecommitdiffstatshomepage
path: root/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 /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 'src')
-rw-r--r--src/emu/machine.cpp4
-rw-r--r--src/lib/util/client_https.hpp2
-rw-r--r--src/lib/util/client_wss.hpp2
-rw-r--r--src/lib/util/server_http_impl.hpp2
-rw-r--r--src/lib/util/server_https.hpp2
-rw-r--r--src/lib/util/server_ws_impl.hpp2
-rw-r--r--src/lib/util/server_wss.hpp2
-rw-r--r--src/mame/drivers/prodigy.cpp6
-rw-r--r--src/mame/includes/model1.h2
-rw-r--r--src/mame/video/model1.cpp2
-rw-r--r--src/osd/asio.h2
11 files changed, 14 insertions, 14 deletions
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 <time.h>
-#include "rapidjson/include/rapidjson/writer.h"
-#include "rapidjson/include/rapidjson/stringbuffer.h"
+#include <rapidjson/writer.h>
+#include <rapidjson/stringbuffer.h>
#if defined(EMSCRIPTEN)
#include <emscripten.h>
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 <asio/ssl.hpp>
namespace webpp {
using HTTPS = asio::ssl::stream<asio::ip::tcp::socket>;
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 <asio/ssl.hpp>
namespace webpp {
using WSS = asio::ssl::stream<asio::ip::tcp::socket>;
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 <asio/system_timer.hpp>
#include "path_to_regex.hpp"
#include <map>
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 <asio/ssl.hpp>
#include <openssl/ssl.h>
#include <algorithm>
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 <asio/system_timer.hpp>
#include "server_ws.hpp"
#include <unordered_map>
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 <asio/ssl.hpp>
#include <openssl/ssl.h>
#include <algorithm>
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 <zlib.h>
#include <iostream>
#include <fstream>
-#include "rapidjson/include/rapidjson/document.h"
-#include "rapidjson/include/rapidjson/stringbuffer.h"
-#include "rapidjson/include/rapidjson/writer.h"
+#include <rapidjson/document.h>
+#include <rapidjson/stringbuffer.h>
+#include <rapidjson/writer.h>
#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 <glm/glm/vec3.hpp>
+#include <glm/vec3.hpp>
#include <functional>
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 <glm/glm/geometric.hpp>
+#include <glm/geometric.hpp>
#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 <asio.hpp>
#undef interface