summaryrefslogtreecommitdiffstatshomepage
path: root/src/osd/sdl
diff options
context:
space:
mode:
author R. Belmont <rb6502@users.noreply.github.com>2012-07-26 22:10:32 +0000
committer R. Belmont <rb6502@users.noreply.github.com>2012-07-26 22:10:32 +0000
commitb987e8d87224b7a0a845d5746ae710610460b17d (patch)
treee360df1ba537507b5be67d2a5b88d13f3269c47f /src/osd/sdl
parent6f11a306587f0633a0f57d826b41d3a3d53b3a73 (diff)
SDL: more compile fixes (nw)
Diffstat (limited to 'src/osd/sdl')
-rw-r--r--src/osd/sdl/sdl.mak6
-rw-r--r--src/osd/sdl/sdlinc.h2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak
index 606c1610153..05f7d9857aa 100644
--- a/src/osd/sdl/sdl.mak
+++ b/src/osd/sdl/sdl.mak
@@ -565,11 +565,11 @@ endif # NO_X11
# XInput
#-------------------------------------------------
-ifneq ($(NO_USE_XINPUT),1)
+ifeq ($(NO_USE_XINPUT),1)
+DEFS += -DUSE_XINPUT=0
+else
DEFS += -DUSE_XINPUT=1 -DUSE_XINPUT_DEBUG=0
LIBS += -lXext -lXi
-else
-DEFS += -DUSE_XINPUT=0
endif # USE_XINPUT
#-------------------------------------------------
diff --git a/src/osd/sdl/sdlinc.h b/src/osd/sdl/sdlinc.h
index 69cc396b71a..ca10b7956a1 100644
--- a/src/osd/sdl/sdlinc.h
+++ b/src/osd/sdl/sdlinc.h
@@ -12,7 +12,7 @@
#include <SDL/SDL.h>
#include <SDL/SDL_version.h>
// on win32 this includes windows.h by itself and breaks us!
-#ifndef SDLMAME_WIN32
+#if !defined(SDLMAME_WIN32) && !defined(SDLMAME_DARWIN) && !defined(SDLMAME_MACOSX)
#include <SDL/SDL_syswm.h>
#endif
#endif