Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-18 22:49:58 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix sdl build. (nw)

Browse Source
This commit is contained in:
dankan1890 2016-04-21 06:48:26 +02:00
parent b5c2c8f1a5
commit a72ad0c4fe
13 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/emu/ui/auditmenu.cpp
View File

@ -13,7 +13,6 @@
#include "ui/menu.h"
#include "audit.h"
#include "ui/auditmenu.h"
#include <algorithm>
extern const char UI_VERSION_TAG[];

8
src/emu/ui/custui.cpp
View File

@ -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"),

6
src/emu/ui/custui.h
View File

@ -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
//-------------------------------------------------

1
src/emu/ui/inifile.cpp
View File

@ -13,7 +13,6 @@
#include "ui/inifile.h"
#include "softlist.h"
#include "drivenum.h"
#include <algorithm>
//-------------------------------------------------
// GLOBAL VARIABLES

4
src/emu/ui/miscmenu.h
View File

@ -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:

1
src/emu/ui/moptions.cpp
View File

@ -9,6 +9,7 @@
***************************************************************************/
#include "emu.h"
#include "options.h"
#include "ui/moptions.h"

2
src/emu/ui/moptions.h
View File

@ -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"

2
src/emu/ui/selgame.cpp
View File

@ -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[];

1
src/emu/ui/selgame.h
View File

@ -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

1
src/emu/ui/selsoft.cpp
View File

@ -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;

1
src/emu/ui/utils.cpp
View File

@ -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 ";

3
src/emu/ui/utils.h
View File

@ -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

2
src/osd/modules/font/font_sdl.cpp
View File

@ -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)