summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/sdl/sdlmain.cpp
diff options
context:
space:
mode:
author ImJezze <jezze@gmx.net>2016-03-02 21:49:49 +0100
committer ImJezze <jezze@gmx.net>2016-03-02 21:49:49 +0100
commit9fe9f6d93e672bcd926f9e7461774bc9cc22e094 (patch)
tree3911b611dd010a4108b90fb8b8c82116eec21117 /src/osd/sdl/sdlmain.cpp
parentdbdf21ee465acadf3e643d62d6bedfcc297ada85 (diff)
parent1914702e6fae052668df5b068a502bca57c9a3b0 (diff)
Merge remote-tracking branch 'refs/remotes/mamedev/master'
# Resolved Conflicts: # src/osd/modules/render/d3d/d3dhlsl.cpp # src/osd/windows/winmain.cpp
Diffstat (limited to 'src/osd/sdl/sdlmain.cpp')
-rw-r--r--src/osd/sdl/sdlmain.cpp34
1 files changed, 3 insertions, 31 deletions
diff --git a/src/osd/sdl/sdlmain.cpp b/src/osd/sdl/sdlmain.cpp
index 530aa41c9d4..1a52a105fd5 100644
--- a/src/osd/sdl/sdlmain.cpp
+++ b/src/osd/sdl/sdlmain.cpp
@@ -21,7 +21,7 @@
#endif
// standard includes
-#if !defined(SDLMAME_WIN32) && !defined(SDLMAME_OS2)
+#if !defined(SDLMAME_WIN32)
#include <unistd.h>
#endif
@@ -31,12 +31,6 @@
#include <windows.h>
#endif
-
-#ifdef SDLMAME_OS2
-#define INCL_DOS
-#include <os2.h>
-#endif
-
#include "sdlinc.h"
// MAME headers
@@ -48,7 +42,6 @@
// OSD headers
#include "video.h"
-#include "input.h"
#include "osdsdl.h"
#include "modules/lib/osdlib.h"
@@ -67,7 +60,7 @@
//============================================================
#ifndef INI_PATH
-#if defined(SDLMAME_WIN32) || defined(SDLMAME_OS2)
+#if defined(SDLMAME_WIN32)
#define INI_PATH ".;ini"
#elif defined(SDLMAME_MACOSX)
#define INI_PATH "$HOME/Library/Application Support/APP_NAME;$HOME/.APP_NAME;.;ini"
@@ -173,23 +166,6 @@ const options_entry sdl_options::s_option_entries[] =
};
//============================================================
-// OS2 specific
-//============================================================
-
-#ifdef SDLMAME_OS2
-void MorphToPM()
-{
- PPIB pib;
- PTIB tib;
-
- DosGetInfoBlocks(&tib, &pib);
-
- // Change flag from VIO to PM:
- if (pib->pib_ultype==2) pib->pib_ultype = 3;
-}
-#endif
-
-//============================================================
// sdl_options
//============================================================
@@ -231,10 +207,6 @@ int main(int argc, char *argv[])
#endif
#endif
-#ifdef SDLMAME_OS2
- MorphToPM();
-#endif
-
{
sdl_options options;
sdl_osd_interface osd(options);
@@ -326,7 +298,6 @@ static void defines_verbose(void)
MACRO_VERBOSE(SDLMAME_UNIX);
MACRO_VERBOSE(SDLMAME_X11);
MACRO_VERBOSE(SDLMAME_WIN32);
- MACRO_VERBOSE(SDLMAME_OS2);
MACRO_VERBOSE(SDLMAME_MACOSX);
MACRO_VERBOSE(SDLMAME_DARWIN);
MACRO_VERBOSE(SDLMAME_LINUX);
@@ -552,3 +523,4 @@ void sdl_osd_interface::init(running_machine &machine)
SDL_EventState(SDL_TEXTINPUT, SDL_TRUE);
#endif
}
+