summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/modules/render/bgfx/effectmanager.cpp
diff options
context:
space:
mode:
author couriersud <couriersud@arcor.de>2016-04-08 03:27:34 +0200
committer couriersud <couriersud@arcor.de>2016-04-08 03:30:12 +0200
commit632b10cd0ec304c0367321a5be62164d00b18ff1 (patch)
tree3eedc6c641eab298cd7be64e8952725213132175 /src/osd/modules/render/bgfx/effectmanager.cpp
parentbc936dbc261a5eeb1400bdf0d0bc945577470905 (diff)
Fix SDL compile on linux. Took the opportunity to remove a number of
"emu.h" includes from src/osd/modules/render/bgfx code. There is still a conflict between mame memory.h and bgfx memory.h to be resolved.
Diffstat (limited to 'src/osd/modules/render/bgfx/effectmanager.cpp')
-rw-r--r--src/osd/modules/render/bgfx/effectmanager.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/osd/modules/render/bgfx/effectmanager.cpp b/src/osd/modules/render/bgfx/effectmanager.cpp
index 082ec10793c..0fa76762836 100644
--- a/src/osd/modules/render/bgfx/effectmanager.cpp
+++ b/src/osd/modules/render/bgfx/effectmanager.cpp
@@ -9,13 +9,18 @@
//
//============================================================
-#include "emu.h"
-
#include <rapidjson/document.h>
#include <rapidjson/error/en.h>
#include <bgfx/bgfxplatform.h>
#include <bgfx/bgfx.h>
+
+/* FIXME: Including emu.h here will include src/emu/memory.h.
+ * bx/readerwriter.h includes allocator.h which includes a memory.h as well.
+ * This memory.h is part of bgfx. However, src/emu/memory.h will be included.
+ */
+#include "emu.h"
+
#include <bx/readerwriter.h>
#include <bx/crtimpl.h>