diff options
author | 2016-02-21 11:48:45 +0100 | |
---|---|---|
committer | 2016-02-21 11:48:45 +0100 | |
commit | cc24a339d8c0517259084b5c178d784626ba965c (patch) | |
tree | 9868e9687b5802ae0a3733712a3bbeb3bc75c953 /src/osd/modules/font/font_sdl.cpp | |
parent | b5daabda5495dea5c50e17961ecfed2ea8619d76 (diff) |
Merge remote-tracking branch 'refs/remotes/mamedev/master'
Second attempt
Diffstat (limited to 'src/osd/modules/font/font_sdl.cpp')
-rw-r--r-- | src/osd/modules/font/font_sdl.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/osd/modules/font/font_sdl.cpp b/src/osd/modules/font/font_sdl.cpp index 1474bd61ec4..ad5d1699e3b 100644 --- a/src/osd/modules/font/font_sdl.cpp +++ b/src/osd/modules/font/font_sdl.cpp @@ -10,11 +10,7 @@ #if defined(SDLMAME_UNIX) && (!defined(SDLMAME_MACOSX)) && (!defined(SDLMAME_SOLARIS)) && (!defined(SDLMAME_HAIKU)) && (!defined(SDLMAME_EMSCRIPTEN)) -#if (SDLMAME_SDL2) #include <SDL2/SDL_ttf.h> -#else -#include <SDL/SDL_ttf.h> -#endif #ifndef SDLMAME_HAIKU #include <fontconfig/fontconfig.h> #endif |