| Previous | 15994 Revisions | Next |
| r15684 Thursday 26th July, 2012 at 22:13:08 UTC by R. Belmont |
|---|
| More OS X build fixes (nw) |
| [src/osd/sdl] | sdl.mak sdlinc.h |
| r15683 | r15684 | |
|---|---|---|
| 565 | 565 | # XInput |
| 566 | 566 | #------------------------------------------------- |
| 567 | 567 | |
| 568 | ifneq ($(NO_USE_XINPUT),1) | |
| 568 | ifeq ($(NO_USE_XINPUT),1) | |
| 569 | DEFS += -DUSE_XINPUT=0 | |
| 570 | else | |
| 569 | 571 | DEFS += -DUSE_XINPUT=1 -DUSE_XINPUT_DEBUG=0 |
| 570 | 572 | LIBS += -lXext -lXi |
| 571 | else | |
| 572 | DEFS += -DUSE_XINPUT=0 | |
| 573 | 573 | endif # USE_XINPUT |
| 574 | 574 | |
| 575 | 575 | #------------------------------------------------- |
| r15683 | r15684 | |
|---|---|---|
| 12 | 12 | #include <SDL/SDL.h> |
| 13 | 13 | #include <SDL/SDL_version.h> |
| 14 | 14 | // on win32 this includes windows.h by itself and breaks us! |
| 15 | #if | |
| 15 | #if !defined(SDLMAME_WIN32) && !defined(SDLMAME_DARWIN) && !defined(SDLMAME_MACOSX) | |
| 16 | 16 | #include <SDL/SDL_syswm.h> |
| 17 | 17 | #endif |
| 18 | 18 | #endif |
| Previous | 15994 Revisions | Next |