lower deps on clifront.h (nw)

This commit is contained in:
Miodrag Milanovic 2016-04-15 14:00:01 +02:00
parent 685824106c
commit a83a3c4497
9 changed files with 8 additions and 9 deletions

View File

@ -1602,6 +1602,7 @@ void cli_frontend::execute_commands(const char *exename)
if (strcmp(m_options.command(), CLICOMMAND_VALIDATE) == 0) if (strcmp(m_options.command(), CLICOMMAND_VALIDATE) == 0)
{ {
validity_checker valid(m_options); validity_checker valid(m_options);
valid.set_validate_all(true);
const char *sysname = m_options.system_name(); const char *sysname = m_options.system_name();
bool result = valid.check_all_matching((sysname[0] == 0) ? "*" : sysname); bool result = valid.check_all_matching((sysname[0] == 0) ? "*" : sysname);
if (!result) if (!result)

View File

@ -6,7 +6,6 @@
***************************************************************************/ ***************************************************************************/
#include "clifront.h"
#include "cliopts.h" #include "cliopts.h"
//************************************************************************** //**************************************************************************

View File

@ -2,7 +2,7 @@
// copyright-holders:Aaron Giles // copyright-holders:Aaron Giles
/*************************************************************************** /***************************************************************************
clifront.h cliopts.h
Command-line interface frontend for MAME. Command-line interface frontend for MAME.

View File

@ -11,7 +11,6 @@
#include "emu.h" #include "emu.h"
#include "emuopts.h" #include "emuopts.h"
#include "softlist.h" #include "softlist.h"
#include "clifront.h"
#include "validity.h" #include "validity.h"
#include "expat.h" #include "expat.h"
@ -508,7 +507,7 @@ void software_list_device::device_validity_check(validity_checker &valid) const
return; return;
// do device validation only in case of validate command // do device validation only in case of validate command
if (strcmp(mconfig().options().command(), CLICOMMAND_VALIDATE) != 0) if (!valid.validate_all())
return; return;
// actually do the validate // actually do the validate

View File

@ -13,7 +13,6 @@
#include "ui/menu.h" #include "ui/menu.h"
#include "ui/sndmenu.h" #include "ui/sndmenu.h"
#include "ui/selector.h" #include "ui/selector.h"
#include "cliopts.h"
#include "../osd/modules/lib/osdobj_common.h" // TODO: remove #include "../osd/modules/lib/osdobj_common.h" // TODO: remove
const int ui_menu_sound_options::m_sound_rate[] = { 11025, 22050, 44100, 48000 }; const int ui_menu_sound_options::m_sound_rate[] = { 11025, 22050, 44100, 48000 };

View File

@ -116,7 +116,8 @@ validity_checker::validity_checker(emu_options &options)
m_current_driver(nullptr), m_current_driver(nullptr),
m_current_config(nullptr), m_current_config(nullptr),
m_current_device(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 // pre-populate the defstr map with all the default strings
for (int strnum = 1; strnum < INPUT_STRING_COUNT; strnum++) for (int strnum = 1; strnum < INPUT_STRING_COUNT; strnum++)

View File

@ -39,9 +39,11 @@ public:
// getters // getters
int errors() const { return m_errors; } int errors() const { return m_errors; }
int warnings() const { return m_warnings; } int warnings() const { return m_warnings; }
int validate_all() const { return m_validate_all; }
// setter // setter
void set_verbose(bool verbose) { m_print_verbose = verbose; } void set_verbose(bool verbose) { m_print_verbose = verbose; }
void set_validate_all(bool all) { m_validate_all = all; }
// operations // operations
void check_driver(const game_driver &driver); void check_driver(const game_driver &driver);
@ -110,7 +112,7 @@ private:
const char * m_current_ioport; const char * m_current_ioport;
int_map m_region_map; int_map m_region_map;
std::unordered_set<std::string> m_already_checked; std::unordered_set<std::string> m_already_checked;
bool m_validate_all;
}; };
#endif #endif

View File

@ -4,7 +4,6 @@
#define _osdsdl_h_ #define _osdsdl_h_
#include "watchdog.h" #include "watchdog.h"
#include "clifront.h"
#include "modules/lib/osdobj_common.h" #include "modules/lib/osdobj_common.h"
#include "modules/osdmodule.h" #include "modules/osdmodule.h"
#include "modules/font/font_module.h" #include "modules/font/font_module.h"

View File

@ -10,7 +10,6 @@
#define __WINDOWS_WINMAIN_H__ #define __WINDOWS_WINMAIN_H__
#include <winapifamily.h> #include <winapifamily.h>
#include "clifront.h"
#include "osdepend.h" #include "osdepend.h"
#include "modules/lib/osdobj_common.h" #include "modules/lib/osdobj_common.h"