summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2015-03-15 22:57:16 +1100
committer Vas Crabb <vas@vastheman.com>2015-03-15 22:57:16 +1100
commitaf7b120d8239d1d165d3bba64ed939965088ba5f (patch)
tree6cb40541b7ae5e7e21005f1dde39450813d0e04b
parent9d6f2381864ff44a74684a92d14aff4f5c2edc0d (diff)
OS/2 patches for SDLMAME 0.159 [KO Muyng-Hun]
-rw-r--r--3rdparty/mongoose/mongoose.c4
-rw-r--r--makefile4
-rw-r--r--src/osd/sdl/sdl.mak2
3 files changed, 6 insertions, 4 deletions
diff --git a/3rdparty/mongoose/mongoose.c b/3rdparty/mongoose/mongoose.c
index 244b3d8efba..550c3bd2415 100644
--- a/3rdparty/mongoose/mongoose.c
+++ b/3rdparty/mongoose/mongoose.c
@@ -63,6 +63,10 @@
#pragma warning (disable : 4204) // missing c99 support
#endif
+#ifdef __OS2__
+#define _MMAP_DECLARED // Prevent dummy mmap() declaration in stdio.h
+#endif
+
#include <sys/types.h>
#include <sys/stat.h>
#include <assert.h>
diff --git a/makefile b/makefile
index 0182e22b8b8..741ad490856 100644
--- a/makefile
+++ b/makefile
@@ -483,12 +483,10 @@ ifdef PROFILER
DEFS += -DMAME_PROFILER
endif
-# dine USE_NETWORK if networking is enabled (not OS/2 and hasn't been disabled)
-ifneq ($(TARGETOS),os2)
+# define USE_NETWORK if networking is enabled (hasn't been disabled)
ifndef DONT_USE_NETWORK
DEFS += -DUSE_NETWORK
endif
-endif
# need to ensure FLAC functions are statically linked
ifeq ($(BUILD_FLAC),1)
diff --git a/src/osd/sdl/sdl.mak b/src/osd/sdl/sdl.mak
index 005955d3be1..2f188762da5 100644
--- a/src/osd/sdl/sdl.mak
+++ b/src/osd/sdl/sdl.mak
@@ -753,7 +753,7 @@ SDLLIBS := $(shell sdl-config --libs)
INCPATH += $(SDLCFLAGS)
LIBS += $(SDLLIBS) -lpthread
-BASELIBS += += $(SDLLIBS) -lpthread
+BASELIBS += $(SDLLIBS) -lpthread
endif # OS2