summaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-04-15 14:00:01 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-04-15 14:10:47 +0200
commita83a3c4497f2e5c09d0deb7468bde645ffb3e89e (patch)
tree5639460e393afd309799e53d487d0ddd6d831032 /src
parent685824106cf5a490b54685582f7d97c3a97afc47 (diff)
lower deps on clifront.h (nw)
Diffstat (limited to 'src')
-rw-r--r--src/emu/clifront.cpp1
-rw-r--r--src/emu/cliopts.cpp1
-rw-r--r--src/emu/cliopts.h2
-rw-r--r--src/emu/softlist.cpp3
-rw-r--r--src/emu/ui/sndmenu.cpp1
-rw-r--r--src/emu/validity.cpp3
-rw-r--r--src/emu/validity.h4
-rw-r--r--src/osd/sdl/osdsdl.h1
-rw-r--r--src/osd/windows/winmain.h1
9 files changed, 8 insertions, 9 deletions
diff --git a/src/emu/clifront.cpp b/src/emu/clifront.cpp
index 803b8a4db76..4a718febd0e 100644
--- a/src/emu/clifront.cpp
+++ b/src/emu/clifront.cpp
@@ -1602,6 +1602,7 @@ void cli_frontend::execute_commands(const char *exename)
if (strcmp(m_options.command(), CLICOMMAND_VALIDATE) == 0)
{
validity_checker valid(m_options);
+ valid.set_validate_all(true);
const char *sysname = m_options.system_name();
bool result = valid.check_all_matching((sysname[0] == 0) ? "*" : sysname);
if (!result)
diff --git a/src/emu/cliopts.cpp b/src/emu/cliopts.cpp
index ba2cb33afe9..48df5cf00d9 100644
--- a/src/emu/cliopts.cpp
+++ b/src/emu/cliopts.cpp
@@ -6,7 +6,6 @@
***************************************************************************/
-#include "clifront.h"
#include "cliopts.h"
//**************************************************************************
diff --git a/src/emu/cliopts.h b/src/emu/cliopts.h
index ce0cb7a9c58..d7a0a938d49 100644
--- a/src/emu/cliopts.h
+++ b/src/emu/cliopts.h
@@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles
/***************************************************************************
- clifront.h
+ cliopts.h
Command-line interface frontend for MAME.
diff --git a/src/emu/softlist.cpp b/src/emu/softlist.cpp
index e86415b3d35..4288fa93f90 100644
--- a/src/emu/softlist.cpp
+++ b/src/emu/softlist.cpp
@@ -11,7 +11,6 @@
#include "emu.h"
#include "emuopts.h"
#include "softlist.h"
-#include "clifront.h"
#include "validity.h"
#include "expat.h"
@@ -508,7 +507,7 @@ void software_list_device::device_validity_check(validity_checker &valid) const
return;
// do device validation only in case of validate command
- if (strcmp(mconfig().options().command(), CLICOMMAND_VALIDATE) != 0)
+ if (!valid.validate_all())
return;
// actually do the validate
diff --git a/src/emu/ui/sndmenu.cpp b/src/emu/ui/sndmenu.cpp
index dd3e717d98a..52768c09b3a 100644
--- a/src/emu/ui/sndmenu.cpp
+++ b/src/emu/ui/sndmenu.cpp
@@ -13,7 +13,6 @@
#include "ui/menu.h"
#include "ui/sndmenu.h"
#include "ui/selector.h"
-#include "cliopts.h"
#include "../osd/modules/lib/osdobj_common.h" // TODO: remove
const int ui_menu_sound_options::m_sound_rate[] = { 11025, 22050, 44100, 48000 };
diff --git a/src/emu/validity.cpp b/src/emu/validity.cpp
index 2397ad444a6..e4200759952 100644
--- a/src/emu/validity.cpp
+++ b/src/emu/validity.cpp
@@ -116,7 +116,8 @@ validity_checker::validity_checker(emu_options &options)
m_current_driver(nullptr),
m_current_config(nullptr),
m_current_device(nullptr),
- m_current_ioport(nullptr)
+ m_current_ioport(nullptr),
+ m_validate_all(false)
{
// pre-populate the defstr map with all the default strings
for (int strnum = 1; strnum < INPUT_STRING_COUNT; strnum++)
diff --git a/src/emu/validity.h b/src/emu/validity.h
index 66eaffd533b..eec10069aaa 100644
--- a/src/emu/validity.h
+++ b/src/emu/validity.h
@@ -39,9 +39,11 @@ public:
// getters
int errors() const { return m_errors; }
int warnings() const { return m_warnings; }
+ int validate_all() const { return m_validate_all; }
// setter
void set_verbose(bool verbose) { m_print_verbose = verbose; }
+ void set_validate_all(bool all) { m_validate_all = all; }
// operations
void check_driver(const game_driver &driver);
@@ -110,7 +112,7 @@ private:
const char * m_current_ioport;
int_map m_region_map;
std::unordered_set<std::string> m_already_checked;
-
+ bool m_validate_all;
};
#endif
diff --git a/src/osd/sdl/osdsdl.h b/src/osd/sdl/osdsdl.h
index d3ce734b4d2..c239966c7ab 100644
--- a/src/osd/sdl/osdsdl.h
+++ b/src/osd/sdl/osdsdl.h
@@ -4,7 +4,6 @@
#define _osdsdl_h_
#include "watchdog.h"
-#include "clifront.h"
#include "modules/lib/osdobj_common.h"
#include "modules/osdmodule.h"
#include "modules/font/font_module.h"
diff --git a/src/osd/windows/winmain.h b/src/osd/windows/winmain.h
index f4d1a611191..7bd2917a2a7 100644
--- a/src/osd/windows/winmain.h
+++ b/src/osd/windows/winmain.h
@@ -10,7 +10,6 @@
#define __WINDOWS_WINMAIN_H__
#include <winapifamily.h>
-#include "clifront.h"
#include "osdepend.h"
#include "modules/lib/osdobj_common.h"