From 6cc3a6cc90503f4007d77bf11a9ff698fe588868 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 5 Mar 2016 11:55:22 +0100 Subject: Support for filtering exceptions (nw) --- scripts/build/makelist.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'scripts/build/makelist.py') 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 -- cgit v1.2.3-70-g09d2 From b1182ed63ba29a6cb646a0cff49b42b323d90ad1 Mon Sep 17 00:00:00 2001 From: Jeffrey Clark Date: Sat, 5 Mar 2016 14:36:09 -0600 Subject: fix build errors (nw) --- scripts/build/makelist.py | 6 +++--- src/osd/modules/input/input_xinput.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts/build/makelist.py') diff --git a/scripts/build/makelist.py b/scripts/build/makelist.py index cb6400b4d80..a9b450474e2 100644 --- a/scripts/build/makelist.py +++ b/scripts/build/makelist.py @@ -59,9 +59,9 @@ def parse_file(srcfile): if not all(((c >='a' and c<='z') or (c>='0' and c<='9') or c=='_') for c in drivname): sys.stderr.write("%s:%d - Invalid character in driver \"%s\"\n" % (srcfile, linenum, drivname)) return 1 - else: + else: if (curr_source == '') or (len(sourcelist)==0) or (curr_source in sourcelist): - drivlist.append(drivname) + drivlist.append(drivname) return 0 def parse_filter_file(srcfile): @@ -113,7 +113,7 @@ def parse_filter_file(srcfile): 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 - else: + else: sourcelist.append(sourcename) return 0 diff --git a/src/osd/modules/input/input_xinput.cpp b/src/osd/modules/input/input_xinput.cpp index e256b04b101..a531bbdfefb 100644 --- a/src/osd/modules/input/input_xinput.cpp +++ b/src/osd/modules/input/input_xinput.cpp @@ -16,7 +16,7 @@ #include // XInput header -#include +#include #undef interface -- cgit v1.2.3-70-g09d2