diff options
author | arbee <rb6502@users.noreply.github.com> | 2021-07-31 14:39:27 -0400 |
---|---|---|
committer | arbee <rb6502@users.noreply.github.com> | 2021-07-31 14:39:27 -0400 |
commit | 7419700de0d0937d32e9f3bfbba7a08f650af893 (patch) | |
tree | f2c03cfb12213c67eef649c71826f6133d5f692f /src/osd | |
parent | 367ca9e2404e56e119fa74922b316a00340f2747 (diff) |
fix OSD=mac compile [R. Belmont]
Diffstat (limited to 'src/osd')
-rw-r--r-- | src/osd/mac/window.cpp | 2 | ||||
-rw-r--r-- | src/osd/modules/render/drawogl.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/osd/mac/window.cpp b/src/osd/mac/window.cpp index 9d570f1595f..4056958b0d9 100644 --- a/src/osd/mac/window.cpp +++ b/src/osd/mac/window.cpp @@ -476,7 +476,7 @@ void mac_window_info::update() // Check whether window has vector screens { - const screen_device *screen = screen_device_iterator(machine().root_device()).byindex(index()); + const screen_device *screen = screen_device_enumerator(machine().root_device()).byindex(index()); if ((screen != nullptr) && (screen->screen_type() == SCREEN_TYPE_VECTOR)) renderer().set_flags(osd_renderer::FLAG_HAS_VECTOR_SCREEN); else diff --git a/src/osd/modules/render/drawogl.cpp b/src/osd/modules/render/drawogl.cpp index 6b495dae3bb..7cf99ccfb5f 100644 --- a/src/osd/modules/render/drawogl.cpp +++ b/src/osd/modules/render/drawogl.cpp @@ -1128,11 +1128,13 @@ int renderer_ogl::draw(const int update) assuming you do support Retina. SDL 2.0.11 is scheduled to fix this, but it's not out yet. So we double-scale everything if you're on 10.15 or later and SDL is not at least version 2.0.11. */ - #if defined(SDLMAME_MACOSX) || defined(OSD_MAC) + #if defined(SDLMAME_MACOSX) && !defined(OSD_MAC) SDL_version sdlVers; SDL_GetVersion(&sdlVers); // Only do this if SDL is not at least 2.0.11. if ((sdlVers.major == 2) && (sdlVers.minor == 0) && (sdlVers.patch < 11)) + #endif + #if defined(SDLMAME_MACOSX) || defined(OSD_MAC) { // now get the Darwin kernel version int dMaj, dMin, dPatch; |