summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-03-01 20:52:56 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-03-01 20:52:56 +0100
commitd9510ed04d2033cef0bae5b4b5014d70ea729764 (patch)
tree0edfafdb6ae41224d5009b58223367c5a6039c7c /scripts
parent6d0c46eaccc6825377b3616366b98cb6e603507b (diff)
Used std::thread and std::condition_variable (nw)
Diffstat (limited to 'scripts')
-rw-r--r--scripts/src/osd/osdmini.lua22
-rw-r--r--scripts/src/osd/sdl.lua20
-rw-r--r--scripts/src/osd/sdl_cfg.lua1
-rw-r--r--scripts/src/osd/windows.lua14
4 files changed, 6 insertions, 51 deletions
diff --git a/scripts/src/osd/osdmini.lua b/scripts/src/osd/osdmini.lua
index 76bb2ac97de..91b9d11a3d5 100644
--- a/scripts/src/osd/osdmini.lua
+++ b/scripts/src/osd/osdmini.lua
@@ -96,25 +96,7 @@ project ("ocore_" .. _OPTIONS["osd"])
MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
}
-
- if _OPTIONS["targetos"]=="linux" then
- BASE_TARGETOS = "unix"
- SDLOS_TARGETOS = "unix"
- SYNC_IMPLEMENTATION = "tc"
- end
-
- if _OPTIONS["targetos"]=="windows" then
- BASE_TARGETOS = "win32"
- SDLOS_TARGETOS = "win32"
- SYNC_IMPLEMENTATION = "windows"
- end
-
- if _OPTIONS["targetos"]=="macosx" then
- BASE_TARGETOS = "unix"
- SDLOS_TARGETOS = "macosx"
- SYNC_IMPLEMENTATION = "ntc"
- end
-
+
files {
MAME_DIR .. "src/osd/osdnet.cpp",
MAME_DIR .. "src/osd/osdnet.h",
@@ -126,5 +108,5 @@ project ("ocore_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/osdmini/minifile.cpp",
MAME_DIR .. "src/osd/osdmini/minimisc.cpp",
MAME_DIR .. "src/osd/osdmini/minitime.cpp",
- MAME_DIR .. "src/osd/modules/sync/work_mini.cpp",
+ MAME_DIR .. "src/osd/modules/sync/work_osd.cpp",
}
diff --git a/scripts/src/osd/sdl.lua b/scripts/src/osd/sdl.lua
index 5a64013ffdf..fa3e85c2454 100644
--- a/scripts/src/osd/sdl.lua
+++ b/scripts/src/osd/sdl.lua
@@ -222,27 +222,20 @@ end
BASE_TARGETOS = "unix"
SDLOS_TARGETOS = "unix"
-SYNC_IMPLEMENTATION = "tc"
SDL_NETWORK = ""
if _OPTIONS["targetos"]=="linux" then
SDL_NETWORK = "taptun"
elseif _OPTIONS["targetos"]=="openbsd" then
- SYNC_IMPLEMENTATION = "ntc"
elseif _OPTIONS["targetos"]=="netbsd" then
- SYNC_IMPLEMENTATION = "ntc"
SDL_NETWORK = "pcap"
elseif _OPTIONS["targetos"]=="haiku" then
- SYNC_IMPLEMENTATION = "ntc"
elseif _OPTIONS["targetos"]=="asmjs" then
- SYNC_IMPLEMENTATION = "mini"
elseif _OPTIONS["targetos"]=="windows" then
BASE_TARGETOS = "win32"
SDLOS_TARGETOS = "win32"
- SYNC_IMPLEMENTATION = "windows"
SDL_NETWORK = "pcap"
elseif _OPTIONS["targetos"]=="macosx" then
SDLOS_TARGETOS = "macosx"
- SYNC_IMPLEMENTATION = "ntc"
SDL_NETWORK = "pcap"
end
@@ -476,20 +469,11 @@ project ("ocore_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/osdmodule.h",
MAME_DIR .. "src/osd/modules/lib/osdlib_" .. SDLOS_TARGETOS .. ".cpp",
MAME_DIR .. "src/osd/modules/lib/osdlib.h",
- MAME_DIR .. "src/osd/modules/sync/sync_" .. SYNC_IMPLEMENTATION .. ".cpp",
+ MAME_DIR .. "src/osd/modules/sync/osdsync.cpp",
MAME_DIR .. "src/osd/modules/sync/osdsync.h",
+ MAME_DIR .. "src/osd/modules/sync/work_osd.cpp",
}
- if _OPTIONS["NOASM"]=="1" then
- files {
- MAME_DIR .. "src/osd/modules/sync/work_mini.cpp",
- }
- else
- files {
- MAME_DIR .. "src/osd/modules/sync/work_osd.cpp",
- }
- end
-
if _OPTIONS["targetos"]=="macosx" then
files {
MAME_DIR .. "src/osd/sdl/osxutils.h",
diff --git a/scripts/src/osd/sdl_cfg.lua b/scripts/src/osd/sdl_cfg.lua
index 641a00b924e..3d5a84783f4 100644
--- a/scripts/src/osd/sdl_cfg.lua
+++ b/scripts/src/osd/sdl_cfg.lua
@@ -67,7 +67,6 @@ end
defines {
"OSD_SDL",
- "SYNC_IMPLEMENTATION=" .. SYNC_IMPLEMENTATION,
}
if BASE_TARGETOS=="unix" then
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index 950e15d1e46..877d1503915 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -224,7 +224,6 @@ project ("ocore_" .. _OPTIONS["osd"])
BASE_TARGETOS = "win32"
SDLOS_TARGETOS = "win32"
- SYNC_IMPLEMENTATION = "windows"
includedirs {
MAME_DIR .. "src/osd/windows",
@@ -245,7 +244,7 @@ project ("ocore_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/windows/main.cpp",
MAME_DIR .. "src/osd/windows/windir.cpp",
MAME_DIR .. "src/osd/windows/winfile.cpp",
- MAME_DIR .. "src/osd/modules/sync/sync_windows.cpp",
+ MAME_DIR .. "src/osd/modules/sync/osdsync.cpp",
MAME_DIR .. "src/osd/modules/sync/osdsync.h",
MAME_DIR .. "src/osd/windows/winutf8.cpp",
MAME_DIR .. "src/osd/windows/winutf8.h",
@@ -258,18 +257,9 @@ project ("ocore_" .. _OPTIONS["osd"])
MAME_DIR .. "src/osd/modules/osdmodule.cpp",
MAME_DIR .. "src/osd/modules/osdmodule.h",
MAME_DIR .. "src/osd/modules/lib/osdlib_win32.cpp",
+ MAME_DIR .. "src/osd/modules/sync/work_osd.cpp",
}
- if _OPTIONS["NOASM"] == "1" then
- files {
- MAME_DIR .. "src/osd/modules/sync/work_mini.cpp",
- }
- else
- files {
- MAME_DIR .. "src/osd/modules/sync/work_osd.cpp",
- }
- end
-
--------------------------------------------------
-- ledutil