summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-02-26 13:20:43 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-02-26 13:20:43 +0100
commit4727b0d97f30666b15155765d602c9a2f1f5159f (patch)
treea1c0ccb666ec3b1fbfc63cbf19f0732e9f71a082
parentf79e31489758026c37058b16fa9c968fbf35a8a1 (diff)
OS/2 can not support SDL2 which is needed for MAME to run (nw)
-rw-r--r--3rdparty/genie/build/gmake.os2/Makefile34
-rw-r--r--3rdparty/genie/build/gmake.os2/genie.make455
-rw-r--r--makefile30
-rw-r--r--scripts/genie.lua20
-rw-r--r--scripts/src/osd/modules.lua4
-rw-r--r--scripts/src/osd/sdl.lua13
-rw-r--r--scripts/src/osd/sdl_cfg.lua7
-rw-r--r--scripts/toolchain.lua19
-rw-r--r--src/osd/modules/lib/osdlib_os2.cpp292
-rw-r--r--src/osd/modules/sync/sync_os2.cpp199
-rw-r--r--src/osd/osdcore.h2
-rw-r--r--src/osd/sdl/sdldir.cpp4
-rw-r--r--src/osd/sdl/sdlfile.cpp22
-rw-r--r--src/osd/sdl/sdlmain.cpp32
-rw-r--r--src/osd/sdl/sdlos_os2.cpp36
-rw-r--r--src/osd/sdl/sdlprefix.h4
-rw-r--r--src/osd/sdl/sdlptty_os2.cpp39
-rw-r--r--src/osd/sdl/sdlptty_unix.cpp2
-rw-r--r--src/osd/sdl/testkeys.cpp4
19 files changed, 27 insertions, 1191 deletions
diff --git a/3rdparty/genie/build/gmake.os2/Makefile b/3rdparty/genie/build/gmake.os2/Makefile
deleted file mode 100644
index 775f52d5d2c..00000000000
--- a/3rdparty/genie/build/gmake.os2/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# GNU Make solution makefile autogenerated by GENie
-# Type "make help" for usage help
-
-ifndef config
- config=release
-endif
-export config
-
-PROJECTS := genie
-
-.PHONY: all clean help $(PROJECTS)
-
-all: $(PROJECTS)
-
-genie:
- @echo "==== Building genie ($(config)) ===="
- @${MAKE} --no-print-directory -C . -f genie.make
-
-clean:
- @${MAKE} --no-print-directory -C . -f genie.make clean
-
-help:
- @echo "Usage: make [config=name] [target]"
- @echo ""
- @echo "CONFIGURATIONS:"
- @echo " release"
- @echo " debug"
- @echo ""
- @echo "TARGETS:"
- @echo " all (default)"
- @echo " clean"
- @echo " genie"
- @echo ""
- @echo "For more information, see http://industriousone.com/premake/quick-start"
diff --git a/3rdparty/genie/build/gmake.os2/genie.make b/3rdparty/genie/build/gmake.os2/genie.make
deleted file mode 100644
index e1b82abbc75..00000000000
--- a/3rdparty/genie/build/gmake.os2/genie.make
+++ /dev/null
@@ -1,455 +0,0 @@
-# GNU Make project makefile autogenerated by GENie
-ifndef config
- config=release
-endif
-
-ifndef verbose
- SILENT = @
-endif
-
-SHELLTYPE := msdos
-ifeq (,$(ComSpec)$(COMSPEC))
- SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(SHELL)))
- SHELLTYPE := posix
-endif
-ifeq (/bin,$(findstring /bin,$(MAKESHELL)))
- SHELLTYPE := posix
-endif
-
-ifeq (posix,$(SHELLTYPE))
- MKDIR = $(SILENT) mkdir -p "$(1)"
- COPY = $(SILENT) cp -fR "$(1)" "$(2)"
- RM= $(SILENT) rm -f "$(1)"
-else
- MKDIR = $(SILENT) mkdir "$(subst /,\\,$(1))" 2> nul || exit 0
- COPY = $(SILENT) copy /Y "$(subst /,\\,$(1))" "$(subst /,\\,$(2))"
- RM = $(SILENT) del /F "$(subst /,\\,$(1))" 2> nul || exit 0
-endif
-
-CC = gcc
-CXX = g++
-AR = ar
-
-ifndef RESCOMP
- ifdef WINDRES
- RESCOMP = $(WINDRES)
- else
- RESCOMP = windres
- endif
-endif
-
-ifeq ($(config),release)
- OBJDIR = obj/Release
- TARGETDIR = ../../bin/os2
- override TARGET = $(TARGETDIR)/genie.exe
- DEFINES += -DNDEBUG -DLUA_COMPAT_MODULE -DLUA_USE_POSIX -DLUA_USE_DLOPEN
- INCLUDES += -I../../src/host/lua-5.3.0/src
- ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
- ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os
- ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os
- ALL_OBJCFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -Os
- ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
- ALL_LDFLAGS += $(LDFLAGS) -L. -s
- LDDEPS +=
- LIBS += $(LDDEPS)
- LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
- OBJECTS := \
- $(OBJDIR)/src/host/os_mkdir.o \
- $(OBJDIR)/src/host/os_stat.o \
- $(OBJDIR)/src/host/os_isdir.o \
- $(OBJDIR)/src/host/os_rmdir.o \
- $(OBJDIR)/src/host/os_uuid.o \
- $(OBJDIR)/src/host/string_endswith.o \
- $(OBJDIR)/src/host/os_chdir.o \
- $(OBJDIR)/src/host/path_isabsolute.o \
- $(OBJDIR)/src/host/scripts.o \
- $(OBJDIR)/src/host/premake.o \
- $(OBJDIR)/src/host/os_getcwd.o \
- $(OBJDIR)/src/host/premake_main.o \
- $(OBJDIR)/src/host/os_ticks.o \
- $(OBJDIR)/src/host/string_hash.o \
- $(OBJDIR)/src/host/os_is64bit.o \
- $(OBJDIR)/src/host/os_match.o \
- $(OBJDIR)/src/host/os_isfile.o \
- $(OBJDIR)/src/host/os_copyfile.o \
- $(OBJDIR)/src/host/os_pathsearch.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lobject.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lparser.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lundump.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lfunc.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lcorolib.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/liolib.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/ltablib.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/ldblib.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/ldebug.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lmathlib.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lctype.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lutf8lib.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lauxlib.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lstate.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lgc.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/ltable.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lbitlib.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lapi.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lmem.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lvm.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lcode.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lzio.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lstrlib.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lbaselib.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/linit.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/ldo.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lstring.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/ldump.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/llex.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lopcodes.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/loslib.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/loadlib.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/ltm.o \
-
- define PREBUILDCMDS
- endef
- define PRELINKCMDS
- endef
- define POSTBUILDCMDS
- endef
-endif
-
-ifeq ($(config),debug)
- OBJDIR = obj/Debug
- TARGETDIR = ../../bin/os2
- override TARGET = $(TARGETDIR)/genie.exe
- DEFINES += -D_DEBUG -DLUA_COMPAT_MODULE -DLUA_USE_POSIX -DLUA_USE_DLOPEN
- INCLUDES += -I../../src/host/lua-5.3.0/src
- ALL_CPPFLAGS += $(CPPFLAGS) -MMD -MP $(DEFINES) $(INCLUDES)
- ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g
- ALL_CXXFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g
- ALL_OBJCFLAGS += $(CXXFLAGS) $(CFLAGS) $(ALL_CPPFLAGS) $(ARCH) -Wall -Wextra -g
- ALL_RESFLAGS += $(RESFLAGS) $(DEFINES) $(INCLUDES)
- ALL_LDFLAGS += $(LDFLAGS) -L.
- LDDEPS +=
- LIBS += $(LDDEPS)
- LINKCMD = $(CC) -o $(TARGET) $(OBJECTS) $(RESOURCES) $(ARCH) $(ALL_LDFLAGS) $(LIBS)
- OBJECTS := \
- $(OBJDIR)/src/host/os_mkdir.o \
- $(OBJDIR)/src/host/os_stat.o \
- $(OBJDIR)/src/host/os_isdir.o \
- $(OBJDIR)/src/host/os_rmdir.o \
- $(OBJDIR)/src/host/os_uuid.o \
- $(OBJDIR)/src/host/string_endswith.o \
- $(OBJDIR)/src/host/os_chdir.o \
- $(OBJDIR)/src/host/path_isabsolute.o \
- $(OBJDIR)/src/host/scripts.o \
- $(OBJDIR)/src/host/premake.o \
- $(OBJDIR)/src/host/os_getcwd.o \
- $(OBJDIR)/src/host/premake_main.o \
- $(OBJDIR)/src/host/os_ticks.o \
- $(OBJDIR)/src/host/string_hash.o \
- $(OBJDIR)/src/host/os_is64bit.o \
- $(OBJDIR)/src/host/os_match.o \
- $(OBJDIR)/src/host/os_isfile.o \
- $(OBJDIR)/src/host/os_copyfile.o \
- $(OBJDIR)/src/host/os_pathsearch.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lobject.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lparser.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lundump.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lfunc.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lcorolib.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/liolib.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/ltablib.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/ldblib.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/ldebug.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lmathlib.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lctype.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lutf8lib.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lauxlib.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lstate.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lgc.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/ltable.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lbitlib.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lapi.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lmem.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lvm.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lcode.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lzio.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lstrlib.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lbaselib.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/linit.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/ldo.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lstring.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/ldump.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/llex.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/lopcodes.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/loslib.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/loadlib.o \
- $(OBJDIR)/src/host/lua-5.3.0/src/ltm.o \
-
- define PREBUILDCMDS
- endef
- define PRELINKCMDS
- endef
- define POSTBUILDCMDS
- endef
-endif
-
-OBJDIRS := \
- $(OBJDIR) \
- $(OBJDIR)/src/host/lua-5.3.0/src \
- $(OBJDIR)/src/host \
-
-RESOURCES := \
-
-.PHONY: clean prebuild prelink
-
-all: $(TARGETDIR) $(OBJDIRS) prebuild prelink $(TARGET)
- @:
-
-$(TARGET): $(GCH) $(OBJECTS) $(LDDEPS) $(RESOURCES)
- @echo Linking genie
- $(SILENT) $(LINKCMD)
- $(POSTBUILDCMDS)
-
-$(TARGETDIR):
- @echo Creating $(TARGETDIR)
- -$(call MKDIR,$(TARGETDIR))
-
-$(OBJDIRS):
- @echo Creating $(@)
- -$(call MKDIR,$@)
-
-clean:
- @echo Cleaning genie
-ifeq (posix,$(SHELLTYPE))
- $(SILENT) rm -f $(TARGET)
- $(SILENT) rm -rf $(OBJDIR)
-else
- $(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET))
- $(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR))
-endif
-
-prebuild:
- $(PREBUILDCMDS)
-
-prelink:
- $(PRELINKCMDS)
-
-ifneq (,$(PCH))
-$(GCH): $(PCH)
- @echo $(notdir $<)
- $(SILENT) $(CC) -x c-header $(ALL_CFLAGS) -MMD -MP $(DEFINES) $(INCLUDES) -o "$@" -MF "$(@:%.gch=%.d)" -c "$<"
-endif
-
-$(OBJDIR)/src/host/os_mkdir.o: ../../src/host/os_mkdir.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/os_stat.o: ../../src/host/os_stat.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/os_isdir.o: ../../src/host/os_isdir.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/os_rmdir.o: ../../src/host/os_rmdir.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/os_uuid.o: ../../src/host/os_uuid.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/string_endswith.o: ../../src/host/string_endswith.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/os_chdir.o: ../../src/host/os_chdir.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/path_isabsolute.o: ../../src/host/path_isabsolute.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/scripts.o: ../../src/host/scripts.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/premake.o: ../../src/host/premake.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/os_getcwd.o: ../../src/host/os_getcwd.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/premake_main.o: ../../src/host/premake_main.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/os_ticks.o: ../../src/host/os_ticks.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/string_hash.o: ../../src/host/string_hash.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/os_is64bit.o: ../../src/host/os_is64bit.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/os_match.o: ../../src/host/os_match.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/os_isfile.o: ../../src/host/os_isfile.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/os_copyfile.o: ../../src/host/os_copyfile.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/os_pathsearch.o: ../../src/host/os_pathsearch.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/lobject.o: ../../src/host/lua-5.3.0/src/lobject.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/lparser.o: ../../src/host/lua-5.3.0/src/lparser.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/lundump.o: ../../src/host/lua-5.3.0/src/lundump.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/lfunc.o: ../../src/host/lua-5.3.0/src/lfunc.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/lcorolib.o: ../../src/host/lua-5.3.0/src/lcorolib.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/liolib.o: ../../src/host/lua-5.3.0/src/liolib.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/ltablib.o: ../../src/host/lua-5.3.0/src/ltablib.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/ldblib.o: ../../src/host/lua-5.3.0/src/ldblib.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/ldebug.o: ../../src/host/lua-5.3.0/src/ldebug.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/lmathlib.o: ../../src/host/lua-5.3.0/src/lmathlib.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/lctype.o: ../../src/host/lua-5.3.0/src/lctype.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/lutf8lib.o: ../../src/host/lua-5.3.0/src/lutf8lib.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/lauxlib.o: ../../src/host/lua-5.3.0/src/lauxlib.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/lstate.o: ../../src/host/lua-5.3.0/src/lstate.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/lgc.o: ../../src/host/lua-5.3.0/src/lgc.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/ltable.o: ../../src/host/lua-5.3.0/src/ltable.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/lbitlib.o: ../../src/host/lua-5.3.0/src/lbitlib.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/lapi.o: ../../src/host/lua-5.3.0/src/lapi.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/lmem.o: ../../src/host/lua-5.3.0/src/lmem.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/lvm.o: ../../src/host/lua-5.3.0/src/lvm.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/lcode.o: ../../src/host/lua-5.3.0/src/lcode.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/lzio.o: ../../src/host/lua-5.3.0/src/lzio.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/lstrlib.o: ../../src/host/lua-5.3.0/src/lstrlib.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/lbaselib.o: ../../src/host/lua-5.3.0/src/lbaselib.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/linit.o: ../../src/host/lua-5.3.0/src/linit.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/ldo.o: ../../src/host/lua-5.3.0/src/ldo.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/lstring.o: ../../src/host/lua-5.3.0/src/lstring.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/ldump.o: ../../src/host/lua-5.3.0/src/ldump.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/llex.o: ../../src/host/lua-5.3.0/src/llex.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/lopcodes.o: ../../src/host/lua-5.3.0/src/lopcodes.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/loslib.o: ../../src/host/lua-5.3.0/src/loslib.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/loadlib.o: ../../src/host/lua-5.3.0/src/loadlib.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
-$(OBJDIR)/src/host/lua-5.3.0/src/ltm.o: ../../src/host/lua-5.3.0/src/ltm.c
- @echo $(notdir $<)
- $(SILENT) $(CC) $(ALL_CFLAGS) $(FORCE_INCLUDE) -o "$@" -MF $(@:%.o=%.d) -c "$<"
-
--include $(OBJECTS:%.o=%.d)
-ifneq (,$(PCH))
- -include $(OBJDIR)/$(notdir $(PCH)).d
-endif
diff --git a/makefile b/makefile
index 49b39e04f20..de142731b31 100644
--- a/makefile
+++ b/makefile
@@ -171,10 +171,6 @@ endif
ifeq ($(firstword $(filter Haiku,$(UNAME))),Haiku)
OS := haiku
endif
-ifeq ($(firstword $(filter OS/2,$(UNAME))),OS/2)
-OS := os2
-GENIEOS := os2
-endif
ifndef OS
$(error Unable to detect OS from uname -a: $(UNAME))
endif
@@ -214,7 +210,7 @@ endif
#-------------------------------------------------
# specify OS target, which further differentiates
# the underlying OS; supported values are:
-# win32, unix, macosx, os2
+# win32, unix, macosx
#-------------------------------------------------
ifndef TARGETOS
@@ -345,10 +341,6 @@ ifeq ($(TARGETOS),macosx)
OSD := sdl
endif
-ifeq ($(TARGETOS),os2)
-OSD := sdl
-endif
-
ifeq ($(TARGETOS),asmjs)
OSD := sdl
endif
@@ -733,9 +725,6 @@ EXE :=
ifeq ($(OS),windows)
EXE := .exe
endif
-ifeq ($(OS),os2)
-EXE := .exe
-endif
SHELLTYPE := msdos
ifeq (,$(ComSpec)$(COMSPEC))
@@ -1144,23 +1133,6 @@ netbsd_x86: generate $(PROJECTDIR)/gmake-netbsd/Makefile
#-------------------------------------------------
-# gmake-os2
-#-------------------------------------------------
-
-
-$(PROJECTDIR)/gmake-os2/Makefile: makefile $(SCRIPTS) $(GENIE)
- $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --gcc=os2 --gcc_version=$(GCC_VERSION) gmake
-
-.PHONY: os2
-os2: os2_x86
-
-.PHONY: os2_x86
-os2_x86: generate $(PROJECTDIR)/gmake-os2/Makefile
- $(SILENT) $(MAKE) -C $(PROJECTDIR)/gmake-os2 config=$(CONFIG)32 precompile
- $(SILENT) $(MAKE) -C $(PROJECTDIR)/gmake-os2 config=$(CONFIG)32
-
-
-#-------------------------------------------------
# gmake-steamlink
#-------------------------------------------------
diff --git a/scripts/genie.lua b/scripts/genie.lua
index e490701e9e9..0854523185e 100644
--- a/scripts/genie.lua
+++ b/scripts/genie.lua
@@ -108,7 +108,6 @@ newoption {
{ "ios", "iOS" },
{ "macosx", "OSX" },
{ "windows", "Windows" },
- { "os2", "OS/2 eComStation" },
{ "haiku", "Haiku" },
{ "solaris", "Solaris SunOS" },
{ "steamlink", "Steam Link" },
@@ -555,8 +554,8 @@ configuration { "Release" }
configuration { }
--- CR/LF setup: use both on win32/os2, CR only on everything else
-if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="os2" then
+-- CR/LF setup: use on win32, CR only on everything else
+if _OPTIONS["targetos"]=="windows" then
defines {
"CRLF=3",
}
@@ -696,17 +695,10 @@ if string.find(_OPTIONS["gcc"], "clang") and ((version < 30500) or (_OPTIONS["ta
"-std=c++1y",
}
else
- if _OPTIONS["targetos"]=="os2" then
- buildoptions_cpp {
- "-x c++",
- "-std=gnu++14",
- }
- else
- buildoptions_cpp {
- "-x c++",
- "-std=c++14",
- }
- end
+ buildoptions_cpp {
+ "-x c++",
+ "-std=c++14",
+ }
buildoptions_objc {
"-x objective-c++",
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index 1dfa4317a48..ba4fa9cfee0 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -399,7 +399,7 @@ newoption {
}
if not _OPTIONS["NO_USE_MIDI"] then
- if _OPTIONS["targetos"]=="freebsd" or _OPTIONS["targetos"]=="openbsd" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" or _OPTIONS["targetos"] == "os2" then
+ if _OPTIONS["targetos"]=="freebsd" or _OPTIONS["targetos"]=="openbsd" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" then
_OPTIONS["NO_USE_MIDI"] = "1"
else
_OPTIONS["NO_USE_MIDI"] = "0"
@@ -454,7 +454,7 @@ newoption {
if not _OPTIONS["USE_QTDEBUG"] then
- if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" or _OPTIONS["targetos"] == "os2" then
+ if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" then
_OPTIONS["USE_QTDEBUG"] = "0"
else
_OPTIONS["USE_QTDEBUG"] = "1"
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index 76947ad777a..28e542a1402 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -141,7 +141,7 @@ newoption {
}
if not _OPTIONS["NO_X11"] then
- if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"]=="asmjs" or _OPTIONS["targetos"]=="os2" then
+ if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"]=="asmjs" then
_OPTIONS["NO_X11"] = "1"
else
_OPTIONS["NO_X11"] = "0"
@@ -226,10 +226,6 @@ elseif _OPTIONS["targetos"]=="macosx" then
SDLOS_TARGETOS = "macosx"
SYNC_IMPLEMENTATION = "ntc"
SDL_NETWORK = "pcap"
-elseif _OPTIONS["targetos"]=="os2" then
- BASE_TARGETOS = "os2"
- SDLOS_TARGETOS = "os2"
- SYNC_IMPLEMENTATION = "os2"
end
if BASE_TARGETOS=="unix" then
@@ -290,13 +286,6 @@ if BASE_TARGETOS=="unix" then
end
end
end
-elseif BASE_TARGETOS=="os2" then
- local str = backtick(sdlconfigcmd() .. " --libs")
- addlibfromstring(str)
- addoptionsfromstring(str)
- links {
- "pthread"
- }
end
project ("qtdbg_" .. _OPTIONS["osd"])
diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua
index e3a6f913e75..5aee0471cc7 100644
--- a/scripts/src/osd/sdl_cfg.lua
+++ b/scripts/src/osd/sdl_cfg.lua
@@ -137,13 +137,6 @@ elseif _OPTIONS["targetos"]=="freebsd" then
-- /usr/local/include is not considered a system include director on FreeBSD. GL.h resides there and throws warnings
"-isystem /usr/local/include",
}
-elseif _OPTIONS["targetos"]=="os2" then
- defines {
- "SDLMAME_OS2",
- }
- buildoptions {
- backtick(sdlconfigcmd() .. " --cflags"),
- }
end
configuration { "osx*" }
diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua
index 64650af1802..c98e233b255 100644
--- a/scripts/toolchain.lua
+++ b/scripts/toolchain.lua
@@ -28,7 +28,6 @@ newoption {
{ "mingw64-gcc", "MinGW64" },
{ "mingw-clang", "MinGW (clang compiler)" },
{ "netbsd", "NetBSD" },
- { "os2", "OS/2" },
{ "osx", "OSX (GCC compiler)" },
{ "osx-clang", "OSX (Clang compiler)" },
{ "pnacl", "Native Client - PNaCl" },
@@ -292,9 +291,6 @@ function toolchain(_buildDir, _subDir)
location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-rpi")
end
- if "os2" == _OPTIONS["gcc"] then
- location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-os2")
- end
elseif _ACTION == "vs2013" or _ACTION == "vs2015" then
if (_ACTION .. "-clang") == _OPTIONS["vs"] then
@@ -820,15 +816,6 @@ function toolchain(_buildDir, _subDir)
targetdir (_buildDir .. "rpi" .. "/bin")
objdir (_buildDir .. "rpi" .. "/obj")
- configuration { "os2" }
- objdir (_buildDir .. "os2" .. "/obj")
-
- configuration { "os2", "Release" }
- targetdir (_buildDir .. "os2" .. "/bin/Release")
-
- configuration { "os2", "Debug" }
- targetdir (_buildDir .. "os2" .. "/bin/Debug")
-
configuration {} -- reset configuration
return true
@@ -893,12 +880,6 @@ function strip()
-- ALLOW_MEMORY_GROWTH
}
- configuration { "os2", "Release" }
- postbuildcommands {
- "$(SILENT) echo Stripping symbols.",
- "$(SILENT) lxlite /B- /L- /CS \"$(TARGET)\""
- }
-
configuration {} -- reset configuration
end
diff --git a/src/osd/modules/lib/osdlib_os2.cpp b/src/osd/modules/lib/osdlib_os2.cpp
deleted file mode 100644
index c1aea62f489..00000000000
--- a/src/osd/modules/lib/osdlib_os2.cpp
+++ /dev/null
@@ -1,292 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Olivier Galibert, R. Belmont
-//============================================================
-//
-// sdlos_*.c - OS specific low level code
-//
-// SDLMAME by Olivier Galibert and R. Belmont
-//
-//============================================================
-
-// standard sdl header
-#include "sdlinc.h"
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-
-#define INCL_DOS
-#include <os2.h>
-
-// MAME headers
-#include "osdcore.h"
-#include "osdlib.h"
-
-//============================================================
-// osd_getenv
-//============================================================
-
-const char *osd_getenv(const char *name)
-{
- return getenv(name);
-}
-
-//============================================================
-// osd_setenv
-//============================================================
-
-int osd_setenv(const char *name, const char *value, int overwrite)
-{
- return setenv(name, value, overwrite);
-}
-
-//============================================================
-// osd_process_kill
-//============================================================
-
-void osd_process_kill(void)
-{
- PPIB ppib;
-
- DosGetInfoBlocks(NULL, &ppib);
- DosKillProcess(DKP_PROCESSTREE, ppib->pib_ulpid);
-}
-
-//============================================================
-// osd_num_processors
-//============================================================
-
-int osd_get_num_processors(void)
-{
- ULONG numprocs = 1;
-
- DosQuerySysInfo(QSV_NUMPROCESSORS, QSV_NUMPROCESSORS, &numprocs, sizeof(numprocs));
-
- return numprocs;
-}
-
-//============================================================
-// osd_malloc
-//============================================================
-
-void *osd_malloc(size_t size)
-{
-#ifndef MALLOC_DEBUG
- return malloc(size);
-#else
-#error "MALLOC_DEBUG not yet supported"
-#endif
-}
-
-
-//============================================================
-// osd_malloc_array
-//============================================================
-
-void *osd_malloc_array(size_t size)
-{
-#ifndef MALLOC_DEBUG
- return malloc(size);
-#else
-#error "MALLOC_DEBUG not yet supported"
-#endif
-}
-
-
-//============================================================
-// osd_free
-//============================================================
-
-void osd_free(void *ptr)
-{
-#ifndef MALLOC_DEBUG
- free(ptr);
-#else
-#error "MALLOC_DEBUG not yet supported"
-#endif
-}
-
-
-//============================================================
-// osd_alloc_executable
-//
-// allocates "size" bytes of executable memory. this must take
-// things like NX support into account.
-//============================================================
-
-void *osd_alloc_executable(size_t size)
-{
- void *p;
-
- DosAllocMem( &p, size, fALLOC );
- return p;
-}
-
-//============================================================
-// osd_free_executable
-//
-// frees memory allocated with osd_alloc_executable
-//============================================================
-
-void osd_free_executable(void *ptr, size_t size)
-{
- DosFreeMem( ptr );
-}
-
-//============================================================
-// osd_break_into_debugger
-//============================================================
-
-void osd_break_into_debugger(const char *message)
-{
- printf("Ignoring MAME exception: %s\n", message);
-}
-
-//============================================================
-// PROTOTYPES
-//============================================================
-
-
-static osd_ticks_t init_cycle_counter(void);
-static osd_ticks_t performance_cycle_counter(void);
-
-//============================================================
-// STATIC VARIABLES
-//============================================================
-
-// global cycle_counter function and divider
-static osd_ticks_t (*cycle_counter)(void) = init_cycle_counter;
-static osd_ticks_t (*ticks_counter)(void) = init_cycle_counter;
-static osd_ticks_t ticks_per_second;
-
-//============================================================
-// init_cycle_counter
-//
-// to avoid total grossness, this function is split by subarch
-//============================================================
-
-static osd_ticks_t init_cycle_counter(void)
-{
- osd_ticks_t start, end;
- osd_ticks_t a, b;
-
- ULONG frequency;
- PTIB ptib;
- ULONG ulClass;
- ULONG ulDelta;
-
- DosGetInfoBlocks( &ptib, NULL );
- ulClass = HIBYTE( ptib->tib_ptib2->tib2_ulpri );
- ulDelta = LOBYTE( ptib->tib_ptib2->tib2_ulpri );
-
- if ( DosTmrQueryFreq( &frequency ) == 0 )
- {
- // use performance counter if available as it is constant
- cycle_counter = performance_cycle_counter;
- ticks_counter = performance_cycle_counter;
-
- ticks_per_second = frequency;
-
- // return the current cycle count
- return (*cycle_counter)();
- }
- else
- {
- fprintf(stderr, "No Timer available!\n");
- exit(-1);
- }
-
- // temporarily set our priority higher
- DosSetPriority( PRTYS_THREAD, PRTYC_TIMECRITICAL, PRTYD_MAXIMUM, 0 );
-
- // wait for an edge on the timeGetTime call
- a = SDL_GetTicks();
- do
- {
- b = SDL_GetTicks();
- } while (a == b);
-
- // get the starting cycle count
- start = (*cycle_counter)();
-
- // now wait for 1/4 second total
- do
- {
- a = SDL_GetTicks();
- } while (a - b < 250);
-
- // get the ending cycle count
- end = (*cycle_counter)();
-
- // compute ticks_per_sec
- ticks_per_second = (end - start) * 4;
-
- // restore our priority
- DosSetPriority( PRTYS_THREAD, ulClass, ulDelta, 0 );
-
- // return the current cycle count
- return (*cycle_counter)();
-}
-
-//============================================================
-// performance_cycle_counter
-//============================================================
-
-static osd_ticks_t performance_cycle_counter(void)
-{
- QWORD qwTime;
-
- DosTmrQueryTime( &qwTime );
- return (osd_ticks_t)qwTime.ulLo;
-}
-
-//============================================================
-// osd_ticks
-//============================================================
-
-osd_ticks_t osd_ticks(void)
-{
- return (*cycle_counter)();
-}
-
-
-//============================================================
-// osd_ticks_per_second
-//============================================================
-
-osd_ticks_t osd_ticks_per_second(void)
-{
- if (ticks_per_second == 0)
- {
- // if we haven't computed the value yet, there's no time like the present
- init_cycle_counter();
- }
- return ticks_per_second;
-}
-
-
-//============================================================
-// osd_sleep
-//============================================================
-
-void osd_sleep(osd_ticks_t duration)
-{
- UINT32 msec;
-
- // make sure we've computed ticks_per_second
- if (ticks_per_second == 0)
- (void)osd_ticks();
-
- // convert to milliseconds, rounding down
- msec = (UINT32)(duration * 1000 / ticks_per_second);
-
- // only sleep if at least 2 full milliseconds
- if (msec >= 2)
- {
- // take a couple of msecs off the top for good measure
- msec -= 2;
- usleep(msec*1000);
- }
-}
diff --git a/src/osd/modules/sync/sync_os2.cpp b/src/osd/modules/sync/sync_os2.cpp
deleted file mode 100644
index 6e3265bb198..00000000000
--- a/src/osd/modules/sync/sync_os2.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Olivier Galibert, R. Belmont
-//============================================================
-//
-// sdlsync.c - SDL core synchronization functions
-//
-// SDLMAME by Olivier Galibert and R. Belmont
-//
-//============================================================
-
-#ifndef _GNU_SOURCE
-#define _GNU_SOURCE // for PTHREAD_MUTEX_RECURSIVE; needs to be here before other glibc headers are included
-#endif
-
-#include "sdlinc.h"
-
-// standard C headers
-#include <math.h>
-#include <unistd.h>
-
-// MAME headers
-#include "osdcore.h"
-#include "osdsync.h"
-
-#include "eminline.h"
-
-#define INCL_DOS
-#include <os2.h>
-
-#include <stdlib.h>
-#define pthread_t int
-#define pthread_self _gettid
-
-struct osd_event {
- HMTX hmtx;
- HEV hev;
- volatile INT32 autoreset;
- INT8 padding[52]; // Fill a 64-byte cache line
-};
-
-//============================================================
-// TYPE DEFINITIONS
-//============================================================
-
-struct osd_thread {
- pthread_t thread;
- osd_thread_callback callback;
- void *param;
-};
-
-//============================================================
-// osd_event_alloc
-//============================================================
-
-osd_event *osd_event_alloc(int manualreset, int initialstate)
-{
- osd_event *ev;
-
- ev = (osd_event *)calloc(1, sizeof(osd_event));
- if (ev == NULL)
- return NULL;
-
- DosCreateMutexSem(NULL, &ev->hmtx, 0, FALSE);
- DosCreateEventSem(NULL, &ev->hev, 0, initialstate);
- ev->autoreset = !manualreset;
-
- return ev;
-}
-
-//============================================================
-// osd_event_free
-//============================================================
-
-void osd_event_free(osd_event *event)
-{
- DosCloseMutexSem(event->hmtx);
- DosCloseEventSem(event->hev);
- free(event);
-}
-
-//============================================================
-// osd_event_set
-//============================================================
-
-void osd_event_set(osd_event *event)
-{
- DosPostEventSem(event->hev);
-}
-
-//============================================================
-// osd_event_reset
-//============================================================
-
-void osd_event_reset(osd_event *event)
-{
- ULONG ulCount;
-
- DosResetEventSem(event->hev, &ulCount);
-}
-
-//============================================================
-// osd_event_wait
-//============================================================
-
-int osd_event_wait(osd_event *event, osd_ticks_t timeout)
-{
- ULONG rc;
- ULONG timeout_param;
-
- if (timeout == OSD_EVENT_WAIT_INFINITE)
- timeout_param = SEM_INDEFINITE_WAIT;
- else
- timeout_param = timeout * 1000 / osd_ticks_per_second();
-
- if(event->autoreset)
- DosRequestMutexSem(event->hmtx, -1);
-
- rc = DosWaitEventSem(event->hev, timeout_param);
-
- if(event->autoreset)
- {
- ULONG ulCount;
-
- if(rc == 0)
- DosResetEventSem(event->hev, &ulCount);
-
- DosReleaseMutexSem(event->hmtx);
- }
-
- return (rc == 0);
-}
-
-//============================================================
-// osd_thread_create
-//============================================================
-
-static void worker_thread_entry(void *param)
-{
- osd_thread *thread = (osd_thread *) param;
-
- thread->callback(thread->param);
-}
-
-osd_thread *osd_thread_create(osd_thread_callback callback, void *cbparam)
-{
- osd_thread *thread;
-
- thread = (osd_thread *)calloc(1, sizeof(osd_thread));
- if (thread == NULL)
- return NULL;
- thread->callback = callback;
- thread->param = cbparam;
- thread->thread = _beginthread(worker_thread_entry, NULL, 65535, thread);
- if ( thread->thread == -1 )
- {
- free(thread);
- return NULL;
- }
- return thread;
-}
-
-//============================================================
-// osd_thread_adjust_priority
-//============================================================
-
-int osd_thread_adjust_priority(osd_thread *thread, int adjust)
-{
- PTIB ptib;
-
- DosGetInfoBlocks(&ptib, NULL);
-
- if ( DosSetPriority(PRTYS_THREAD, PRTYC_NOCHANGE,
- ((BYTE)ptib->tib_ptib2->tib2_ulpri) + adjust, thread->thread ))
- return FALSE;
-
-
- return TRUE;
-}
-
-//============================================================
-// osd_thread_cpu_affinity
-//============================================================
-
-int osd_thread_cpu_affinity(osd_thread *thread, UINT32 mask)
-{
- return TRUE;
-}
-
-//============================================================
-// osd_thread_wait_free
-//============================================================
-
-void osd_thread_wait_free(osd_thread *thread)
-{
- TID tid = thread->thread;
-
- DosWaitThread(&tid, 0);
- free(thread);
-}
diff --git a/src/osd/osdcore.h b/src/osd/osdcore.h
index cd08fa8aa4e..30d07eac770 100644
--- a/src/osd/osdcore.h
+++ b/src/osd/osdcore.h
@@ -28,7 +28,7 @@
/* Make sure we have a path separator (default to /) */
#ifndef PATH_SEPARATOR
-#if defined(_WIN32) || defined (__OS2__)
+#if defined(_WIN32)
#define PATH_SEPARATOR "\\"
#else
#define PATH_SEPARATOR "/"
diff --git a/src/osd/sdl/sdldir.cpp b/src/osd/sdl/sdldir.cpp
index 251210ba400..3d5071171d8 100644
--- a/src/osd/sdl/sdldir.cpp
+++ b/src/osd/sdl/sdldir.cpp
@@ -38,7 +38,7 @@
#include "osdcore.h"
#include "modules/lib/osdlib.h"
-#if defined(SDLMAME_WIN32) || defined(SDLMAME_OS2)
+#if defined(SDLMAME_WIN32)
#define PATHSEPCH '\\'
#define INVPATHSEPCH '/'
#else
@@ -46,7 +46,7 @@
#define INVPATHSEPCH '\\'
#endif
-#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_HAIKU) || defined(SDLMAME_EMSCRIPTEN)
typedef struct dirent sdl_dirent;
typedef struct stat sdl_stat;
#define sdl_readdir readdir
diff --git a/src/osd/sdl/sdlfile.cpp b/src/osd/sdl/sdlfile.cpp
index 1f6832b03dd..917bce15fea 100644
--- a/src/osd/sdl/sdlfile.cpp
+++ b/src/osd/sdl/sdlfile.cpp
@@ -53,7 +53,7 @@ extern const char *sdlfile_ptty_identifier;
// CONSTANTS
//============================================================
-#if defined(SDLMAME_WIN32) || defined(SDLMAME_OS2)
+#if defined(SDLMAME_WIN32)
#define PATHSEPCH '\\'
#define INVPATHSEPCH '/'
#else
@@ -112,7 +112,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)
+ #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_HAIKU)
struct stat st;
#else
struct stat64 st;
@@ -172,12 +172,12 @@ file_error osd_open(const char *path, UINT32 openflags, osd_file **file, UINT64
osd_subst_env(&tmpstr, (*file)->filename);
- #if defined(SDLMAME_WIN32) || defined(SDLMAME_OS2)
+ #if defined(SDLMAME_WIN32)
access |= O_BINARY;
#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)
+ #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_HAIKU)
(*file)->handle = open(tmpstr, access, 0666);
#else
(*file)->handle = open64(tmpstr, access, 0666);
@@ -200,7 +200,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)
+ #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_HAIKU)
(*file)->handle = open(tmpstr, access, 0666);
#else
(*file)->handle = open64(tmpstr, access, 0666);
@@ -220,7 +220,7 @@ file_error osd_open(const char *path, UINT32 openflags, osd_file **file, UINT64
}
// get the file size
- #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_OS2) || defined(SDLMAME_HAIKU)
+ #if defined(SDLMAME_DARWIN) || defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_HAIKU)
fstat((*file)->handle, &st);
#else
fstat64((*file)->handle, &st);
@@ -255,7 +255,7 @@ file_error osd_read(osd_file *file, void *buffer, UINT64 offset, UINT32 count, U
#if defined(SDLMAME_DARWIN) || defined(SDLMAME_BSD) || defined(SDLMAME_EMSCRIPTEN)
result = pread(file->handle, buffer, count, offset);
if (result < 0)
-#elif defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_OS2)
+#elif defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO)
lseek(file->handle, (UINT32)offset&0xffffffff, SEEK_SET);
result = read(file->handle, buffer, count);
if (result < 0)
@@ -298,7 +298,7 @@ file_error osd_write(osd_file *file, const void *buffer, UINT64 offset, UINT32 c
#if defined(SDLMAME_DARWIN) || defined(SDLMAME_BSD) || defined(SDLMAME_EMSCRIPTEN)
result = pwrite(file->handle, buffer, count, offset);
if (!result)
-#elif defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO) || defined(SDLMAME_OS2)
+#elif defined(SDLMAME_WIN32) || defined(SDLMAME_NO64BITIO)
lseek(file->handle, (UINT32)offset&0xffffffff, SEEK_SET);
result = write(file->handle, buffer, count);
if (!result)
@@ -471,7 +471,7 @@ int osd_is_absolute_path(const char *path)
if (osd_is_path_separator(path[0]))
result = TRUE;
-#if !defined(SDLMAME_WIN32) && !defined(SDLMAME_OS2)
+#if !defined(SDLMAME_WIN32)
else if (path[0] == '.')
result = TRUE;
#else
@@ -494,13 +494,13 @@ osd_directory_entry *osd_stat(const char *path)
{
int err;
osd_directory_entry *result = NULL;
- #if defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_DARWIN) || defined(SDLMAME_OS2)
+ #if defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_DARWIN)
struct stat st;
#else
struct stat64 st;
#endif
- #if defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_DARWIN) || defined(SDLMAME_OS2)
+ #if defined(SDLMAME_NO64BITIO) || defined(SDLMAME_BSD) || defined(SDLMAME_DARWIN)
err = stat(path, &st);
#else
err = stat64(path, &st);
diff --git a/src/osd/sdl/sdlmain.cpp b/src/osd/sdl/sdlmain.cpp
index 530aa41c9d4..f9015e80552 100644
--- a/src/osd/sdl/sdlmain.cpp
+++ b/src/osd/sdl/sdlmain.cpp
@@ -21,7 +21,7 @@
#endif
// standard includes
-#if !defined(SDLMAME_WIN32) && !defined(SDLMAME_OS2)
+#if !defined(SDLMAME_WIN32)
#include <unistd.h>
#endif
@@ -31,12 +31,6 @@
#include <windows.h>
#endif
-
-#ifdef SDLMAME_OS2
-#define INCL_DOS
-#include <os2.h>
-#endif
-
#include "sdlinc.h"
// MAME headers
@@ -67,7 +61,7 @@
//============================================================
#ifndef INI_PATH
-#if defined(SDLMAME_WIN32) || defined(SDLMAME_OS2)
+#if defined(SDLMAME_WIN32)
#define INI_PATH ".;ini"
#elif defined(SDLMAME_MACOSX)
#define INI_PATH "$HOME/Library/Application Support/APP_NAME;$HOME/.APP_NAME;.;ini"
@@ -173,23 +167,6 @@ const options_entry sdl_options::s_option_entries[] =
};
//============================================================
-// OS2 specific
-//============================================================
-
-#ifdef SDLMAME_OS2
-void MorphToPM()
-{
- PPIB pib;
- PTIB tib;
-
- DosGetInfoBlocks(&tib, &pib);
-
- // Change flag from VIO to PM:
- if (pib->pib_ultype==2) pib->pib_ultype = 3;
-}
-#endif
-
-//============================================================
// sdl_options
//============================================================
@@ -231,10 +208,6 @@ int main(int argc, char *argv[])
#endif
#endif
-#ifdef SDLMAME_OS2
- MorphToPM();
-#endif
-
{
sdl_options options;
sdl_osd_interface osd(options);
@@ -326,7 +299,6 @@ static void defines_verbose(void)
MACRO_VERBOSE(SDLMAME_UNIX);
MACRO_VERBOSE(SDLMAME_X11);
MACRO_VERBOSE(SDLMAME_WIN32);
- MACRO_VERBOSE(SDLMAME_OS2);
MACRO_VERBOSE(SDLMAME_MACOSX);
MACRO_VERBOSE(SDLMAME_DARWIN);
MACRO_VERBOSE(SDLMAME_LINUX);
diff --git a/src/osd/sdl/sdlos_os2.cpp b/src/osd/sdl/sdlos_os2.cpp
deleted file mode 100644
index d559d43b553..00000000000
--- a/src/osd/sdl/sdlos_os2.cpp
+++ /dev/null
@@ -1,36 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Olivier Galibert, R. Belmont
-//============================================================
-//
-// sdlos_*.c - OS specific low level code
-//
-// SDLMAME by Olivier Galibert and R. Belmont
-//
-//============================================================
-
-// standard sdl header
-#include "sdlinc.h"
-#include <unistd.h>
-#include <stdio.h>
-#include <string.h>
-#include <ctype.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-
-#define INCL_DOS
-#include <os2.h>
-
-// MAME headers
-#include "osdcore.h"
-
-//============================================================
-// osd_get_clipboard_text
-// - used in MESS
-//============================================================
-
-char *osd_get_clipboard_text(void)
-{
- char *result = NULL;
-
- return result;
-}
diff --git a/src/osd/sdl/sdlprefix.h b/src/osd/sdl/sdlprefix.h
index 1da6e9d5b8b..2acc6a9d98e 100644
--- a/src/osd/sdl/sdlprefix.h
+++ b/src/osd/sdl/sdlprefix.h
@@ -59,10 +59,6 @@
#define SDLMAME_BSD 1
#endif
-#if defined(__OS2__)
-#define SDLMAME_OS2 1
-#endif
-
#if defined(__HAIKU__)
#define SDLMAME_HAIKU 1
#define SDLMAME_NO64BITIO 1
diff --git a/src/osd/sdl/sdlptty_os2.cpp b/src/osd/sdl/sdlptty_os2.cpp
deleted file mode 100644
index 763cc4ea437..00000000000
--- a/src/osd/sdl/sdlptty_os2.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Olivier Galibert, R. Belmont
-//============================================================
-//
-// sdlptty_os2 - SDL psuedo tty access functions
-// (OS/2 has no pttys - maybe named pipes?)
-//
-// SDLMAME by Olivier Galibert and R. Belmont
-//
-//============================================================
-
-#include "sdlfile.h"
-
-const char *sdlfile_ptty_identifier = "";
-
-file_error sdl_open_ptty(const char *path, UINT32 openflags, osd_file **file, UINT64 *filesize)
-{
- return FILERR_ACCESS_DENIED;
-}
-
-file_error sdl_read_ptty(osd_file *file, void *buffer, UINT64 offset, UINT32 count, UINT32 *actual)
-{
- return FILERR_ACCESS_DENIED;
-}
-
-file_error sdl_write_ptty(osd_file *file, const void *buffer, UINT64 offset, UINT32 count, UINT32 *actual)
-{
- return FILERR_ACCESS_DENIED;
-}
-
-file_error sdl_close_ptty(osd_file *file)
-{
- return FILERR_ACCESS_DENIED;
-}
-
-file_error sdl_slave_name_ptty(osd_file *file , char *name , size_t name_len)
-{
- return FILERR_ACCESS_DENIED;
-}
diff --git a/src/osd/sdl/sdlptty_unix.cpp b/src/osd/sdl/sdlptty_unix.cpp
index bd1751c15c2..063b999b75d 100644
--- a/src/osd/sdl/sdlptty_unix.cpp
+++ b/src/osd/sdl/sdlptty_unix.cpp
@@ -8,7 +8,7 @@
//
//============================================================
-#if (!defined(SDLMAME_SOLARIS) && !(defined(SDLMAME_OS2)))
+#if (!defined(SDLMAME_SOLARIS))
#include <sys/types.h>
#include <sys/uio.h>
diff --git a/src/osd/sdl/testkeys.cpp b/src/osd/sdl/testkeys.cpp
index 850ec1ad506..0f8157aa524 100644
--- a/src/osd/sdl/testkeys.cpp
+++ b/src/osd/sdl/testkeys.cpp
@@ -111,10 +111,6 @@ int main(int argc, char *argv[])
break;
}
event.type = 0;
-
- #ifdef SDLMAME_OS2
- SDL_Delay( 10 );
- #endif
}
SDL_Quit();
return(0);