diff options
author | Justin Kerk <dopefishjustin@gmail.com> | 2013-11-03 04:30:42 +0000 |
---|---|---|
committer | Justin Kerk <dopefishjustin@gmail.com> | 2013-11-03 04:30:42 +0000 |
commit | 1d7002416eb1f17829635ec3552a69a784f27f91 (patch) | |
tree | 821564d3ccb114a9f9179e2fae72994761e0e692 | |
parent | 5ac36c18f7b7273fe92daeaecee5826c9b5de1bb (diff) |
Simplify SDL file changes (nw)
I'm assuming the /work/src/m/sdl stuff is someone's testing leftover; it was added in r19797
-rw-r--r-- | src/osd/sdl/sdl.mak | 6 | ||||
-rw-r--r-- | src/osd/sdl/sdlfile.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak index 77939f6738d..8da576e0cf3 100644 --- a/src/osd/sdl/sdl.mak +++ b/src/osd/sdl/sdl.mak @@ -415,12 +415,7 @@ INCPATH += -Isrc/debug MOCINCPATH := $(INCPATH) # add the prefix file -# Don't pull in the system includes if we are compiling for Emscripten, which has its own headers -ifneq ($(TARGETOS),emscripten) INCPATH += -include $(SDLSRC)/sdlprefix.h -INCPATH += -I/work/src/m/sdl -MOCINCPATH += -I/work/src/m/sdl -endif #------------------------------------------------- @@ -539,6 +534,7 @@ ifeq ($(NO_X11),1) NO_DEBUGGER = 1 endif +# Don't pull in the system includes if we are compiling for Emscripten, which has its own headers ifneq ($(TARGETOS),emscripten) INCPATH += `$(SDL_CONFIG) --cflags | sed -e 's:/SDL[2]*::' -e 's:\(-D[^ ]*\)::g'` endif diff --git a/src/osd/sdl/sdlfile.c b/src/osd/sdl/sdlfile.c index 8c0bf364ddb..8904f9faa39 100644 --- a/src/osd/sdl/sdlfile.c +++ b/src/osd/sdl/sdlfile.c @@ -103,7 +103,7 @@ file_error osd_open(const char *path, UINT32 openflags, osd_file **file, UINT64 UINT32 access; const char *src; char *dst; - #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_OS2) || defined(SDLMAME_HAIKU) || defined(SDLMAME_EMSCRIPTEN) + #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_OS2) || defined(SDLMAME_HAIKU) struct stat st; #else struct stat64 st; @@ -203,7 +203,7 @@ file_error osd_open(const char *path, UINT32 openflags, osd_file **file, UINT64 #endif // attempt to open the file - #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_OS2) || defined(SDLMAME_HAIKU) || defined(SDLMAME_EMSCRIPTEN) + #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_OS2) || defined(SDLMAME_HAIKU) (*file)->handle = open(tmpstr, access, 0666); #else (*file)->handle = open64(tmpstr, access, 0666); @@ -226,7 +226,7 @@ file_error osd_open(const char *path, UINT32 openflags, osd_file **file, UINT64 // attempt to reopen the file if (error == NO_ERROR) { - #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_OS2) || defined(SDLMAME_HAIKU) || defined(SDLMAME_EMSCRIPTEN) + #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_OS2) || defined(SDLMAME_HAIKU) (*file)->handle = open(tmpstr, access, 0666); #else (*file)->handle = open64(tmpstr, access, 0666); |