summaryrefslogtreecommitdiffstatshomepage
path: root/scripts
diff options
context:
space:
mode:
author Brad Hughes <bradhugh@outlook.com>2016-03-05 09:52:54 -0500
committer Brad Hughes <bradhugh@outlook.com>2016-03-05 09:52:54 -0500
commit50fc05a49fcc6b689271ecff2dfae209bb4bfd47 (patch)
tree9bce43cfb23e17399376f45ee18a417b0dee5eef /scripts
parentf7b8e47a17efd84963e685c39840ff111787d929 (diff)
parent23eaaa9244ffa216e0b8365916d9cf3af785279b (diff)
Merge branch 'master' of https://github.com/mamedev/mame.git
Diffstat (limited to 'scripts')
-rw-r--r--scripts/build/makelist.py13
-rw-r--r--scripts/src/3rdparty.lua58
-rw-r--r--scripts/src/main.lua1
-rw-r--r--scripts/src/osd/modules.lua8
-rw-r--r--scripts/src/osd/windows.lua1
-rw-r--r--scripts/target/mame/arcade.lua11
-rw-r--r--scripts/target/mame/mess.lua7
7 files changed, 19 insertions, 80 deletions
diff --git a/scripts/build/makelist.py b/scripts/build/makelist.py
index 329ff374520..cb6400b4d80 100644
--- a/scripts/build/makelist.py
+++ b/scripts/build/makelist.py
@@ -9,6 +9,8 @@ import sys
drivlist = []
sourcelist = []
+filter_addlist = []
+filter_removelist = []
def parse_file(srcfile):
try:
@@ -102,6 +104,12 @@ def parse_filter_file(srcfile):
sys.stderr.write("Importing drivers from '%s'\n" % sourcename[1:])
parse_filter_file(sourcename[1:])
continue
+ if sourcename[0]=='+':
+ filter_addlist.append(sourcename[1:])
+ continue
+ if sourcename[0]=='-':
+ filter_removelist.append(sourcename[1:])
+ continue
if not all(((c >='a' and c<='z') or (c>='0' and c<='9') or c=='_' or c=='.' or c=='-') for c in sourcename):
sys.stderr.write("%s:%d - Invalid character in driver \"%s\"\n" % (srcfile, linenum, sourcename))
return 1
@@ -128,6 +136,11 @@ if len(drivlist)==0 :
sys.stderr.write("No drivers found\n")
sys.exit(1)
+for x in filter_addlist:
+ drivlist.append(x)
+
+drivlist = [x for x in drivlist if (x not in filter_removelist)]
+
sys.stderr.write("%d driver(s) found\n" % len(drivlist))
# add a reference to the ___empty driver
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",
}
diff --git a/scripts/src/osd/modules.lua b/scripts/src/osd/modules.lua
index 54443d4f618..1468ac6faca 100644
--- a/scripts/src/osd/modules.lua
+++ b/scripts/src/osd/modules.lua
@@ -445,9 +445,11 @@ if _OPTIONS["USE_XAUDIO2"]=="1" then
defines {
"USE_XAUDIO2=1",
},
- includedirs {
- MAME_DIR .. "3rdparty/win81sdk/Include/um",
- }
+ configuration { "mingw*"}
+ includedirs {
+ MAME_DIR .. "3rdparty/compat/mingw",
+ }
+ configuration { }
else
defines {
"USE_XAUDIO2=0",
diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua
index 50e19e8e71a..80360ac2ecb 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -217,6 +217,7 @@ project ("ocore_" .. _OPTIONS["osd"])
dofile("windows_cfg.lua")
includedirs {
+ MAME_DIR .. "3rdparty",
MAME_DIR .. "src/emu",
MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib",
diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua
index b84d17d69d5..9f17507c618 100644
--- a/scripts/target/mame/arcade.lua
+++ b/scripts/target/mame/arcade.lua
@@ -2590,8 +2590,6 @@ files {
MAME_DIR .. "src/mame/includes/tceptor.h",
MAME_DIR .. "src/mame/video/tceptor.cpp",
MAME_DIR .. "src/mame/drivers/toypop.cpp",
- MAME_DIR .. "src/mame/includes/toypop.h",
- MAME_DIR .. "src/mame/video/toypop.cpp",
MAME_DIR .. "src/mame/drivers/turrett.cpp",
MAME_DIR .. "src/mame/includes/turrett.h",
MAME_DIR .. "src/mame/audio/turrett.cpp",
@@ -2823,11 +2821,7 @@ files {
MAME_DIR .. "src/mame/includes/battlex.h",
MAME_DIR .. "src/mame/video/battlex.cpp",
MAME_DIR .. "src/mame/drivers/carjmbre.cpp",
- MAME_DIR .. "src/mame/includes/carjmbre.h",
- MAME_DIR .. "src/mame/video/carjmbre.cpp",
MAME_DIR .. "src/mame/drivers/popper.cpp",
- MAME_DIR .. "src/mame/includes/popper.h",
- MAME_DIR .. "src/mame/video/popper.cpp",
MAME_DIR .. "src/mame/drivers/spaceg.cpp",
}
@@ -4293,9 +4287,6 @@ files {
MAME_DIR .. "src/mame/drivers/fireball.cpp",
MAME_DIR .. "src/mame/drivers/flipjack.cpp",
MAME_DIR .. "src/mame/drivers/flower.cpp",
- MAME_DIR .. "src/mame/includes/flower.h",
- MAME_DIR .. "src/mame/audio/flower.cpp",
- MAME_DIR .. "src/mame/video/flower.cpp",
MAME_DIR .. "src/mame/drivers/fortecar.cpp",
MAME_DIR .. "src/mame/drivers/fresh.cpp",
MAME_DIR .. "src/mame/drivers/freekick.cpp",
@@ -4481,8 +4472,6 @@ files {
MAME_DIR .. "src/mame/drivers/splus.cpp",
MAME_DIR .. "src/mame/drivers/spool99.cpp",
MAME_DIR .. "src/mame/drivers/sprcros2.cpp",
- MAME_DIR .. "src/mame/includes/sprcros2.h",
- MAME_DIR .. "src/mame/video/sprcros2.cpp",
MAME_DIR .. "src/mame/drivers/sshot.cpp",
MAME_DIR .. "src/mame/drivers/ssingles.cpp",
MAME_DIR .. "src/mame/drivers/sstrangr.cpp",
diff --git a/scripts/target/mame/mess.lua b/scripts/target/mame/mess.lua
index 6c0dd4b0894..ab2dd075fe5 100644
--- a/scripts/target/mame/mess.lua
+++ b/scripts/target/mame/mess.lua
@@ -1777,8 +1777,6 @@ files {
MAME_DIR .. "src/mame/drivers/mephisto.cpp",
MAME_DIR .. "src/mame/drivers/mmodular.cpp",
MAME_DIR .. "src/mame/drivers/stratos.cpp",
- MAME_DIR .. "src/mame/machine/mboard.cpp",
- MAME_DIR .. "src/mame/includes/mboard.h",
}
createMESSProjects(_target, _subtarget, "hitachi")
@@ -2605,8 +2603,6 @@ files {
createMESSProjects(_target, _subtarget, "svi")
files {
MAME_DIR .. "src/mame/drivers/svi318.cpp",
- MAME_DIR .. "src/mame/includes/svi318.h",
- MAME_DIR .. "src/mame/machine/svi318.cpp",
}
createMESSProjects(_target, _subtarget, "svision")
@@ -2996,9 +2992,6 @@ files {
MAME_DIR .. "src/mame/includes/mc1502.h",
MAME_DIR .. "src/mame/drivers/poisk1.cpp",
MAME_DIR .. "src/mame/machine/kb_poisk1.h",
- MAME_DIR .. "src/mame/includes/poisk1.h",
- MAME_DIR .. "src/mame/video/poisk1.cpp",
- MAME_DIR .. "src/mame/video/poisk1.h",
}
createMESSProjects(_target, _subtarget, "yamaha")