Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-05 01:48:29 +03:00
Code Issues Actions 33 Packages Projects Releases Wiki Activity

Small cleanup to how macros are defined for SDL OSD

Browse Source
This commit is contained in:
Vas Crabb 2015-04-01 02:44:30 +11:00
parent 399a5f914b
commit 30ef0cb847
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
scripts/src/osd/sdl_cfg.lua
View File

@ -111,7 +111,6 @@ end
if _OPTIONS["targetos"]=="windows" then if _OPTIONS["targetos"]=="windows" then
defines { defines {
"SDLMAME_WIN32",
"UNICODE", "UNICODE",
"_UNICODE", "_UNICODE",
"USE_QTDEBUG=" .. USE_QT, "USE_QTDEBUG=" .. USE_QT,
@ -147,21 +146,11 @@ elseif _OPTIONS["targetos"]=="macosx" then
"SDLMAME_NET_PCAP", "SDLMAME_NET_PCAP",
} }
elseif _OPTIONS["targetos"]=="freebsd" then elseif _OPTIONS["targetos"]=="freebsd" then
defines {
"NO_AFFINITY_NP",
}
buildoptions { buildoptions {
-- /usr/local/include is not considered a system include director on FreeBSD. GL.h resides there and throws warnings -- /usr/local/include is not considered a system include director on FreeBSD. GL.h resides there and throws warnings
"-isystem /usr/local/include", "-isystem /usr/local/include",
} }
elseif _OPTIONS["targetos"]=="solaris" then
defines {
"NO_AFFINITY_NP",
}
elseif _OPTIONS["targetos"]=="os2" then elseif _OPTIONS["targetos"]=="os2" then
defines {
"SDLMAME_OS2",
}
buildoptions { buildoptions {
string.gsub(os.outputof(sdlconfigcmd() .. " --cflags"), '[\r\n]+', ' '), string.gsub(os.outputof(sdlconfigcmd() .. " --cflags"), '[\r\n]+', ' '),
} }

1
src/osd/sdl/sdlmain.c
View File

@ -400,7 +400,6 @@ static void defines_verbose(void)
MACRO_VERBOSE(NO_DEBUGBER); MACRO_VERBOSE(NO_DEBUGBER);
MACRO_VERBOSE(BIGENDIAN); MACRO_VERBOSE(BIGENDIAN);
MACRO_VERBOSE(CPP_COMPILE); MACRO_VERBOSE(CPP_COMPILE);
MACRO_VERBOSE(DISTRO);
MACRO_VERBOSE(SYNC_IMPLEMENTATION); MACRO_VERBOSE(SYNC_IMPLEMENTATION);
osd_printf_verbose("\n"); osd_printf_verbose("\n");
osd_printf_verbose("SDL/OpenGL defines: "); osd_printf_verbose("SDL/OpenGL defines: ");

9
src/osd/sdl/sdlprefix.h
View File

@ -14,7 +14,8 @@
//============================================================ //============================================================
/* Only problems ... */ /* Only problems ... */
#ifdef SDLMAME_WIN32 #if defined(_WIN32)
#define SDLMAME_WIN32
#define _SDL_main_h #define _SDL_main_h
#endif #endif
@ -27,6 +28,7 @@
#if defined(__sun__) && defined(__svr4__) #if defined(__sun__) && defined(__svr4__)
#define SDLMAME_SOLARIS 1 #define SDLMAME_SOLARIS 1
#define NO_AFFINITY_NP 1
//#undef _XOPEN_SOURCE //#undef _XOPEN_SOURCE
//#undef _XOPEN_VERSION //#undef _XOPEN_VERSION
//#undef _XOPEN_SOURCE_EXTENDED //#undef _XOPEN_SOURCE_EXTENDED
@ -45,6 +47,7 @@
#elif defined(__FreeBSD__) #elif defined(__FreeBSD__)
#define SDLMAME_FREEBSD 1 #define SDLMAME_FREEBSD 1
#define NO_AFFINITY_NP 1
#elif defined(__DragonFly__) #elif defined(__DragonFly__)
#define SDLMAME_DRAGONFLY 1 #define SDLMAME_DRAGONFLY 1
#elif defined(__OpenBSD__) #elif defined(__OpenBSD__)
@ -57,6 +60,10 @@
#define SDLMAME_BSD 1 #define SDLMAME_BSD 1
#endif #endif
#if defined(__OS2__)
#define SDLMAME_OS2 1
#endif
#if defined(__HAIKU__) #if defined(__HAIKU__)
#define SDLMAME_HAIKU 1 #define SDLMAME_HAIKU 1
#define SDLMAME_NO64BITIO 1 #define SDLMAME_NO64BITIO 1