summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--src/emu/ui/auditmenu.cpp1
-rw-r--r--src/emu/ui/custui.cpp8
-rw-r--r--src/emu/ui/custui.h6
-rw-r--r--src/emu/ui/inifile.cpp1
-rw-r--r--src/emu/ui/miscmenu.h4
-rw-r--r--src/emu/ui/moptions.cpp1
-rw-r--r--src/emu/ui/moptions.h2
-rw-r--r--src/emu/ui/selgame.cpp2
-rw-r--r--src/emu/ui/selgame.h1
-rw-r--r--src/emu/ui/selsoft.cpp1
-rw-r--r--src/emu/ui/utils.cpp1
-rw-r--r--src/emu/ui/utils.h3
-rw-r--r--src/osd/modules/font/font_sdl.cpp2
13 files changed, 7 insertions, 26 deletions
diff --git a/src/emu/ui/auditmenu.cpp b/src/emu/ui/auditmenu.cpp
index 5d6ce8fa8d1..70aa5e2f258 100644
--- a/src/emu/ui/auditmenu.cpp
+++ b/src/emu/ui/auditmenu.cpp
@@ -13,7 +13,6 @@
#include "ui/menu.h"
#include "audit.h"
#include "ui/auditmenu.h"
-#include <algorithm>
extern const char UI_VERSION_TAG[];
diff --git a/src/emu/ui/custui.cpp b/src/emu/ui/custui.cpp
index f2e86eeeca1..42ef567ce02 100644
--- a/src/emu/ui/custui.cpp
+++ b/src/emu/ui/custui.cpp
@@ -10,14 +10,12 @@
#include "emu.h"
#include "emuopts.h"
-#include "ui/custui.h"
-
+#include "osdepend.h"
#include "ui/ui.h"
+#include "ui/menu.h"
#include "ui/selector.h"
#include "ui/utils.h"
-
-#include <algorithm>
-
+#include "ui/custui.h"
const char *const ui_menu_custom_ui::hide_status[] = {
__("Show All"),
diff --git a/src/emu/ui/custui.h b/src/emu/ui/custui.h
index 0a2e55745c9..0aeffca9c5b 100644
--- a/src/emu/ui/custui.h
+++ b/src/emu/ui/custui.h
@@ -13,12 +13,6 @@
#ifndef MAME_EMU_UI_UI_CUSTUI_H
#define MAME_EMU_UI_UI_CUSTUI_H
-#include "ui/menu.h"
-
-#include <vector>
-#include <string>
-
-
//-------------------------------------------------
// Custom UI menu
//-------------------------------------------------
diff --git a/src/emu/ui/inifile.cpp b/src/emu/ui/inifile.cpp
index f230e5ba0e7..1a2b894a5fb 100644
--- a/src/emu/ui/inifile.cpp
+++ b/src/emu/ui/inifile.cpp
@@ -13,7 +13,6 @@
#include "ui/inifile.h"
#include "softlist.h"
#include "drivenum.h"
-#include <algorithm>
//-------------------------------------------------
// GLOBAL VARIABLES
diff --git a/src/emu/ui/miscmenu.h b/src/emu/ui/miscmenu.h
index f2fb394784d..18f22c49d54 100644
--- a/src/emu/ui/miscmenu.h
+++ b/src/emu/ui/miscmenu.h
@@ -13,10 +13,10 @@
#ifndef __UI_MISCMENU_H__
#define __UI_MISCMENU_H__
-#include "drivenum.h"
#include "crsshair.h"
#include "emuopts.h"
-#include "ui/selsoft.h"
+
+using s_bios = std::vector<std::pair<std::string, int>>;
class ui_menu_keyboard_mode : public ui_menu {
public:
diff --git a/src/emu/ui/moptions.cpp b/src/emu/ui/moptions.cpp
index 4f41c7fbdac..3c8d37fec12 100644
--- a/src/emu/ui/moptions.cpp
+++ b/src/emu/ui/moptions.cpp
@@ -9,6 +9,7 @@
***************************************************************************/
#include "emu.h"
+#include "options.h"
#include "ui/moptions.h"
diff --git a/src/emu/ui/moptions.h b/src/emu/ui/moptions.h
index 55d800651f4..9a657d69d0e 100644
--- a/src/emu/ui/moptions.h
+++ b/src/emu/ui/moptions.h
@@ -13,8 +13,6 @@
#ifndef __UI_OPTS_H__
#define __UI_OPTS_H__
-#include "options.h"
-
// core directory options
#define OPTION_HISTORY_PATH "historypath"
#define OPTION_EXTRAINI_PATH "extrainipath"
diff --git a/src/emu/ui/selgame.cpp b/src/emu/ui/selgame.cpp
index 1a7f02eb920..2df9cd35012 100644
--- a/src/emu/ui/selgame.cpp
+++ b/src/emu/ui/selgame.cpp
@@ -11,7 +11,6 @@
#include "emu.h"
#include "emuopts.h"
#include "ui/ui.h"
-#include "ui/menu.h"
#include "uiinput.h"
#include "ui/selgame.h"
#include "ui/miscmenu.h"
@@ -29,7 +28,6 @@
#include "ui/auditmenu.h"
#include "rendutil.h"
#include "softlist.h"
-#include <algorithm>
extern const char UI_VERSION_TAG[];
diff --git a/src/emu/ui/selgame.h b/src/emu/ui/selgame.h
index 06401d3523d..225e9c2cf3a 100644
--- a/src/emu/ui/selgame.h
+++ b/src/emu/ui/selgame.h
@@ -13,7 +13,6 @@
#ifndef __UI_MAIN_H__
#define __UI_MAIN_H__
-#include "drivenum.h"
#include "ui/menu.h"
class ui_menu_select_game : public ui_menu
diff --git a/src/emu/ui/selsoft.cpp b/src/emu/ui/selsoft.cpp
index 0cc5a951df9..16808d2a963 100644
--- a/src/emu/ui/selsoft.cpp
+++ b/src/emu/ui/selsoft.cpp
@@ -22,7 +22,6 @@
#include "rendfont.h"
#include "rendutil.h"
#include "softlist.h"
-#include <algorithm>
std::string reselect_last::driver;
std::string reselect_last::software;
diff --git a/src/emu/ui/utils.cpp b/src/emu/ui/utils.cpp
index 6a59208cd30..d65bbc52ef7 100644
--- a/src/emu/ui/utils.cpp
+++ b/src/emu/ui/utils.cpp
@@ -10,7 +10,6 @@
#include "emu.h"
#include "ui/utils.h"
-#include <algorithm>
extern const char UI_VERSION_TAG[];
const char UI_VERSION_TAG[] = "# UI INFO ";
diff --git a/src/emu/ui/utils.h b/src/emu/ui/utils.h
index 0e2ff2354b3..d31b3746e77 100644
--- a/src/emu/ui/utils.h
+++ b/src/emu/ui/utils.h
@@ -13,9 +13,6 @@
#ifndef __UI_UTILS_H__
#define __UI_UTILS_H__
-#include "osdepend.h"
-#include "rendutil.h"
-
#define MAX_CHAR_INFO 256
#define MAX_CUST_FILTER 8
diff --git a/src/osd/modules/font/font_sdl.cpp b/src/osd/modules/font/font_sdl.cpp
index c5a73b0a541..629bc9046a8 100644
--- a/src/osd/modules/font/font_sdl.cpp
+++ b/src/osd/modules/font/font_sdl.cpp
@@ -88,7 +88,7 @@ bool osd_font_sdl::open(std::string const &font_path, std::string const &_name,
// if no success, try the font path
if (!font)
{
- osd_printf_verbose("Searching font %s in -%s\n", family.c_str(), OPTION_FONTPATH);
+ osd_printf_verbose("Searching font %s in -%s path/s\n", family.c_str(), font_path.c_str());
//emu_file file(options().font_path(), OPEN_FLAG_READ);
emu_file file(font_path.c_str(), OPEN_FLAG_READ);
if (file.open(family.c_str()) == osd_file::error::NONE)