summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2016-03-04 20:18:47 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2016-03-04 20:18:47 +0100
commit24276fc7dbf8090f1952cf9ac97cb109a32e3b33 (patch)
tree974576016c6cae0e3b0bc049b559202f378cfac4 /scripts
parent7dd36aaf2f6611ff9b0fcab787d7ea68d30ea7f6 (diff)
removed Apache 2 licensed library since it is not possible to mix with GPL2 (nw)
Diffstat (limited to 'scripts')
-rw-r--r--scripts/src/3rdparty.lua58
-rw-r--r--scripts/src/main.lua1
2 files changed, 0 insertions, 59 deletions
diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua
index 82fb09947de..330a31221ee 100644
--- a/scripts/src/3rdparty.lua
+++ b/scripts/src/3rdparty.lua
@@ -511,64 +511,6 @@ project "lualibs"
}
--------------------------------------------------
--- luv lua library objects
---------------------------------------------------
-if _OPTIONS["USE_LIBUV"]=="1" then
-project "luv"
- uuid "d98ec5ca-da2a-4a50-88a2-52061ca53871"
- kind "StaticLib"
-
- if _OPTIONS["targetos"]=="windows" then
- defines {
- "_WIN32_WINNT=0x0600",
- }
- end
-
- configuration { "vs*" }
- buildoptions {
- "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data
- }
-
- configuration { "gmake" }
- buildoptions_c {
- "-Wno-unused-function",
- "-Wno-strict-prototypes",
- "-Wno-unused-variable",
- "-Wno-undef",
- }
-
- configuration { "not android-*" }
- buildoptions_c {
- "-Wno-maybe-uninitialized",
- }
-
- configuration { "vs2015" }
- buildoptions {
- "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used
- "/wd4703", -- warning C4703: potentially uninitialized local pointer variable 'xxx' used
- }
-
- configuration { }
- defines {
- "LUA_COMPAT_ALL",
- }
-
- includedirs {
- MAME_DIR .. "3rdparty/lua/src",
- MAME_DIR .. "3rdparty/libuv/include",
- }
- if _OPTIONS["with-bundled-lua"] then
- includedirs {
- MAME_DIR .. "3rdparty/luv/deps/lua/src",
- }
- end
-
- files {
- MAME_DIR .. "3rdparty/luv/src/luv.c",
- MAME_DIR .. "3rdparty/luv/src/luv.h",
- }
-end
---------------------------------------------------
-- SQLite3 library objects
--------------------------------------------------
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index eafcc59f72e..daa73731b90 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -165,7 +165,6 @@ end
if _OPTIONS["USE_LIBUV"]=="1" then
links {
- "luv",
"uv",
"http-parser",
}