summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-10-07 14:15:01 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2016-10-07 14:15:01 +0200
commitc0a5494de53f66d75c98c553cf61e32a5a8d5076 (patch)
treeb1c1685c84e261795bf37a0c9969f80c9fdab705 /scripts
parent85f4741fcf642f52ac4fa56f0aff1728727c901b (diff)
Replaced code usage of libuv with asio library (nw)
Diffstat (limited to 'scripts')
-rw-r--r--scripts/extlib.lua6
-rw-r--r--scripts/src/3rdparty.lua201
-rw-r--r--scripts/src/main.lua5
-rw-r--r--scripts/src/osd/modules.lua15
4 files changed, 2 insertions, 225 deletions
diff --git a/scripts/extlib.lua b/scripts/extlib.lua
index e4e3b7cce46..3202832e504 100644
--- a/scripts/extlib.lua
+++ b/scripts/extlib.lua
@@ -13,7 +13,6 @@ local extlibs = {
portmidi = { "portmidi", "3rdparty/portmidi/pm_common" },
portaudio = { "portaudio", "3rdparty/portaudio/include" },
lua = { "lua", "3rdparty/lua/src" },
- uv = { "uv" , "3rdparty/libuv/include" },
}
-- system lib options
@@ -52,11 +51,6 @@ newoption {
description = "Use system LUA library",
}
-newoption {
- trigger = 'with-system-uv',
- description = 'Use system uv library',
-}
-
-- build helpers
function ext_lib(lib)
local opt = _OPTIONS["with-system-" .. lib]
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 22517045804..238461934c8 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -976,207 +976,6 @@ end
--end
--------------------------------------------------
--- libuv library objects
---------------------------------------------------
-if _OPTIONS["USE_LIBUV"]=="1" then
-if not _OPTIONS["with-system-uv"] then
-project "uv"
- uuid "cd2afe7f-139d-49c3-9000-fc9119f3cea0"
- kind "StaticLib"
-
- includedirs {
- MAME_DIR .. "3rdparty/libuv/include",
- MAME_DIR .. "3rdparty/libuv/src",
- MAME_DIR .. "3rdparty/libuv/src/win",
- }
-
- configuration { "gmake or ninja" }
- buildoptions_c {
- "-Wno-strict-prototypes",
- "-Wno-bad-function-cast",
- "-Wno-write-strings",
- "-Wno-missing-braces",
- "-Wno-undef",
- "-Wno-unused-variable",
- }
-
-
- local version = str_to_version(_OPTIONS["gcc_version"])
- if (_OPTIONS["gcc"]~=nil) then
- if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "android") then
- buildoptions_c {
- "-Wno-unknown-warning-option",
- "-Wno-unknown-attributes",
- "-Wno-null-dereference",
- "-Wno-unused-but-set-variable",
- "-Wno-maybe-uninitialized",
- }
- else
- buildoptions_c {
- "-Wno-unused-but-set-variable",
- "-Wno-maybe-uninitialized",
- }
- end
- end
-
- configuration { "vs*" }
- buildoptions {
- "/wd4054", -- warning C4054: 'type cast' : from function pointer 'xxx' to data pointer 'void *'
- "/wd4204", -- warning C4204: nonstandard extension used : non-constant aggregate initializer
- "/wd4210", -- warning C4210: nonstandard extension used : function given file scope
- "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used
- "/wd4703", -- warning C4703: potentially uninitialized local pointer variable 'xxx' used
- "/wd4477", -- warning C4477: '<function>' : format string '<format-string>' requires an argument of type '<type>', but variadic argument <position> has type '<type>'
- }
-
- configuration { }
-
- files {
- MAME_DIR .. "3rdparty/libuv/src/fs-poll.c",
- MAME_DIR .. "3rdparty/libuv/src/inet.c",
- MAME_DIR .. "3rdparty/libuv/src/threadpool.c",
- MAME_DIR .. "3rdparty/libuv/src/uv-common.c",
- MAME_DIR .. "3rdparty/libuv/src/version.c",
- }
-
- if _OPTIONS["targetos"]=="windows" then
- defines {
- "WIN32_LEAN_AND_MEAN",
- "_WIN32_WINNT=0x0502",
- }
- configuration { }
- files {
- MAME_DIR .. "3rdparty/libuv/src/win/async.c",
- MAME_DIR .. "3rdparty/libuv/src/win/core.c",
- MAME_DIR .. "3rdparty/libuv/src/win/dl.c",
- MAME_DIR .. "3rdparty/libuv/src/win/error.c",
- MAME_DIR .. "3rdparty/libuv/src/win/fs-event.c",
- MAME_DIR .. "3rdparty/libuv/src/win/fs.c",
- MAME_DIR .. "3rdparty/libuv/src/win/getaddrinfo.c",
- MAME_DIR .. "3rdparty/libuv/src/win/getnameinfo.c",
- MAME_DIR .. "3rdparty/libuv/src/win/handle.c",
- MAME_DIR .. "3rdparty/libuv/src/win/loop-watcher.c",
- MAME_DIR .. "3rdparty/libuv/src/win/pipe.c",
- MAME_DIR .. "3rdparty/libuv/src/win/poll.c",
- MAME_DIR .. "3rdparty/libuv/src/win/process-stdio.c",
- MAME_DIR .. "3rdparty/libuv/src/win/process.c",
- MAME_DIR .. "3rdparty/libuv/src/win/req.c",
- MAME_DIR .. "3rdparty/libuv/src/win/signal.c",
- MAME_DIR .. "3rdparty/libuv/src/win/stream.c",
- MAME_DIR .. "3rdparty/libuv/src/win/tcp.c",
- MAME_DIR .. "3rdparty/libuv/src/win/thread.c",
- MAME_DIR .. "3rdparty/libuv/src/win/timer.c",
- MAME_DIR .. "3rdparty/libuv/src/win/tty.c",
- MAME_DIR .. "3rdparty/libuv/src/win/udp.c",
- MAME_DIR .. "3rdparty/libuv/src/win/util.c",
- MAME_DIR .. "3rdparty/libuv/src/win/winapi.c",
- MAME_DIR .. "3rdparty/libuv/src/win/winsock.c",
- }
- end
-
- if _OPTIONS["targetos"]~="windows" then
- files {
- MAME_DIR .. "3rdparty/libuv/src/unix/async.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/atomic-ops.h",
- MAME_DIR .. "3rdparty/libuv/src/unix/core.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/dl.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/fs.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/getaddrinfo.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/getnameinfo.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/internal.h",
- MAME_DIR .. "3rdparty/libuv/src/unix/loop-watcher.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/loop.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/pipe.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/poll.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/process.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/signal.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/spinlock.h",
- MAME_DIR .. "3rdparty/libuv/src/unix/stream.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/tcp.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/thread.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/timer.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/tty.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/udp.c",
- }
- end
- if _OPTIONS["targetos"]=="linux" then
- defines {
- "_GNU_SOURCE",
- }
- files {
- MAME_DIR .. "3rdparty/libuv/src/unix/linux-core.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/linux-inotify.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/linux-syscalls.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/linux-syscalls.h",
- MAME_DIR .. "3rdparty/libuv/src/unix/proctitle.c",
- }
- end
- if _OPTIONS["targetos"]=="macosx" then
- defines {
- "_DARWIN_USE_64_BIT_INODE=1",
- "_DARWIN_UNLIMITED_SELECT=1",
- }
- files {
- MAME_DIR .. "3rdparty/libuv/src/unix/darwin.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/darwin-proctitle.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/fsevents.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/kqueue.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/proctitle.c",
- }
- end
-
- if _OPTIONS["targetos"]=="android" then
- defines {
- "_GNU_SOURCE",
- }
- buildoptions {
- "-Wno-header-guard",
- }
- files {
- MAME_DIR .. "3rdparty/libuv/src/unix/proctitle.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/linux-core.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/linux-inotify.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/linux-syscalls.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/linux-syscalls.h",
- MAME_DIR .. "3rdparty/libuv/src/unix/pthread-fixes.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/android-ifaddrs.c",
- }
- end
-
- if _OPTIONS["targetos"]=="solaris" then
- defines {
- "__EXTENSIONS__",
- "_XOPEN_SOURCE=500",
- }
- files {
- MAME_DIR .. "3rdparty/libuv/src/unix/sunos.c",
- }
- end
- if _OPTIONS["targetos"]=="freebsd" then
- files {
- MAME_DIR .. "3rdparty/libuv/src/unix/freebsd.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/kqueue.c",
- }
- end
- if _OPTIONS["targetos"]=="netbsd" then
- files {
- MAME_DIR .. "3rdparty/libuv/src/unix/netbsd.c",
- MAME_DIR .. "3rdparty/libuv/src/unix/kqueue.c",
- }
- links {
- "kvm",
- }
- end
-
- if (_OPTIONS["SHADOW_CHECK"]=="1") then
- removebuildoptions {
- "-Wshadow"
- }
- end
-end
-
-end
---------------------------------------------------
-- SDL2 library
--------------------------------------------------
if _OPTIONS["with-bundled-sdl2"] then
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index d52cfbf36aa..08f047d99db 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -229,11 +229,6 @@ if (STANDALONE~=true) then
"lualibs",
}
end
- if _OPTIONS["USE_LIBUV"]=="1" then
- links {
- ext_lib("uv"),
- }
- end
links {
ext_lib("zlib"),
ext_lib("flac"),
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index 7fb7a81f90b..61aeea26270 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -50,6 +50,7 @@ function osdmodulesbuild()
}
files {
+ MAME_DIR .. "src/osd/asio.cpp",
MAME_DIR .. "src/osd/osdnet.cpp",
MAME_DIR .. "src/osd/osdnet.h",
MAME_DIR .. "src/osd/watchdog.cpp",
@@ -107,18 +108,6 @@ function osdmodulesbuild()
MAME_DIR .. "src/osd/modules/output/network.cpp",
MAME_DIR .. "src/osd/modules/output/win32_output.cpp",
MAME_DIR .. "src/osd/modules/output/win32_output.h",
- MAME_DIR .. "src/osd/modules/ipc/tcp_connection.cpp",
- MAME_DIR .. "src/osd/modules/ipc/tcp_connection.h",
- MAME_DIR .. "src/osd/modules/ipc/tcp_server.cpp",
- MAME_DIR .. "src/osd/modules/ipc/tcp_server.h",
- MAME_DIR .. "src/osd/modules/ipc/raw_tcp_connection.cpp",
- MAME_DIR .. "src/osd/modules/ipc/raw_tcp_connection.h",
- MAME_DIR .. "src/osd/modules/ipc/raw_tcp_server.cpp",
- MAME_DIR .. "src/osd/modules/ipc/raw_tcp_server.h",
- MAME_DIR .. "src/osd/modules/ipc/rtc_tcp_connection.cpp",
- MAME_DIR .. "src/osd/modules/ipc/rtc_tcp_connection.h",
- MAME_DIR .. "src/osd/modules/ipc/rtc_tcp_server.cpp",
- MAME_DIR .. "src/osd/modules/ipc/rtc_tcp_server.h",
MAME_DIR .. "src/osd/modules/monitor/monitor_common.h",
MAME_DIR .. "src/osd/modules/monitor/monitor_common.cpp",
MAME_DIR .. "src/osd/modules/monitor/monitor_win32.cpp",
@@ -126,7 +115,7 @@ function osdmodulesbuild()
MAME_DIR .. "src/osd/modules/monitor/monitor_sdl.cpp",
}
includedirs {
- ext_includedir("uv"),
+ MAME_DIR .. "3rdparty/asio/include",
}
if _OPTIONS["targetos"]=="windows" then