diff options
author | 2016-04-27 18:59:40 +1000 | |
---|---|---|
committer | 2016-04-27 18:59:40 +1000 | |
commit | bcd8558b02cb54eab92df98f14bf07221d6d358b (patch) | |
tree | c29211cecf250a791c074dfc3e1fc9a2d9a1a593 /docs/release/scripts | |
parent | 0d70c1f8cdb9e66fd7bc5bcad128e394a2345607 (diff) |
0.173 Release Fileshbmame173
Diffstat (limited to 'docs/release/scripts')
48 files changed, 3460 insertions, 2100 deletions
diff --git a/docs/release/scripts/build/complay.py b/docs/release/scripts/build/complay.py new file mode 100644 index 00000000000..eea6da0c099 --- /dev/null +++ b/docs/release/scripts/build/complay.py @@ -0,0 +1,69 @@ +#!/usr/bin/python +## +## license:BSD-3-Clause +## copyright-holders:Aaron Giles, Andrew Gardner + +from __future__ import with_statement + +import sys +import os +import zlib + +if len(sys.argv) < 4: + print('Usage:') + print(' complay <source.lay> <output.h> <varname>') + print('') + sys.exit(0) + +srcfile = sys.argv[1] +dstfile = sys.argv[2] +varname = sys.argv[3] +type = 'UINT8' + +try: + myfile = open(srcfile, 'rb') +except IOError: + sys.stderr.write("Unable to open source file '%s'\n" % srcfile) + sys.exit(-1) + +byteCount = os.path.getsize(srcfile) +compsize = 0 +compressiontype = 1 + +try: + dst = open(dstfile,'w') + dst.write('const %s %s_data[] =\n{\n\t' % ( type, varname)) + offs = 0 + with open(srcfile, "rb") as src: + while True: + chunk = src.read(byteCount) + if chunk: + compchunk = bytearray(zlib.compress(chunk, 9)) + compsize = len(compchunk) + for b in compchunk: + dst.write('%d' % b) + offs += 1 + if offs != compsize: + dst.write(',') + else: + break + dst.write('\n\t') + + dst.write('\n};\n') + +except IOError: + sys.stderr.write("Unable to open output file '%s'\n" % dstfile) + sys.exit(-1) + +try: + dst.write('extern const internal_layout %s;\n' % ( varname )) + dst.write('const internal_layout %s = { \n\t' % ( varname )) + dst.write('%d,%d,%d,%s_data\n' % ( byteCount, compsize, compressiontype, varname )) + dst.write('\n};\n') + + + dst.close() +except IOError: + sys.stderr.write("Unable to open output file '%s'\n" % dstfile) + sys.exit(-1) + diff --git a/docs/release/scripts/build/makedep.py b/docs/release/scripts/build/makedep.py index a80582d0161..2ce47d42cd0 100644 --- a/docs/release/scripts/build/makedep.py +++ b/docs/release/scripts/build/makedep.py @@ -167,45 +167,10 @@ def parse_file(root, srcfile, folder): return 0 def parse_file_for_drivers(root, srcfile): - try: - fp = open(root + srcfile, 'r') - except IOError: - sys.stderr.write("Unable to open source file '%s'\n" % srcfile) - return 1 - in_comment = 0 - linenum = 0 - for line in fp.readlines(): - content = '' - linenum+=1 - srcptr = 0 - while srcptr < len(line): - c = line[srcptr] - srcptr+=1 - if ord(c)==13 or ord(c)==10: - if ord(c)==13 and ord(line[srcptr])==10: - srcptr+=1 - continue - if c==' ' or ord(c)==9: - continue - if in_comment==1 and c=='*' and line[srcptr]=='/' : - srcptr+=1 - in_comment = 0 - continue - if in_comment: - continue - if c=='/' and line[srcptr]=='*' : - srcptr+=1 - in_comment = 1 - continue - if c=='/' and line[srcptr]=='/' : - break - content += c - content = content.strip() - if len(content)>0: - if content.startswith('COMP') or content.startswith('CONS') or content.startswith('GAME') or content.startswith('SYST') or content.startswith('GAMEL'): - splitname = content.split(',', 3) - if len(splitname)>1: - drivers.append(splitname[1]) + srcfile = srcfile.replace('\\','/') + if srcfile.startswith('src/mame/drivers'): + splitname = srcfile.split('/', 4) + drivers.append(splitname[3]) return 0 def parse_lua_file(srcfile): @@ -245,32 +210,13 @@ for filename in deps_files_included: for filename in sys.argv[2].rsplit(',') : parse_file_for_drivers(root,filename) - # display output if sys.argv[3]=='drivers': - # add a reference to the ___empty driver - drivers.append("___empty") - - # start with a header - print('#include "emu.h"\n') - print('#include "drivenum.h"\n') - #output the list of externs first for drv in sorted(drivers): - print("GAME_EXTERN(%s);" % drv) + print(drv) print("") - # then output the array - print("const game_driver * const driver_list::s_drivers_sorted[%d] =" % len(drivers)) - print("{") - for drv in sorted(drivers): - print("\t&GAME_NAME(%s)," % drv) - print("};") - print("") - - # also output a global count - print("int driver_list::s_driver_count = %d;\n" % len(drivers)) - if sys.argv[3]=='target': for line in components: sys.stdout.write("%s\n" % line) @@ -291,12 +237,9 @@ if sys.argv[3]=='target': sys.stdout.write(' MAME_DIR .. "src/lib/netlist",\n') sys.stdout.write(' MAME_DIR .. "3rdparty",\n') sys.stdout.write(' GEN_DIR .. "mame/layout",\n') + sys.stdout.write(' ext_includedir("zlib"),\n') + sys.stdout.write(' ext_includedir("flac"),\n') sys.stdout.write(' }\n') - sys.stdout.write(' if _OPTIONS["with-bundled-zlib"] then\n') - sys.stdout.write(' includedirs {\n') - sys.stdout.write(' MAME_DIR .. "3rdparty/zlib",\n') - sys.stdout.write(' }\n') - sys.stdout.write(' end\n') sys.stdout.write('\n') sys.stdout.write(' files{\n') for line in deps_files_included: diff --git a/docs/release/scripts/build/makelist.py b/docs/release/scripts/build/makelist.py index 144dc636c8d..a9b450474e2 100644 --- a/docs/release/scripts/build/makelist.py +++ b/docs/release/scripts/build/makelist.py @@ -8,6 +8,9 @@ from __future__ import with_statement import sys drivlist = [] +sourcelist = [] +filter_addlist = [] +filter_removelist = [] def parse_file(srcfile): try: @@ -17,6 +20,7 @@ def parse_file(srcfile): return 1 in_comment = 0 linenum = 0 + curr_source = '' for line in fp.readlines(): drivname = '' linenum+=1 @@ -49,19 +53,81 @@ def parse_file(srcfile): sys.stderr.write("Importing drivers from '%s'\n" % drivname[1:]) parse_file(drivname[1:]) continue + if drivname[0]=='@': + curr_source= drivname[8:] + continue 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: - drivlist.append(drivname) + else: + if (curr_source == '') or (len(sourcelist)==0) or (curr_source in sourcelist): + drivlist.append(drivname) + return 0 + +def parse_filter_file(srcfile): + try: + fp = open(srcfile, 'rt') + except IOError: + sys.stderr.write("Unable to open filter file '%s'\n" % srcfile) + return 1 + in_comment = 0 + linenum = 0 + for line in fp.readlines(): + sourcename = '' + linenum+=1 + srcptr = 0 + while srcptr < len(line): + c = line[srcptr] + srcptr+=1 + if c==13 or c==10: + if c==13 and line[srcptr]==10: + srcptr+=1 + continue + if c==' ' or c==9: + continue + if in_comment==1 and c=='*' and line[srcptr]=='/' : + srcptr+=1 + in_comment = 0 + continue + if in_comment: + continue + if c=='/' and line[srcptr]=='*' : + srcptr+=1 + in_comment = 1 + continue + if c=='/' and line[srcptr]=='/' : + break + sourcename += c + sourcename = sourcename.strip() + if len(sourcename)>0: + if sourcename[0]=='#': + 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 + else: + sourcelist.append(sourcename) return 0 -if len(sys.argv) < 2: +if len(sys.argv) < 2 or len(sys.argv) > 3: print('Usage:') - print(' makelist <source.lst>') + print(' makelist <source.lst> [<filter.flt>]') sys.exit(0) +if len(sys.argv) == 3: + if parse_filter_file(sys.argv[2]) : + sys.exit(1) + sys.stderr.write("%d source file(s) found\n" % len(sourcelist)) + if parse_file(sys.argv[1]) : sys.exit(1) @@ -70,7 +136,12 @@ if len(drivlist)==0 : sys.stderr.write("No drivers found\n") sys.exit(1) -sys.stderr.write("%d drivers found\n" % len(drivlist)) +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 drivlist.append("___empty") diff --git a/docs/release/scripts/build/msgfmt.py b/docs/release/scripts/build/msgfmt.py index f28c2fcf6c6..deb02ae32b2 100644 --- a/docs/release/scripts/build/msgfmt.py +++ b/docs/release/scripts/build/msgfmt.py @@ -1,6 +1,6 @@ -#!/usr/bin/env python2 -# -*- coding: iso-8859-1 -*- -# Written by Martin v. Löwis <loewis@informatik.hu-berlin.de> +#! /usr/bin/env python +# -*- coding: utf-8 -*- +# Written by Martin v. Löwis <loewis@informatik.hu-berlin.de> """Generate binary message catalog from textual translation description. @@ -25,49 +25,71 @@ Options: Display version information and exit. """ +from __future__ import print_function import os import sys -import ast import getopt import struct import array +import re +import codecs +from email.parser import HeaderParser -__version__ = "1.1" +__version__ = "1.2" MESSAGES = {} - + def usage(code, msg=''): - print >> sys.stderr, __doc__ + print(__doc__, file=sys.stderr) if msg: - print >> sys.stderr, msg + print(msg, file=sys.stderr) sys.exit(code) - + def add(id, str, fuzzy): "Add a non-fuzzy translation to the dictionary." global MESSAGES if not fuzzy and str: MESSAGES[id] = str +def dequote(s): + if (s[0] == s[-1]) and s.startswith(("'", '"')): + return s[1:-1] + return s + +# decode_escapes from http://stackoverflow.com/a/24519338 +ESCAPE_SEQUENCE_RE = re.compile(r''' + ( \\U........ # 8-digit hex escapes + | \\u.... # 4-digit hex escapes + | \\x.. # 2-digit hex escapes + | \\[0-7]{1,3} # Octal escapes + | \\N\{[^}]+\} # Unicode characters by name + | \\[\\'"abfnrtv] # Single-character escapes + )''', re.UNICODE | re.VERBOSE) + +def decode_escapes(s): + def decode_match(match): + return codecs.decode(match.group(0), 'unicode-escape') + + return ESCAPE_SEQUENCE_RE.sub(decode_match, s) + - def generate(): "Return the generated output." global MESSAGES - keys = MESSAGES.keys() # the keys are sorted in the .mo file - keys.sort() + keys = sorted(MESSAGES.keys()) offsets = [] - ids = strs = '' + ids = strs = b'' for id in keys: # For each string, we need size and file offset. Each string is NUL # terminated; the NUL does not count into the size. offsets.append((len(ids), len(id), len(strs), len(MESSAGES[id]))) - ids += id + '\0' - strs += MESSAGES[id] + '\0' + ids += id + b'\0' + strs += MESSAGES[id] + b'\0' output = '' # The header is 7 32-bit unsigned integers. We don't use hash tables, so # the keys start right after the index tables. @@ -84,7 +106,7 @@ def generate(): voffsets += [l2, o2+valuestart] offsets = koffsets + voffsets output = struct.pack("Iiiiiii", - 0x950412deL, # Magic + 0x950412de, # Magic 0, # Version len(keys), # # of entries 7*4, # start of key index @@ -96,7 +118,7 @@ def generate(): return output - + def make(filename, outfile): ID = 1 STR = 2 @@ -110,18 +132,27 @@ def make(filename, outfile): outfile = os.path.splitext(infile)[0] + '.mo' try: - lines = open(infile).readlines() - except IOError, msg: - print >> sys.stderr, msg + lines = open(infile, 'rb').readlines() + except IOError as msg: + print(msg, file=sys.stderr) sys.exit(1) section = None fuzzy = 0 + empty = 0 + header_attempted = False + + # Start off assuming Latin-1, so everything decodes without failure, + # until we know the exact encoding + encoding = 'latin-1' + + # Start off assuming Latin-1, so everything decodes without failure, + # until we know the exact encoding + encoding = 'latin-1' # Parse the catalog - lno = 0 - for l in lines: - lno += 1 + for lno, l in enumerate(lines): + l = l.decode(encoding) # If we get a comment line after a msgstr, this is a new entry if l[0] == '#' and section == STR: add(msgid, msgstr, fuzzy) @@ -137,49 +168,83 @@ def make(filename, outfile): if l.startswith('msgid') and not l.startswith('msgid_plural'): if section == STR: add(msgid, msgstr, fuzzy) + if not msgid: + # See whether there is an encoding declaration + p = HeaderParser() + charset = p.parsestr(msgstr.decode(encoding)).get_content_charset() + if charset: + encoding = charset section = ID l = l[5:] - msgid = msgstr = '' + msgid = msgstr = b'' is_plural = False + if l.strip() == '""': + # Check if next line is msgstr. If so, this is a multiline msgid. + if lines[lno+1].decode(encoding).startswith('msgstr'): + # If this is the first empty msgid and is followed by msgstr, this is the header, which may contain the encoding declaration. + # Otherwise this file is not valid + if empty > 1: + print("Found multiple empty msgids on line " + str(lno) + ", not valid!") + empty += 1 # This is a message with plural forms elif l.startswith('msgid_plural'): if section != ID: - print >> sys.stderr, 'msgid_plural not preceded by msgid on %s:%d' %\ - (infile, lno) + print('msgid_plural not preceded by msgid on %s:%d' % (infile, lno), + file=sys.stderr) sys.exit(1) l = l[12:] - msgid += '\0' # separator of singular and plural + msgid += b'\0' # separator of singular and plural is_plural = True # Now we are in a msgstr section elif l.startswith('msgstr'): section = STR if l.startswith('msgstr['): if not is_plural: - print >> sys.stderr, 'plural without msgid_plural on %s:%d' %\ - (infile, lno) + print('plural without msgid_plural on %s:%d' % (infile, lno), + file=sys.stderr) sys.exit(1) l = l.split(']', 1)[1] if msgstr: - msgstr += '\0' # Separator of the various plural forms + msgstr += b'\0' # Separator of the various plural forms else: + if (l[6:].strip() == '""') and (empty == 1) and (not header_attempted): + header = "" + # parse up until next empty line = end of header + hdrno = lno + while(hdrno < len(lines)-1): + # This is a roundabout way to strip non-ASCII unicode characters from the header. + # As we are only parsing out the encoding, we don't need any unicode chars in it. + l = lines[hdrno+1].decode('unicode_escape').encode('ascii','ignore').decode(encoding) + if l.strip(): + header += decode_escapes(dequote(l.strip())) + else: + break + hdrno += 1 + # See whether there is an encoding declaration + if(hdrno > lno): + p = HeaderParser() + charset = p.parsestr(str(header)).get_content_charset() + header_attempted = True + if charset: + encoding = charset if is_plural: - print >> sys.stderr, 'indexed msgstr required for plural on %s:%d' %\ - (infile, lno) + print('indexed msgstr required for plural on %s:%d' % (infile, lno), + file=sys.stderr) sys.exit(1) l = l[6:] # Skip empty lines l = l.strip() if not l: continue - l = ast.literal_eval(l) + l = decode_escapes(dequote(l)) # strip quotes and replace newlines if present if section == ID: - msgid += l + msgid += l.encode(encoding) elif section == STR: - msgstr += l + msgstr += l.encode(encoding) else: - print >> sys.stderr, 'Syntax error on %s:%d' % (infile, lno), \ - 'before:' - print >> sys.stderr, l + print('Syntax error on %s:%d' % (infile, lno), \ + 'before:', file=sys.stderr) + print(l, file=sys.stderr) sys.exit(1) # Add last entry if section == STR: @@ -190,16 +255,16 @@ def make(filename, outfile): try: open(outfile,"wb").write(output) - except IOError,msg: - print >> sys.stderr, msg + except IOError as msg: + print(msg, file=sys.stderr) + - def main(): try: opts, args = getopt.getopt(sys.argv[1:], 'hVo:', ['help', 'version', 'output-file=']) - except getopt.error, msg: + except getopt.error as msg: usage(1, msg) outfile = None @@ -208,14 +273,14 @@ def main(): if opt in ('-h', '--help'): usage(0) elif opt in ('-V', '--version'): - print >> sys.stderr, "msgfmt.py", __version__ + print("msgfmt.py", __version__) sys.exit(0) elif opt in ('-o', '--output-file'): outfile = arg # do it if not args: - print >> sys.stderr, 'No input file given' - print >> sys.stderr, "Try `msgfmt --help' for more information." + print('No input file given', file=sys.stderr) + print("Try `msgfmt --help' for more information.", file=sys.stderr) return for filename in args: diff --git a/docs/release/scripts/extlib.lua b/docs/release/scripts/extlib.lua new file mode 100644 index 00000000000..9d60fe1dc2e --- /dev/null +++ b/docs/release/scripts/extlib.lua @@ -0,0 +1,104 @@ +-- license:BSD-3-Clause +-- copyright-holders:MAMEdev Team,Jeffrey Clark + +local extlibs = { +-- +-- 3rdparty system 3rdparty +-- lib name: lib name, include dir +-- + expat = { "expat", "3rdparty/expat/lib" }, + zlib = { "z", "3rdparty/zlib" }, + jpeg = { "jpeg", "3rdparty/libjpeg" }, + flac = { "FLAC", "3rdparty/libflac/include" }, + sqlite3 = { "sqlite3", "3rdparty/sqlite3" }, + portmidi = { "portmidi", "3rdparty/portmidi/pm_common" }, + portaudio = { "portaudio", "3rdparty/portaudio/include" }, + lua = { "lua", "3rdparty/lua/src" }, + uv = { "uv" , "3rdparty/libuv/include" }, +} + +-- system lib options +newoption { + trigger = 'with-system-expat', + description = 'Use system Expat library', +} + +newoption { + trigger = 'with-system-zlib', + description = 'Use system Zlib library', +} + +newoption { + trigger = 'with-system-jpeg', + description = 'Use system JPEG library', +} + +newoption { + trigger = 'with-system-flac', + description = 'Use system FLAC library', +} + +newoption { + trigger = 'with-system-sqlite3', + description = 'Use system SQLite library', +} + +newoption { + trigger = 'with-system-portmidi', + description = 'Use system PortMidi library', +} + +newoption { + trigger = 'with-system-portaudio', + description = 'Use system PortAudio library', +} + +newoption { + trigger = "with-system-lua", + 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] + if (opt~=nil and opt=="1") then + default = extlibs[lib][1] + else + default = lib + end + return ext_best(lib, default, 1) +end + +function ext_includedir(lib) + local opt = _OPTIONS["with-system-" .. lib] + if (opt==nil or opt=="0") then + -- using bundled, prepend MAME_DIR + default = MAME_DIR .. extlibs[lib][2] + else + default = "" + end + return ext_best(lib, default, 2) +end + +function ext_best(lib, default, idx) + local opt = _OPTIONS["with-system-" .. lib] + local found = default + if (opt~=nil and opt~="0" and opt~="1") then + -- override default if provided (format <libname:includedir>) + local x = opt:explode(":") + if x[idx]~=nil then + local y = x[idx]:explode(",") + if y[1]~=nil then + found = y + else + found = x[idx] + end + end + end + return found +end diff --git a/docs/release/scripts/font/LICENSE b/docs/release/scripts/font/LICENSE new file mode 100644 index 00000000000..d952d62c065 --- /dev/null +++ b/docs/release/scripts/font/LICENSE @@ -0,0 +1,92 @@ +This Font Software is licensed under the SIL Open Font License, +Version 1.1. + +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font +creation efforts of academic and linguistic communities, and to +provide a free and open framework in which fonts may be shared and +improved in partnership with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply to +any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software +components as distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, +deleting, or substituting -- in part or in whole -- any of the +components of the Original Version, by changing formats or by porting +the Font Software to a new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, +modify, redistribute, and sell modified and unmodified copies of the +Font Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, in +Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the +corresponding Copyright Holder. This restriction only applies to the +primary font name as presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created using +the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/docs/release/scripts/font/NotoSans-Bold.bdc b/docs/release/scripts/font/NotoSans-Bold.bdc Binary files differnew file mode 100644 index 00000000000..8c13907b86a --- /dev/null +++ b/docs/release/scripts/font/NotoSans-Bold.bdc diff --git a/docs/release/scripts/font/NotoSans-Bold.ttf b/docs/release/scripts/font/NotoSans-Bold.ttf Binary files differnew file mode 100644 index 00000000000..21dddde9d3b --- /dev/null +++ b/docs/release/scripts/font/NotoSans-Bold.ttf diff --git a/docs/release/scripts/font/README.md b/docs/release/scripts/font/README.md new file mode 100644 index 00000000000..76046e8fcab --- /dev/null +++ b/docs/release/scripts/font/README.md @@ -0,0 +1,52 @@ + + +# Noto fonts + +Noto's goal is to provide a beautiful reading experience for everyone and for all languages. With visual harmony when multiple languages share a page. With multiple styles and weights. **_Freely available to all._** + +Currently, Noto covers all major languages of the world and many others, including European, African, Middle Eastern, Indic, South and Southeast Asian, Central Asian, American, and East Asian languages. Several minority and historical languages are also supported. + +Support for Simplified Chinese, Traditional Chinese, Japanese, and Korean was first added in July 2014. + +You can preview and download the Noto fonts at http://www.google.com/get/noto + +Noto fonts are open source. All fonts are published under the [SIL Open Font License, Version 1.1](http://scripts.sil.org/OFL). (Prior to September 29, 2015, Noto fonts other than CJK were published under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0.html).) + +Use unhinted fonts for Android and Mac (Android and Mac ignore hinting information embedded in fonts). Use hinted fonts for other platforms. + +## Development + +All Noto fonts are included in this repository, except: + + * Noto CJK fonts are in [noto-cjk](https://github.com/googlei18n/noto-cjk), + * Noto Emoji and Noto Color Emoji are in [noto-emoji](https://github.com/googlei18n/noto-emoji). + +Tools used for testing fonts are in [nototools](https://github.com/googlei18n/nototools). + +Some source files are available in [noto-source](https://github.com/googlei18n/noto-source). + +Development and user discussions happen on the [noto-font Google Group](https://groups.google.com/d/forum/noto-font). + +## News + +* [2015-09-29](NEWS): All Noto fonts now licensed under SIL Open Font License v1.1. + +* 2015-06-08: The Noto project moved from Google Code to Github. + +* 2015-04-20: Noto Sans CJK Version 1.002 released. + +* 2015-03-30: Noto Sans Oriya and and a new design for Armenian fonts released. + +* 2014-10-23: Experimental version of Noto Nastaliq Urdu released. + +## Special Note on Droid Fonts + +The Droid fonts are superseded by Noto. Noto began as Droid, and since renaming all updates are made to the Noto fonts. +Today Noto gives better support to all languages covered by Droid fonts, with more characters and fewer bugs, and covers many more languages. +Both Android and ChromeOS have switched to Noto, and we strongly recommend everyone to replace Droid with Noto. + +Similarly, the Droid Sans Fallback font is superseded by Noto Sans CJK, available from [noto-cjk](https://github.com/googlei18n/noto-cjk). + +Have fun! + +Google Internationalization Team diff --git a/docs/release/scripts/genie.lua b/docs/release/scripts/genie.lua index 4f580dc8afa..3281ca7813b 100644 --- a/docs/release/scripts/genie.lua +++ b/docs/release/scripts/genie.lua @@ -2,17 +2,28 @@ -- copyright-holders:MAMEdev Team newoption { - trigger = 'build-dir', - description = 'Build directory name', + trigger = 'build-dir', + description = 'Build directory name', } premake.check_paths = true premake.make.override = { "TARGET" } + +premake.xcode.parameters = { 'CLANG_CXX_LANGUAGE_STANDARD = "c++14"', 'CLANG_CXX_LIBRARY = "libc++"' } + MAME_DIR = (path.getabsolute("..") .. "/") --MAME_DIR = string.gsub(MAME_DIR, "(%s)", "\\%1") local MAME_BUILD_DIR = (MAME_DIR .. _OPTIONS["build-dir"] .. "/") local naclToolchain = "" +newoption { + trigger = "precompile", + description = "Precompiled headers generation.", + allowed = { + { "0", "Disabled" }, + { "1", "Enabled" }, + } +} function backtick(cmd) result = string.gsub(string.gsub(os.outputof(cmd), "\r?\n$", ""), " $", "") @@ -29,34 +40,36 @@ function str_to_version(str) val = val + tonumber(word) * cnt cnt = cnt / 100 end - return val + return val end function findfunction(x) - assert(type(x) == "string") - local f=_G - for v in x:gmatch("[^%.]+") do - if type(f) ~= "table" then - return nil, "looking for '"..v.."' expected table, not "..type(f) - end - f=f[v] - end - if type(f) == "function" then - return f - else - return nil, "expected function, not "..type(f) - end + assert(type(x) == "string") + local f=_G + for v in x:gmatch("[^%.]+") do + if type(f) ~= "table" then + return nil, "looking for '"..v.."' expected table, not "..type(f) + end + f=f[v] + end + if type(f) == "function" then + return f + else + return nil, "expected function, not "..type(f) + end end function layoutbuildtask(_folder, _name) return { MAME_DIR .. "src/".._folder.."/".. _name ..".lay" , GEN_DIR .. _folder .. "/".._name..".lh", - { MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting src/".._folder.."/".._name..".lay...", PYTHON .. " $(1) $(<) $(@) layout_".._name }}; + { MAME_DIR .. "scripts/build/complay.py" }, {"@echo Compressing src/".._folder.."/".._name..".lay...", PYTHON .. " $(1) $(<) $(@) layout_".._name }}; end function precompiledheaders() - configuration { "not xcode4" } - pchheader("emu.h") - configuration { } + if _OPTIONS["precompile"]==nil or (_OPTIONS["precompile"]~=nil and _OPTIONS["precompile"]=="1") then + configuration { "not xcode4" } + pchheader("emu.h") + configuration { } + end end function addprojectflags() @@ -98,72 +111,34 @@ newoption { trigger = "targetos", description = "Choose target OS", allowed = { - { "android-arm", "Android - ARM" }, - { "android-mips", "Android - MIPS" }, - { "android-x86", "Android - x86" }, + { "android", "Android" }, { "asmjs", "Emscripten/asm.js" }, { "freebsd", "FreeBSD" }, { "netbsd", "NetBSD" }, { "openbsd", "OpenBSD" }, - { "nacl", "Native Client" }, - { "nacl-arm", "Native Client - ARM" }, { "pnacl", "Native Client - PNaCl" }, - { "linux", "Linux" }, + { "linux", "Linux" }, { "ios", "iOS" }, { "macosx", "OSX" }, { "windows", "Windows" }, - { "os2", "OS/2 eComStation" }, { "haiku", "Haiku" }, { "solaris", "Solaris SunOS" }, { "steamlink", "Steam Link" }, + { "rpi", "Raspberry Pi" }, + { "ci20", "Creator-Ci20" }, }, } newoption { - trigger = 'with-bundled-expat', - description = 'Build bundled Expat library', -} - -newoption { - trigger = 'with-bundled-zlib', - description = 'Build bundled Zlib library', -} - -newoption { - trigger = 'with-bundled-jpeg', - description = 'Build bundled JPEG library', -} - -newoption { - trigger = 'with-bundled-flac', - description = 'Build bundled FLAC library', -} - -newoption { - trigger = 'with-bundled-lua', - description = 'Build bundled LUA library', -} - -newoption { - trigger = 'with-bundled-sqlite3', - description = 'Build bundled SQLite library', -} - -newoption { - trigger = 'with-bundled-portmidi', - description = 'Build bundled PortMidi library', -} - -newoption { - trigger = 'with-bundled-portaudio', - description = 'Build bundled PortAudio library', + trigger = 'with-bundled-sdl2', + description = 'Build bundled SDL2 library', } newoption { trigger = "distro", description = "Choose distribution", allowed = { - { "generic", "generic" }, + { "generic", "generic" }, { "debian-stable", "debian-stable" }, { "ubuntu-intrepid", "ubuntu-intrepid" }, }, @@ -281,7 +256,7 @@ newoption { trigger = "DEPRECATED", description = "Generate deprecation warnings during compilation.", allowed = { - { "0", "Disabled" }, + { "0", "Disabled" }, { "1", "Enabled" }, } } @@ -290,7 +265,7 @@ newoption { trigger = "LTO", description = "Clang link time optimization.", allowed = { - { "0", "Disabled" }, + { "0", "Disabled" }, { "1", "Enabled" }, } } @@ -299,7 +274,7 @@ newoption { trigger = "SSE2", description = "SSE2 optimized code and SSE2 code generation.", allowed = { - { "0", "Disabled" }, + { "0", "Disabled" }, { "1", "Enabled" }, } } @@ -308,7 +283,7 @@ newoption { trigger = "SSE3", description = "SSE3 optimized code and SSE3 code generation.", allowed = { - { "0", "Disabled" }, + { "0", "Disabled" }, { "1", "Enabled" }, } } @@ -317,7 +292,7 @@ newoption { trigger = "OPENMP", description = "OpenMP optimized code.", allowed = { - { "0", "Disabled" }, + { "0", "Disabled" }, { "1", "Enabled" }, } } @@ -326,7 +301,7 @@ newoption { trigger = "FASTDEBUG", description = "Fast DEBUG.", allowed = { - { "0", "Disabled" }, + { "0", "Disabled" }, { "1", "Enabled" }, } } @@ -335,7 +310,7 @@ newoption { trigger = "SEPARATE_BIN", description = "Use separate bin folders.", allowed = { - { "0", "Disabled" }, + { "0", "Disabled" }, { "1", "Enabled" }, } } @@ -349,7 +324,7 @@ newoption { trigger = "SHADOW_CHECK", description = "Shadow checks.", allowed = { - { "0", "Disabled" }, + { "0", "Disabled" }, { "1", "Enabled" }, } } @@ -358,7 +333,7 @@ newoption { trigger = "STRIP_SYMBOLS", description = "Symbols stripping.", allowed = { - { "0", "Disabled" }, + { "0", "Disabled" }, { "1", "Enabled" }, } } @@ -368,30 +343,51 @@ newoption { trigger = "SHLIB", description = "Generate shared libs.", allowed = { - { "0", "Static libs" }, + { "0", "Static libs" }, { "1", "Shared libs" }, } } newoption { + trigger = "IGNORE_GIT", + description = "Ignore usage of git command in build process", + allowed = { + { "0", "Do not ignore" }, + { "1", "Ingore" }, + }, +} + +newoption { trigger = "SOURCES", description = "List of sources to compile.", } newoption { - trigger = "FORCE_VERSION_COMPILE", - description = "Force compiling of version.c file.", + trigger = "PLATFORM", + description = "Target machine platform (x86,arm,...)", +} + +newoption { + trigger = "USE_LIBUV", + description = "Use libuv.", allowed = { - { "0", "Disabled" }, + { "0", "Disabled" }, { "1", "Enabled" }, } } newoption { - trigger = "PLATFORM", - description = "Target machine platform (x86,arm,...)", + trigger = "DEBUG_DIR", + description = "Default directory for debugger.", } +newoption { + trigger = "DEBUG_ARGS", + description = "Arguments for running debug build.", +} + +dofile ("extlib.lua") + if _OPTIONS["SHLIB"]=="1" then LIBTYPE = "SharedLib" else @@ -416,6 +412,10 @@ if not _OPTIONS["NOASM"] then end end +if not _OPTIONS["USE_LIBUV"] then + _OPTIONS["USE_LIBUV"] = "1" +end + if _OPTIONS["NOASM"]=="1" and not _OPTIONS["FORCE_DRC_C_BACKEND"] then _OPTIONS["FORCE_DRC_C_BACKEND"] = "1" end @@ -439,21 +439,22 @@ else end end + configurations { "Debug", "Release", } if _ACTION == "xcode4" then - platforms { - "x64", - } + platforms { + "x64", + } else - platforms { - "x32", - "x64", - "Native", -- for targets where bitness is not specified - } + platforms { + "x32", + "x64", + "Native", -- for targets where bitness is not specified + } end language "C++" @@ -467,7 +468,6 @@ configuration { "vs*" } "NoPCH", "ExtraWarnings", "NoEditAndContinue", - "EnableMinimalRebuild", } if not _OPTIONS["NOWERROR"] then flags{ @@ -486,6 +486,17 @@ configuration { "Release", "vs*" } "Optimize", } +-- Force VS2013/15 targets to use bundled SDL2 +if string.sub(_ACTION,1,4) == "vs20" and _OPTIONS["osd"]=="sdl" then + if _OPTIONS["with-bundled-sdl2"]==nil then + _OPTIONS["with-bundled-sdl2"] = "1" + end +end +-- Build SDL2 for Android +if _OPTIONS["targetos"] == "android" then + _OPTIONS["with-bundled-sdl2"] = "1" +end + configuration {} msgcompile ("Compiling $(subst ../,,$<)...") @@ -516,6 +527,11 @@ configuration { "gmake" } dofile ("toolchain.lua") +if _OPTIONS["USE_LIBUV"]=="0" then + defines { + "NO_LIBUV", + } +end if _OPTIONS["targetos"]=="windows" then configuration { "x64" } @@ -529,7 +545,7 @@ end if (_ACTION == nil) then return false end -- define PTR64 if we are a 64-bit target -configuration { "x64" } +configuration { "x64 or android-*64"} defines { "PTR64=1" } -- define MAME_DEBUG if we are a debugging build @@ -537,7 +553,9 @@ configuration { "Debug" } defines { "MAME_DEBUG", "MAME_PROFILER", + "BGFX_CONFIG_DEBUG=1", } + if _OPTIONS["FASTDEBUG"]=="1" then defines { "MAME_DEBUG_FAST" @@ -559,8 +577,8 @@ configuration { "Release" } configuration { } --- CR/LF setup: use both on win32/os2, CR only on everything else -if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="os2" then +-- CR/LF setup: use on win32, CR only on everything else +if _OPTIONS["targetos"]=="windows" then defines { "CRLF=3", } @@ -624,30 +642,17 @@ else end end --- need to ensure FLAC functions are statically linked -if _OPTIONS["with-bundled-flac"] then - defines { - "FLAC__NO_DLL", - } - end - -if not _OPTIONS["with-bundled-jpeg"] then - defines { - "USE_SYSTEM_JPEGLIB", - } - end - -if not _OPTIONS["with-bundled-portmidi"] then +if _OPTIONS["with-system-jpeg"]~=nil then defines { - "USE_SYSTEM_PORTMIDI", + "XMD_H", } - end +end -if not _OPTIONS["with-bundled-sqlite3"] then +if not _OPTIONS["with-system-flac"]~=nil then defines { - "USE_SYSTEM_SQLITE", + "FLAC__NO_DLL", } - end +end if _OPTIONS["NOASM"]=="1" then defines { @@ -669,11 +674,6 @@ if not _OPTIONS["FORCE_DRC_C_BACKEND"] then end end --- define USE_SYSTEM_JPEGLIB if library shipped with MAME is not used ---ifneq ($(BUILD_JPEGLIB),1) ---DEFS += -DUSE_SYSTEM_JPEGLIB ---endif - defines { "LUA_COMPAT_ALL", "LUA_COMPAT_5_1", @@ -700,17 +700,10 @@ if string.find(_OPTIONS["gcc"], "clang") and ((version < 30500) or (_OPTIONS["ta "-std=c++1y", } else - if _OPTIONS["targetos"]=="os2" then - buildoptions_cpp { - "-x c++", - "-std=gnu++14", - } - else - buildoptions_cpp { - "-x c++", - "-std=c++14", - } - end + buildoptions_cpp { + "-x c++", + "-std=c++14", + } buildoptions_objc { "-x objective-c++", @@ -775,13 +768,7 @@ if _OPTIONS["SYMBOLS"]~=nil and _OPTIONS["SYMBOLS"]~="0" then } end ---# add the optimization flag - buildoptions { - "-O".. _OPTIONS["OPTIMIZE"], - "-fno-strict-aliasing" - } - - -- add the error warning flag +-- add the error warning flag if _OPTIONS["NOWERROR"]==nil then buildoptions { "-Werror", @@ -791,16 +778,9 @@ end -- if we are optimizing, include optimization options if _OPTIONS["OPTIMIZE"] then buildoptions { + "-O".. _OPTIONS["OPTIMIZE"], "-fno-strict-aliasing" } - if _OPTIONS["ARCHOPTS"] then - buildoptions { - _OPTIONS["ARCHOPTS"] - } - linkoptions { - _OPTIONS["ARCHOPTS"] - } - end if _OPTIONS["OPT_FLAGS"] then buildoptions { _OPTIONS["OPT_FLAGS"] @@ -811,7 +791,7 @@ if _OPTIONS["OPTIMIZE"] then -- windows native mingw GCC 5.2 fails with -flto=x with x > 1. bug unfixed as of this commit "-flto=1", -- if ld fails, just buy more RAM or uncomment this! --- "-Wl,-no-keep-memory", +-- "-Wl,-no-keep-memory", "-Wl,-v", -- silence redefine warnings from discrete.c. "-Wl,-allow-multiple-definition", @@ -823,17 +803,17 @@ if _OPTIONS["OPTIMIZE"] then "-flto-odr-type-merging", "-Wodr", "-flto-compression-level=0", -- lto doesn't work with anything <9 on linux with < 12G RAM, much slower if <> 0 --- "-flto-report", -- if you get an error in lto after [WPA] stage, but before [LTRANS] stage, you need more memory! --- "-fmem-report-wpa","-fmem-report","-fpre-ipa-mem-report","-fpost-ipa-mem-report","-flto-report-wpa","-fmem-report", +-- "-flto-report", -- if you get an error in lto after [WPA] stage, but before [LTRANS] stage, you need more memory! +-- "-fmem-report-wpa","-fmem-report","-fpre-ipa-mem-report","-fpost-ipa-mem-report","-flto-report-wpa","-fmem-report", -- this six flag combo lets MAME compile with LTO=1 on linux with no errors and ~2% speed boost, but compile time is much longer -- if you are going to wait on lto, you might as well enable these for GCC --- "-fdevirtualize-at-ltrans","-fgcse-sm","-fgcse-las", --- "-fipa-pta","-fipa-icf","-fvariable-expansion-in-unroller", +-- "-fdevirtualize-at-ltrans","-fgcse-sm","-fgcse-las", +-- "-fipa-pta","-fipa-icf","-fvariable-expansion-in-unroller", } -- same flags are needed by linker linkoptions { "-flto=1", --- "-Wl,-no-keep-memory", +-- "-Wl,-no-keep-memory", "-Wl,-v", "-Wl,-allow-multiple-definition", "-fuse-linker-plugin", @@ -841,18 +821,33 @@ if _OPTIONS["OPTIMIZE"] then "-flto-odr-type-merging", "-Wodr", "-flto-compression-level=0", -- lto doesn't work with anything <9 on linux with < 12G RAM, much slower if <> 0 --- "-flto-report", -- if you get an error in lto after [WPA] stage, but before [LTRANS] stage, you need more memory! --- "-fmem-report-wpa","-fmem-report","-fpre-ipa-mem-report","-fpost-ipa-mem-report","-flto-report-wpa","-fmem-report", +-- "-flto-report", -- if you get an error in lto after [WPA] stage, but before [LTRANS] stage, you need more memory! +-- "-fmem-report-wpa","-fmem-report","-fpre-ipa-mem-report","-fpost-ipa-mem-report","-flto-report-wpa","-fmem-report", -- this six flag combo lets MAME compile with LTO=1 on linux with no errors and ~2% speed boost, but compile time is much longer -- if you are going to wait on lto, you might as well enable these for GCC --- "-fdevirtualize-at-ltrans","-fgcse-sm","-fgcse-las", --- "-fipa-pta","-fipa-icf","-fvariable-expansion-in-unroller", +-- "-fdevirtualize-at-ltrans","-fgcse-sm","-fgcse-las", +-- "-fipa-pta","-fipa-icf","-fvariable-expansion-in-unroller", } end end +configuration { "mingw-clang" } + buildoptions { + "-O1", -- without this executable crash often + } +configuration { } + +if _OPTIONS["ARCHOPTS"] then + buildoptions { + _OPTIONS["ARCHOPTS"] + } + linkoptions { + _OPTIONS["ARCHOPTS"] + } +end + if _OPTIONS["SHLIB"] then buildoptions { "-fPIC" @@ -955,7 +950,7 @@ end local version = str_to_version(_OPTIONS["gcc_version"]) - if string.find(_OPTIONS["gcc"], "clang") then + if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "pnacl") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android") then if (version < 30400) then print("Clang version 3.4 or later needed") os.exit(-1) @@ -968,6 +963,7 @@ end "-Wno-inline-new-delete", "-Wno-constant-logical-operand", "-Wno-deprecated-register", + "-fdiagnostics-show-note-include-stack", } if (version >= 30500) then buildoptions { @@ -993,13 +989,22 @@ end } end end - + if (_OPTIONS["PLATFORM"]=="arm") then buildoptions { "-Wno-cast-align", } end +if (_OPTIONS["PLATFORM"]=="arm64") then + buildoptions { + "-Wno-cast-align", + } + defines { + "PTR64=1", + } +end + local subdir if (_OPTIONS["target"] == _OPTIONS["subtarget"]) then subdir = _OPTIONS["osd"] .. "/" .. _OPTIONS["target"] @@ -1015,6 +1020,7 @@ configuration { "asmjs" } buildoptions { "-std=gnu89", "-Wno-implicit-function-declaration", + "-s USE_SDL_TTF=2", } buildoptions_cpp { "-x c++", @@ -1025,13 +1031,23 @@ configuration { "asmjs" } configuration { "android*" } buildoptions { "-Wno-undef", + "-Wno-typedef-redefinition", + "-Wno-unknown-warning-option", } buildoptions_cpp { "-x c++", "-std=c++14", + "-Wno-extern-c-compat", + "-Wno-tautological-constant-out-of-range-compare", + "-Wno-tautological-pointer-compare", } archivesplit_size "20" +configuration { "android-arm64" } + buildoptions { + "-Wno-asm-operand-widths", + } + configuration { "pnacl" } buildoptions { "-std=gnu89", @@ -1043,14 +1059,7 @@ configuration { "pnacl" } } archivesplit_size "20" -configuration { "nacl*" } - buildoptions_cpp { - "-x c++", - "-std=c++14", - } - archivesplit_size "20" - -configuration { "linux-*" } +configuration { "linux-* or rpi or ci20"} links { "dl", "rt", @@ -1067,14 +1076,38 @@ configuration { "linux-*" } configuration { "steamlink" } links { "dl", - "EGL", + "EGL", "GLESv2", - "SDL2", - } + "SDL2", + } defines { "EGL_API_FB", } +configuration { "rpi" } + links { + "SDL2", + "fontconfig", + "X11", + "GLESv2", + "EGL", + "bcm_host", + "vcos", + "vchiq_arm", + "pthread", + } + + +configuration { "ci20" } + links { + "SDL2", + "asound", + "fontconfig", + "freetype", + "pthread", + } + + configuration { "osx* or xcode4" } links { "pthread", @@ -1102,7 +1135,7 @@ configuration { "mingw-clang" } linkoptions { "-pthread", } - + configuration { "vs*" } defines { @@ -1126,7 +1159,7 @@ configuration { "vs*" } } buildoptions { - "/WX", -- Treats all compiler warnings as errors. + "/WX", -- Treats all compiler warnings as errors. "/wd4025", -- warning C4025: 'number' : based pointer passed to function with variable arguments: parameter number "/wd4003", -- warning C4003: not enough actual parameters for macro 'xxx' "/wd4018", -- warning C4018: 'x' : signed/unsigned mismatch @@ -1190,38 +1223,38 @@ configuration { "vs*" } } if _OPTIONS["vs"]=="intel-15" then buildoptions { - "/Qwd9", -- remark #9: nested comment is not allowed - "/Qwd82", -- remark #82: storage class is not first - "/Qwd111", -- remark #111: statement is unreachable - "/Qwd128", -- remark #128: loop is not reachable - "/Qwd177", -- remark #177: function "xxx" was declared but never referenced - "/Qwd181", -- remark #181: argument of type "UINT32={unsigned int}" is incompatible with format "%d", expecting argument of type "int" - "/Qwd185", -- remark #185: dynamic initialization in unreachable code - "/Qwd280", -- remark #280: selector expression is constant - "/Qwd344", -- remark #344: typedef name has already been declared (with same type) - "/Qwd411", -- remark #411: class "xxx" defines no constructor to initialize the following - "/Qwd869", -- remark #869: parameter "xxx" was never referenced - "/Qwd2545", -- remark #2545: empty dependent statement in "else" clause of if - statement - "/Qwd2553", -- remark #2553: nonstandard second parameter "TCHAR={WCHAR = { __wchar_t } } **" of "main", expected "char *[]" or "char **" extern "C" int _tmain(int argc, TCHAR **argv) - "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands - "/Qwd3280", -- remark #3280: declaration hides member "attotime::seconds" (declared at line 126) static attotime from_seconds(INT32 seconds) { return attotime(seconds, 0); } - - "/Qwd170", -- error #170: pointer points outside of underlying object - "/Qwd188", -- error #188: enumerated type mixed with another type - - "/Qwd63", -- warning #63: shift count is too large - "/Qwd177", -- warning #177: label "xxx" was declared but never referenced - "/Qwd186", -- warning #186: pointless comparison of unsigned integer with zero - "/Qwd488", -- warning #488: template parameter "_FunctionClass" is not used in declaring the parameter types of function template "device_delegate<_Signature>::device_delegate<_FunctionClass>(delegate<_Signature>: - "/Qwd1478", -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated - "/Qwd1879", -- warning #1879: unimplemented pragma ignored - "/Qwd3291", -- warning #3291: invalid narrowing conversion from "double" to "int" - "/Qwd1195", -- error #1195: conversion from integer to smaller pointer - "/Qwd47", -- error #47: incompatible redefinition of macro "xxx" - "/Qwd265", -- error #265: floating-point operation result is out of range + "/Qwd9", -- remark #9: nested comment is not allowed + "/Qwd82", -- remark #82: storage class is not first + "/Qwd111", -- remark #111: statement is unreachable + "/Qwd128", -- remark #128: loop is not reachable + "/Qwd177", -- remark #177: function "xxx" was declared but never referenced + "/Qwd181", -- remark #181: argument of type "UINT32={unsigned int}" is incompatible with format "%d", expecting argument of type "int" + "/Qwd185", -- remark #185: dynamic initialization in unreachable code + "/Qwd280", -- remark #280: selector expression is constant + "/Qwd344", -- remark #344: typedef name has already been declared (with same type) + "/Qwd411", -- remark #411: class "xxx" defines no constructor to initialize the following + "/Qwd869", -- remark #869: parameter "xxx" was never referenced + "/Qwd2545", -- remark #2545: empty dependent statement in "else" clause of if - statement + "/Qwd2553", -- remark #2553: nonstandard second parameter "TCHAR={WCHAR = { __wchar_t } } **" of "main", expected "char *[]" or "char **" extern "C" int _tmain(int argc, TCHAR **argv) + "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands + "/Qwd3280", -- remark #3280: declaration hides member "attotime::seconds" (declared at line 126) static attotime from_seconds(INT32 seconds) { return attotime(seconds, 0); } + + "/Qwd170", -- error #170: pointer points outside of underlying object + "/Qwd188", -- error #188: enumerated type mixed with another type + + "/Qwd63", -- warning #63: shift count is too large + "/Qwd177", -- warning #177: label "xxx" was declared but never referenced + "/Qwd186", -- warning #186: pointless comparison of unsigned integer with zero + "/Qwd488", -- warning #488: template parameter "_FunctionClass" is not used in declaring the parameter types of function template "device_delegate<_Signature>::device_delegate<_FunctionClass>(delegate<_Signature>: + "/Qwd1478", -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated + "/Qwd1879", -- warning #1879: unimplemented pragma ignored + "/Qwd3291", -- warning #3291: invalid narrowing conversion from "double" to "int" + "/Qwd1195", -- error #1195: conversion from integer to smaller pointer + "/Qwd47", -- error #47: incompatible redefinition of macro "xxx" + "/Qwd265", -- error #265: floating-point operation result is out of range -- these occur on a release build, while we can increase the size limits instead some of the files do require extreme amounts - "/Qwd11074", -- remark #11074: Inlining inhibited by limit max-size / remark #11074: Inlining inhibited by limit max-total-size - "/Qwd11075", -- remark #11075: To get full report use -Qopt-report:4 -Qopt-report-phase ipo + "/Qwd11074", -- remark #11074: Inlining inhibited by limit max-size / remark #11074: Inlining inhibited by limit max-total-size + "/Qwd11075", -- remark #11075: To get full report use -Qopt-report:4 -Qopt-report-phase ipo } end @@ -1233,6 +1266,7 @@ end } configuration { "vs2015" } buildoptions { + "/wd4334", -- warning C4334: '<<': result of 32-bit shift implicitly converted to 64 bits (was 64-bit shift intended?) "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration "/wd4457", -- warning C4457: declaration of 'xxx' hides function parameter "/wd4458", -- warning C4458: declaration of 'xxx' hides class member @@ -1264,7 +1298,7 @@ configuration { } if (_OPTIONS["SOURCES"] ~= nil) then OUT_STR = os.outputof( PYTHON .. " " .. MAME_DIR .. "scripts/build/makedep.py " .. MAME_DIR .. " " .. _OPTIONS["SOURCES"] .. " target " .. _OPTIONS["subtarget"]) load(OUT_STR)() - os.outputof( PYTHON .. " " .. MAME_DIR .. "scripts/build/makedep.py " .. MAME_DIR .. " " .. _OPTIONS["SOURCES"] .. " drivers " .. _OPTIONS["subtarget"] .. " > ".. GEN_DIR .. _OPTIONS["target"] .. "/" .. _OPTIONS["subtarget"].."/drivlist.cpp") + os.outputof( PYTHON .. " " .. MAME_DIR .. "scripts/build/makedep.py " .. MAME_DIR .. " " .. _OPTIONS["SOURCES"] .. " drivers " .. _OPTIONS["subtarget"] .. " > ".. GEN_DIR .. _OPTIONS["target"] .. "/" .. _OPTIONS["subtarget"]..".flt") end group "libs" @@ -1283,6 +1317,8 @@ group "core" dofile(path.join("src", "emu.lua")) +dofile(path.join("src", "mame", "frontend.lua")) + group "devices" dofile(path.join("src", "devices.lua")) devicesProject(_OPTIONS["target"],_OPTIONS["subtarget"]) @@ -1292,7 +1328,7 @@ findfunction("createProjects_" .. _OPTIONS["target"] .. "_" .. _OPTIONS["subtarg group "emulator" dofile(path.join("src", "main.lua")) -if (_OPTIONS["SOURCES"] == nil) then +if (_OPTIONS["SOURCES"] == nil) then if (_OPTIONS["target"] == _OPTIONS["subtarget"]) then startproject (_OPTIONS["target"]) else @@ -1304,7 +1340,7 @@ if (_OPTIONS["SOURCES"] == nil) then end else startproject (_OPTIONS["subtarget"]) -end +end mainProject(_OPTIONS["target"],_OPTIONS["subtarget"]) strip() diff --git a/docs/release/scripts/resources/emscripten/emscripten_post.js b/docs/release/scripts/resources/emscripten/emscripten_post.js new file mode 100644 index 00000000000..aa7dac53894 --- /dev/null +++ b/docs/release/scripts/resources/emscripten/emscripten_post.js @@ -0,0 +1,10 @@ +// MAME-JavaScript function mappings +var JSMAME = JSMAME || {}; +JSMAME.get_machine = Module.cwrap('_Z14js_get_machinev', 'number'); +JSMAME.get_ui = Module.cwrap('_Z9js_get_uiv', 'number'); +JSMAME.get_sound = Module.cwrap('_Z12js_get_soundv', 'number'); +JSMAME.ui_set_show_fps = Module.cwrap('_ZN15mame_ui_manager12set_show_fpsEb', '', ['number', 'number']); +JSMAME.ui_get_show_fps = Module.cwrap('_ZNK15mame_ui_manager8show_fpsEv', 'number', ['number']); +JSMAME.sound_manager_mute = Module.cwrap('_ZN13sound_manager4muteEbh', '', ['number', 'number', 'number']); +JSMAME.sdl_pauseaudio = Module.cwrap('SDL_PauseAudio', '', ['number']); +var JSMESS = JSMAME; diff --git a/docs/release/scripts/resources/windows/mame/mame.ico b/docs/release/scripts/resources/windows/mame/mame.ico Binary files differnew file mode 100644 index 00000000000..62761447fc2 --- /dev/null +++ b/docs/release/scripts/resources/windows/mame/mame.ico diff --git a/docs/release/scripts/resources/windows/mame/mame.man b/docs/release/scripts/resources/windows/mame/mame.man new file mode 100644 index 00000000000..e08eba181cb --- /dev/null +++ b/docs/release/scripts/resources/windows/mame/mame.man @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> + <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"> + <assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="MAME" type="win32" /> + <description>Multiple Arcade Machine Emulator</description> + <dependency> + <dependentAssembly> + <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" publicKeyToken="6595b64144ccf1df" language="*" processorArchitecture="*"/> + </dependentAssembly> + </dependency> + <asmv3:application> + <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings"> + <dpiAware>true</dpiAware> + </asmv3:windowsSettings> + </asmv3:application> +</assembly> diff --git a/docs/release/scripts/resources/windows/mame/mame.rc b/docs/release/scripts/resources/windows/mame/mame.rc new file mode 100644 index 00000000000..deceb068193 --- /dev/null +++ b/docs/release/scripts/resources/windows/mame/mame.rc @@ -0,0 +1,14 @@ +// license:BSD-3-Clause +// copyright-holders:Aaron Giles +//============================================================ +// +// mame.rc - Minimal resource file for Win32 MAME +// +//============================================================ + +#include <windows.h> +//#include "mamevers.rc" + +1 24 MOVEABLE PURE "mame.man" + +2 ICON DISCARDABLE "mame.ico" diff --git a/docs/release/scripts/resources/windows/mess/mess.ico b/docs/release/scripts/resources/windows/mess/mess.ico Binary files differnew file mode 100644 index 00000000000..bab67dd6195 --- /dev/null +++ b/docs/release/scripts/resources/windows/mess/mess.ico diff --git a/docs/release/scripts/resources/windows/mess/mess.man b/docs/release/scripts/resources/windows/mess/mess.man new file mode 100644 index 00000000000..67ba3aced37 --- /dev/null +++ b/docs/release/scripts/resources/windows/mess/mess.man @@ -0,0 +1,15 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> + <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0" xmlns:asmv3="urn:schemas-microsoft-com:asm.v3"> + <assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="MESS" type="win32" /> + <description>Multi Emulator Super System</description> + <dependency> + <dependentAssembly> + <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" publicKeyToken="6595b64144ccf1df" language="*" processorArchitecture="*"/> + </dependentAssembly> + </dependency> + <asmv3:application> + <asmv3:windowsSettings xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings"> + <dpiAware>true</dpiAware> + </asmv3:windowsSettings> + </asmv3:application> +</assembly> diff --git a/docs/release/scripts/resources/windows/mess/mess.rc b/docs/release/scripts/resources/windows/mess/mess.rc new file mode 100644 index 00000000000..1329bcd6fb8 --- /dev/null +++ b/docs/release/scripts/resources/windows/mess/mess.rc @@ -0,0 +1,14 @@ +// license:BSD-3-Clause +// copyright-holders:Aaron Giles +//============================================================ +// +// mess.rc - Minimal resource file for Win32 MAME +// +//============================================================ + +#include <windows.h> +#include "messvers.rc" + +1 24 MOVEABLE PURE "mess.man" + +2 ICON DISCARDABLE "mess.ico" diff --git a/docs/release/scripts/src/3rdparty.lua b/docs/release/scripts/src/3rdparty.lua index 2cbb33e393e..26d5c687cd0 100644 --- a/docs/release/scripts/src/3rdparty.lua +++ b/docs/release/scripts/src/3rdparty.lua @@ -13,11 +13,39 @@ -- expat library objects -------------------------------------------------- -if _OPTIONS["with-bundled-expat"] then +if not _OPTIONS["with-system-expat"] then project "expat" uuid "f4cd40b1-c37c-452d-9785-640f26f0bf54" kind "StaticLib" + -- fake out the enough of expat_config.h to get by + defines { + "HAVE_MEMMOVE", + "HAVE_STDINT_H", + "HAVE_STDLIB_H", + "HAVE_STRING_H", + "PACKAGE_BUGREPORT=\"expat-bugs@libexpat.org\"", + "PACKAGE_NAME=\"expat\"", + "PACKAGE_STRING=\"expat 2.1.1\"", + "PACKAGE_TARNAME=\"expat\"", + "PACKAGE_URL=\"\"", + "PACKAGE_VERSION=\"2.1.1\"", + "STDC_HEADERS", + "XML_CONTEXT_BYTES=1024", + "XML_DTD", + "XML_NS", + } +if _OPTIONS["BIGENDIAN"]=="1" then + defines { + "BYTEORDER=4321", + "WORDS_BIGENDIAN", + } +else + defines { + "BYTEORDER=1234", + } +end + configuration { "vs*" } buildoptions { "/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter @@ -26,10 +54,10 @@ project "expat" } if _OPTIONS["vs"]=="intel-15" then buildoptions { - "/Qwd111", -- remark #111: statement is unreachable - "/Qwd1879", -- warning #1879: unimplemented pragma ignored - "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands - "/Qwd869", -- remark #869: parameter "xxx" was never referenced + "/Qwd111", -- remark #111: statement is unreachable + "/Qwd1879", -- warning #1879: unimplemented pragma ignored + "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands + "/Qwd869", -- remark #869: parameter "xxx" was never referenced } end configuration { "vs2015" } @@ -45,7 +73,7 @@ end } else links { - "expat", + ext_lib("expat"), } end @@ -53,13 +81,13 @@ end -- zlib library objects -------------------------------------------------- -if _OPTIONS["with-bundled-zlib"] then +if not _OPTIONS["with-system-zlib"] then project "zlib" uuid "3d78bd2a-2bd0-4449-8087-42ddfaef7ec9" kind "StaticLib" local version = str_to_version(_OPTIONS["gcc_version"]) - if _OPTIONS["gcc"]~=nil and (string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs")) then + if _OPTIONS["gcc"]~=nil and ((string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs") or string.find(_OPTIONS["gcc"], "android"))) then configuration { "gmake" } if (version >= 30700) then buildoptions { @@ -76,8 +104,8 @@ project "zlib" } if _OPTIONS["vs"]=="intel-15" then buildoptions { - "/Qwd111", -- remark #111: statement is unreachable - "/Qwd280", -- remark #280: selector expression is constant + "/Qwd111", -- remark #111: statement is unreachable + "/Qwd280", -- remark #280: selector expression is constant } end configuration "Debug" @@ -110,7 +138,7 @@ end } else links { - "z", + ext_lib("zlib"), } end @@ -137,7 +165,7 @@ project "softfloat" } if _OPTIONS["vs"]=="intel-15" then buildoptions { - "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands + "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands } end configuration { } @@ -152,7 +180,7 @@ end -- libJPEG library objects -------------------------------------------------- -if _OPTIONS["with-bundled-jpeg"] then +if not _OPTIONS["with-system-jpeg"] then project "jpeg" uuid "447c6800-dcfd-4c48-b72a-a8223bb409ca" kind "StaticLib" @@ -165,7 +193,7 @@ project "jpeg" } if _OPTIONS["vs"]=="intel-15" then buildoptions { - "/Qwd869", -- remark #869: parameter "xxx" was never referenced + "/Qwd869", -- remark #869: parameter "xxx" was never referenced } end @@ -221,7 +249,7 @@ end } else links { - "jpeg", + ext_lib("jpeg"), } end @@ -229,7 +257,7 @@ end -- libflac library objects -------------------------------------------------- -if _OPTIONS["with-bundled-flac"] then +if not _OPTIONS["with-system-flac"] then project "flac" uuid "b6fc19e8-073a-4541-bb7b-d24b548d424a" kind "StaticLib" @@ -243,11 +271,11 @@ project "flac" } if _OPTIONS["vs"]=="intel-15" then buildoptions { - "/Qwd111", -- remark #111: statement is unreachable - "/Qwd177", -- remark #177: function "xxx" was declared but never referenced - "/Qwd181", -- remark #181: argument of type "UINT32={unsigned int}" is incompatible with format "%d", expecting argument of type "int" - "/Qwd188", -- error #188: enumerated type mixed with another type - "/Qwd869", -- remark #869: parameter "xxx" was never referenced + "/Qwd111", -- remark #111: statement is unreachable + "/Qwd177", -- remark #177: function "xxx" was declared but never referenced + "/Qwd181", -- remark #181: argument of type "UINT32={unsigned int}" is incompatible with format "%d", expecting argument of type "int" + "/Qwd188", -- error #188: enumerated type mixed with another type + "/Qwd869", -- remark #869: parameter "xxx" was never referenced } end @@ -271,12 +299,12 @@ end "HAVE_CONFIG_H=1", } - configuration { "gmake"} + configuration { "gmake" } buildoptions_c { "-Wno-unused-function", "-O0", } - if _OPTIONS["gcc"]~=nil and string.find(_OPTIONS["gcc"], "clang") then + if _OPTIONS["gcc"]~=nil and (string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "android")) then buildoptions { "-Wno-enum-conversion", } @@ -312,7 +340,7 @@ end } else links { - "FLAC", + ext_lib("flac"), } end @@ -324,13 +352,24 @@ project "7z" uuid "ad573d62-e76a-4b11-ae34-5110a6789a42" kind "StaticLib" + configuration { "gmake" } + buildoptions_c { + "-Wno-undef", + "-Wno-strict-prototypes", + } + + configuration { "mingw*" } + buildoptions_c { + "-Wno-strict-prototypes", + } + configuration { "vs*" } buildoptions { "/wd4100", -- warning C4100: 'xxx' : unreferenced formal parameter } if _OPTIONS["vs"]=="intel-15" then buildoptions { - "/Qwd869", -- remark #869: parameter "xxx" was never referenced + "/Qwd869", -- remark #869: parameter "xxx" was never referenced } end configuration { "vs2015" } @@ -346,31 +385,54 @@ end } files { + MAME_DIR .. "3rdparty/lzma/C/7zAlloc.c", + MAME_DIR .. "3rdparty/lzma/C/7zArcIn.c", MAME_DIR .. "3rdparty/lzma/C/7zBuf.c", MAME_DIR .. "3rdparty/lzma/C/7zBuf2.c", MAME_DIR .. "3rdparty/lzma/C/7zCrc.c", MAME_DIR .. "3rdparty/lzma/C/7zCrcOpt.c", MAME_DIR .. "3rdparty/lzma/C/7zDec.c", - MAME_DIR .. "3rdparty/lzma/C/7zIn.c", + MAME_DIR .. "3rdparty/lzma/C/7zFile.c", + MAME_DIR .. "3rdparty/lzma/C/7zStream.c", + MAME_DIR .. "3rdparty/lzma/C/Aes.c", + MAME_DIR .. "3rdparty/lzma/C/AesOpt.c", + MAME_DIR .. "3rdparty/lzma/C/Alloc.c", + MAME_DIR .. "3rdparty/lzma/C/Bcj2.c", + -- MAME_DIR .. "3rdparty/lzma/C/Bcj2Enc.c", + MAME_DIR .. "3rdparty/lzma/C/Bra.c", + MAME_DIR .. "3rdparty/lzma/C/Bra86.c", + MAME_DIR .. "3rdparty/lzma/C/BraIA64.c", MAME_DIR .. "3rdparty/lzma/C/CpuArch.c", - MAME_DIR .. "3rdparty/lzma/C/LzmaDec.c", + MAME_DIR .. "3rdparty/lzma/C/Delta.c", + MAME_DIR .. "3rdparty/lzma/C/LzFind.c", + -- MAME_DIR .. "3rdparty/lzma/C/LzFindMt.c", MAME_DIR .. "3rdparty/lzma/C/Lzma2Dec.c", - MAME_DIR .. "3rdparty/lzma/C/LzmaEnc.c", MAME_DIR .. "3rdparty/lzma/C/Lzma2Enc.c", - MAME_DIR .. "3rdparty/lzma/C/LzFind.c", - MAME_DIR .. "3rdparty/lzma/C/Bra.c", - MAME_DIR .. "3rdparty/lzma/C/Bra86.c", - MAME_DIR .. "3rdparty/lzma/C/Bcj2.c", + MAME_DIR .. "3rdparty/lzma/C/Lzma86Dec.c", + MAME_DIR .. "3rdparty/lzma/C/Lzma86Enc.c", + MAME_DIR .. "3rdparty/lzma/C/LzmaDec.c", + MAME_DIR .. "3rdparty/lzma/C/LzmaEnc.c", + -- MAME_DIR .. "3rdparty/lzma/C/LzmaLib.c", + -- MAME_DIR .. "3rdparty/lzma/C/MtCoder.c", MAME_DIR .. "3rdparty/lzma/C/Ppmd7.c", MAME_DIR .. "3rdparty/lzma/C/Ppmd7Dec.c", - MAME_DIR .. "3rdparty/lzma/C/7zStream.c", + MAME_DIR .. "3rdparty/lzma/C/Ppmd7Enc.c", + MAME_DIR .. "3rdparty/lzma/C/Sha256.c", + MAME_DIR .. "3rdparty/lzma/C/Sort.c", + -- MAME_DIR .. "3rdparty/lzma/C/Threads.c", + -- MAME_DIR .. "3rdparty/lzma/C/Xz.c", + -- MAME_DIR .. "3rdparty/lzma/C/XzCrc64.c", + -- MAME_DIR .. "3rdparty/lzma/C/XzCrc64Opt.c", + -- MAME_DIR .. "3rdparty/lzma/C/XzDec.c", + -- MAME_DIR .. "3rdparty/lzma/C/XzEnc.c", + -- MAME_DIR .. "3rdparty/lzma/C/XzIn.c", } -------------------------------------------------- -- LUA library objects -------------------------------------------------- -if _OPTIONS["with-bundled-lua"] then +if not _OPTIONS["with-system-lua"] then project "lua" uuid "d9e2eed1-f1ab-4737-a6ac-863700b1a5a9" kind "StaticLib" @@ -381,7 +443,7 @@ project "lua" -- In addition comment out the "extern "C"" -- in lua.hpp and do the same in luaengine.c line 47 --options { - -- "ForceCPP", + -- "ForceCPP", --} configuration { "gmake" } @@ -406,7 +468,7 @@ end "LUA_COMPAT_5_1", "LUA_COMPAT_5_2", } - if not (_OPTIONS["targetos"]=="windows") and not (_OPTIONS["targetos"]=="asmjs") then + if not (_OPTIONS["targetos"]=="windows") and not (_OPTIONS["targetos"]=="asmjs") and not (_OPTIONS["targetos"]=="pnacl") then defines { "LUA_USE_POSIX", } @@ -460,7 +522,7 @@ end } else links { - "lua", + ext_lib("lua"), } end @@ -480,6 +542,11 @@ project "lualibs" "/wd4130", -- warning C4130: '==': logical operation on address of string constant } + configuration { "pnacl"} + buildoptions { + "-Wno-char-subscripts", + } + configuration { } defines { "LUA_COMPAT_ALL", @@ -488,16 +555,11 @@ project "lualibs" includedirs { MAME_DIR .. "3rdparty", } - if _OPTIONS["with-bundled-lua"] then - includedirs { - MAME_DIR .. "3rdparty/lua/src", - } - end - if _OPTIONS["with-bundled-zlib"] then - includedirs { - MAME_DIR .. "3rdparty/zlib", - } - end + includedirs { + ext_includedir("lua"), + ext_includedir("zlib"), + ext_includedir("sqlite3"), + } files { MAME_DIR .. "3rdparty/lsqlite3/lsqlite3.c", @@ -506,64 +568,11 @@ project "lualibs" } -------------------------------------------------- --- luv lua library objects --------------------------------------------------- - -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-maybe-uninitialized", - "-Wno-undef", - } - - 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", - } - --------------------------------------------------- -- SQLite3 library objects -------------------------------------------------- -if _OPTIONS["with-bundled-sqlite3"] then -project "sqllite3" +if not _OPTIONS["with-system-sqlite3"] then +project "sqlite3" uuid "5cb3d495-57ed-461c-81e5-80dc0857517d" kind "StaticLib" @@ -577,11 +586,14 @@ project "sqllite3" } if _OPTIONS["vs"]=="intel-15" then buildoptions { - "/Qwd869", -- remark #869: parameter "xxx" was never referenced - "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands + "/Qwd869", -- remark #869: parameter "xxx" was never referenced + "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands } end - + configuration { "pnacl" } + defines { + "SQLITE_OMIT_LOAD_EXTENSION", + } configuration { "vs2015" } buildoptions { "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration @@ -610,7 +622,7 @@ end } else links { - "sqlite3", + ext_lib("sqlite3"), } end @@ -618,7 +630,7 @@ end -- portmidi library objects -------------------------------------------------- if _OPTIONS["NO_USE_MIDI"]~="1" then -if _OPTIONS["with-bundled-portmidi"] then +if not _OPTIONS["with-system-portmidi"] then project "portmidi" uuid "587f2da6-3274-4a65-86a2-f13ea315bb98" kind "StaticLib" @@ -637,10 +649,10 @@ project "portmidi" } if _OPTIONS["vs"]=="intel-15" then buildoptions { - "/Qwd188", -- error #188: enumerated type mixed with another type - "/Qwd344", -- remark #344: typedef name has already been declared (with same type) - "/Qwd869", -- remark #869: parameter "xxx" was never referenced - "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands + "/Qwd188", -- error #188: enumerated type mixed with another type + "/Qwd344", -- remark #344: typedef name has already been declared (with same type) + "/Qwd869", -- remark #869: parameter "xxx" was never referenced + "/Qwd2557", -- remark #2557: comparison between signed and unsigned operands } end @@ -697,7 +709,7 @@ end end else links { - "portmidi", + ext_lib("portmidi"), } end end @@ -718,9 +730,9 @@ project "bgfx" } if _OPTIONS["vs"]=="intel-15" then buildoptions { - "/Qwd906", -- message #906: effect of this "#pragma pack" directive is local to function "xxx" - "/Qwd1879", -- warning #1879: unimplemented pragma ignored - "/Qwd82", -- remark #82: storage class is not first + "/Qwd906", -- message #906: effect of this "#pragma pack" directive is local to function "xxx" + "/Qwd1879", -- warning #1879: unimplemented pragma ignored + "/Qwd82", -- remark #82: storage class is not first } end configuration { } @@ -737,6 +749,11 @@ end MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos", } + configuration { "android-*"} + buildoptions { + "-Wno-macro-redefined", + } + configuration { "vs*" } includedirs { MAME_DIR .. "3rdparty/bx/include/compat/msvc", @@ -765,6 +782,15 @@ end buildoptions { "-Wno-uninitialized", "-Wno-unused-function", + "-Wno-unused-but-set-variable", + } + configuration { "rpi" } + buildoptions { + "-Wno-unused-but-set-variable", + "-Wno-unused-variable", + } + defines { + "__STDC_VERSION__=199901L", } configuration { } @@ -793,6 +819,7 @@ end "__STDC_LIMIT_MACROS", "__STDC_FORMAT_MACROS", "__STDC_CONSTANT_MACROS", + "BGFX_CONFIG_MAX_FRAME_BUFFERS=128", } files { MAME_DIR .. "3rdparty/bgfx/src/bgfx.cpp", @@ -801,17 +828,20 @@ end MAME_DIR .. "3rdparty/bgfx/src/glcontext_ppapi.cpp", MAME_DIR .. "3rdparty/bgfx/src/glcontext_wgl.cpp", MAME_DIR .. "3rdparty/bgfx/src/image.cpp", - MAME_DIR .. "3rdparty/bgfx/src/ovr.cpp", + MAME_DIR .. "3rdparty/bgfx/src/hmd_ovr.cpp", + MAME_DIR .. "3rdparty/bgfx/src/hmd_openvr.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderer_d3d12.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderer_d3d11.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderer_d3d9.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderer_gl.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderer_null.cpp", MAME_DIR .. "3rdparty/bgfx/src/renderer_vk.cpp", - MAME_DIR .. "3rdparty/bgfx/src/renderdoc.cpp", + MAME_DIR .. "3rdparty/bgfx/src/debug_renderdoc.cpp", + MAME_DIR .. "3rdparty/bgfx/src/shader.cpp", MAME_DIR .. "3rdparty/bgfx/src/shader_dxbc.cpp", MAME_DIR .. "3rdparty/bgfx/src/shader_dx9bc.cpp", MAME_DIR .. "3rdparty/bgfx/src/shader_spirv.cpp", + MAME_DIR .. "3rdparty/bgfx/src/topology.cpp", MAME_DIR .. "3rdparty/bgfx/src/vertexdecl.cpp", MAME_DIR .. "3rdparty/bgfx/examples/common/bgfx_utils.cpp", MAME_DIR .. "3rdparty/bgfx/examples/common/bounds.cpp", @@ -822,8 +852,17 @@ end MAME_DIR .. "3rdparty/bgfx/examples/common/font/text_metrics.cpp", MAME_DIR .. "3rdparty/bgfx/examples/common/font/utf8.cpp", MAME_DIR .. "3rdparty/bgfx/examples/common/imgui/imgui.cpp", + MAME_DIR .. "3rdparty/bgfx/examples/common/imgui/ocornut_imgui.cpp", + MAME_DIR .. "3rdparty/bgfx/examples/common/imgui/scintilla.cpp", MAME_DIR .. "3rdparty/bgfx/examples/common/nanovg/nanovg.cpp", MAME_DIR .. "3rdparty/bgfx/examples/common/nanovg/nanovg_bgfx.cpp", + MAME_DIR .. "3rdparty/bgfx/3rdparty/ib-compress/indexbuffercompression.cpp", + MAME_DIR .. "3rdparty/bgfx/3rdparty/ib-compress/indexbufferdecompression.cpp", + MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui.cpp", + MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_demo.cpp", + MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_draw.cpp", + MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_node_graph_test.cpp", + MAME_DIR .. "3rdparty/bgfx/3rdparty/ocornut-imgui/imgui_wm.cpp", } if _OPTIONS["targetos"]=="macosx" then files { @@ -837,7 +876,7 @@ end -- PortAudio library objects -------------------------------------------------- -if _OPTIONS["with-bundled-portaudio"] then +if not _OPTIONS["with-system-portaudio"] then project "portaudio" uuid "0755c5f5-eccf-47f3-98a9-df67018a94d4" kind "StaticLib" @@ -853,10 +892,10 @@ project "portaudio" } if _OPTIONS["vs"]=="intel-15" then buildoptions { - "/Qwd869", -- remark #869: parameter "xxx" was never referenced - "/Qwd1478", -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated - "/Qwd2544", -- message #2544: empty dependent statement in if-statement - "/Qwd1879", -- warning #1879: unimplemented pragma ignored + "/Qwd869", -- remark #869: parameter "xxx" was never referenced + "/Qwd1478", -- warning #1478: function "xxx" (declared at line yyy of "zzz") was declared deprecated + "/Qwd2544", -- message #2544: empty dependent statement in if-statement + "/Qwd1879", -- warning #1879: unimplemented pragma ignored } end configuration { "vs2015" } @@ -878,7 +917,7 @@ end local version = str_to_version(_OPTIONS["gcc_version"]) if (_OPTIONS["gcc"]~=nil) then - if string.find(_OPTIONS["gcc"], "clang") then + if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "android") then buildoptions_c { "-Wno-unknown-warning-option", "-Wno-absolute-value", @@ -982,13 +1021,15 @@ end else links { - "portaudio", + ext_lib("portaudio"), } 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" @@ -1012,7 +1053,7 @@ project "uv" local version = str_to_version(_OPTIONS["gcc_version"]) if (_OPTIONS["gcc"]~=nil) then - if string.find(_OPTIONS["gcc"], "clang") then + if string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "android") then buildoptions_c { "-Wno-unknown-warning-option", "-Wno-unknown-attributes", @@ -1053,7 +1094,7 @@ project "uv" "WIN32_LEAN_AND_MEAN", "_WIN32_WINNT=0x0502", } - if _ACTION == "vs2013" then + if _ACTION == "vs2013" then files { MAME_DIR .. "3rdparty/libuv/src/win/snprintf.c", } @@ -1138,6 +1179,25 @@ project "uv" 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__", @@ -1159,7 +1219,7 @@ project "uv" "-Wshadow" } end - +end -------------------------------------------------- -- HTTP parser library objects -------------------------------------------------- @@ -1178,3 +1238,505 @@ project "http-parser" "-Wshadow" } end + +else +links { + ext_lib("uv"), +} +end +-------------------------------------------------- +-- SDL2 library +-------------------------------------------------- +if _OPTIONS["with-bundled-sdl2"] then +project "SDL2" + uuid "caab3327-574f-4abf-b25b-74d5238ae59b" +if _OPTIONS["targetos"]=="android" then + kind "SharedLib" + targetextension ".so" + targetprefix "lib" + links { + "GLESv1_CM", + "GLESv2", + "log", + } + linkoptions { + "-Wl,-soname,libSDL2.so" + } + + if _OPTIONS["SEPARATE_BIN"]~="1" then + if _OPTIONS["PLATFORM"]=="arm" then + targetdir(MAME_DIR .. "android-project/app/src/main/libs/armeabi-v7a") + end + if _OPTIONS["PLATFORM"]=="arm64" then + targetdir(MAME_DIR .. "android-project/app/src/main/libs/arm64-v8a") + end + if _OPTIONS["PLATFORM"]=="mips" then + targetdir(MAME_DIR .. "android-project/app/src/main/libs/mips") + end + if _OPTIONS["PLATFORM"]=="mips64" then + targetdir(MAME_DIR .. "android-project/app/src/main/libs/mips64") + end + if _OPTIONS["PLATFORM"]=="x86" then + targetdir(MAME_DIR .. "android-project/app/src/main/libs/x86") + end + if _OPTIONS["PLATFORM"]=="x64" then + targetdir(MAME_DIR .. "android-project/app/src/main/libs/x86_64") + end + end +else + kind "StaticLib" +end + + files { + MAME_DIR .. "3rdparty/SDL2/include/begin_code.h", + MAME_DIR .. "3rdparty/SDL2/include/close_code.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_assert.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_atomic.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_audio.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_bits.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_blendmode.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_clipboard.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_config.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_config_windows.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_copying.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_cpuinfo.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_egl.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_endian.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_error.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_events.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_filesystem.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_gamecontroller.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_gesture.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_haptic.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_hints.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_joystick.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_keyboard.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_keycode.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_loadso.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_log.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_main.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_messagebox.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_mouse.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_mutex.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_name.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_opengl.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_opengl_glext.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_opengles.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_opengles2.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_opengles2_gl2.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_opengles2_gl2ext.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_opengles2_gl2platform.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_opengles2_khrplatform.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_pixels.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_platform.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_power.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_quit.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_rect.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_render.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_revision.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_rwops.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_scancode.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_shape.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_stdinc.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_surface.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_system.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_syswm.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_test.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_test_assert.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_test_common.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_test_compare.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_test_crc32.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_test_font.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_test_fuzzer.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_test_harness.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_test_images.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_test_log.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_test_md5.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_test_random.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_thread.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_timer.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_touch.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_types.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_version.h", + MAME_DIR .. "3rdparty/SDL2/include/SDL_video.h", + + + MAME_DIR .. "3rdparty/SDL2/src/atomic/SDL_atomic.c", + MAME_DIR .. "3rdparty/SDL2/src/atomic/SDL_spinlock.c", + MAME_DIR .. "3rdparty/SDL2/src/audio/disk/SDL_diskaudio.c", + MAME_DIR .. "3rdparty/SDL2/src/audio/disk/SDL_diskaudio.h", + MAME_DIR .. "3rdparty/SDL2/src/audio/dummy/SDL_dummyaudio.c", + MAME_DIR .. "3rdparty/SDL2/src/audio/dummy/SDL_dummyaudio.h", + MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_audio.c", + MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_audio_c.h", + MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_audiocvt.c", + MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_audiodev.c", + MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_audiodev_c.h", + MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_audiomem.h", + MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_audiotypecvt.c", + MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_mixer.c", + MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_sysaudio.h", + MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_wave.c", + MAME_DIR .. "3rdparty/SDL2/src/audio/SDL_wave.h", + MAME_DIR .. "3rdparty/SDL2/src/cpuinfo/SDL_cpuinfo.c", + MAME_DIR .. "3rdparty/SDL2/src/dynapi/SDL_dynapi.c", + MAME_DIR .. "3rdparty/SDL2/src/dynapi/SDL_dynapi.h", + MAME_DIR .. "3rdparty/SDL2/src/dynapi/SDL_dynapi_overrides.h", + MAME_DIR .. "3rdparty/SDL2/src/dynapi/SDL_dynapi_procs.h", + MAME_DIR .. "3rdparty/SDL2/src/events/blank_cursor.h", + MAME_DIR .. "3rdparty/SDL2/src/events/default_cursor.h", + MAME_DIR .. "3rdparty/SDL2/src/events/SDL_clipboardevents.c", + MAME_DIR .. "3rdparty/SDL2/src/events/SDL_clipboardevents_c.h", + MAME_DIR .. "3rdparty/SDL2/src/events/SDL_dropevents.c", + MAME_DIR .. "3rdparty/SDL2/src/events/SDL_dropevents_c.h", + MAME_DIR .. "3rdparty/SDL2/src/events/SDL_events.c", + MAME_DIR .. "3rdparty/SDL2/src/events/SDL_events_c.h", + MAME_DIR .. "3rdparty/SDL2/src/events/SDL_gesture.c", + MAME_DIR .. "3rdparty/SDL2/src/events/SDL_gesture_c.h", + MAME_DIR .. "3rdparty/SDL2/src/events/SDL_keyboard.c", + MAME_DIR .. "3rdparty/SDL2/src/events/SDL_keyboard_c.h", + MAME_DIR .. "3rdparty/SDL2/src/events/SDL_mouse.c", + MAME_DIR .. "3rdparty/SDL2/src/events/SDL_mouse_c.h", + MAME_DIR .. "3rdparty/SDL2/src/events/SDL_quit.c", + MAME_DIR .. "3rdparty/SDL2/src/events/SDL_sysevents.h", + MAME_DIR .. "3rdparty/SDL2/src/events/SDL_touch.c", + MAME_DIR .. "3rdparty/SDL2/src/events/SDL_touch_c.h", + MAME_DIR .. "3rdparty/SDL2/src/events/SDL_windowevents.c", + MAME_DIR .. "3rdparty/SDL2/src/events/SDL_windowevents_c.h", + MAME_DIR .. "3rdparty/SDL2/src/file/SDL_rwops.c", + MAME_DIR .. "3rdparty/SDL2/src/haptic/SDL_haptic.c", + MAME_DIR .. "3rdparty/SDL2/src/haptic/SDL_syshaptic.h", + MAME_DIR .. "3rdparty/SDL2/src/joystick/SDL_gamecontroller.c", + MAME_DIR .. "3rdparty/SDL2/src/joystick/SDL_joystick.c", + MAME_DIR .. "3rdparty/SDL2/src/joystick/SDL_joystick_c.h", + MAME_DIR .. "3rdparty/SDL2/src/joystick/SDL_sysjoystick.h", + MAME_DIR .. "3rdparty/SDL2/src/loadso/windows/SDL_sysloadso.c", + MAME_DIR .. "3rdparty/SDL2/src/power/SDL_power.c", + MAME_DIR .. "3rdparty/SDL2/src/power/windows/SDL_syspower.c", + MAME_DIR .. "3rdparty/SDL2/src/render/direct3d/SDL_render_d3d.c", + MAME_DIR .. "3rdparty/SDL2/src/render/direct3d11/SDL_render_d3d11.c", + MAME_DIR .. "3rdparty/SDL2/src/render/mmx.h", + MAME_DIR .. "3rdparty/SDL2/src/render/opengl/SDL_render_gl.c", + MAME_DIR .. "3rdparty/SDL2/src/render/opengl/SDL_shaders_gl.c", + MAME_DIR .. "3rdparty/SDL2/src/render/opengl/SDL_shaders_gl.h", + MAME_DIR .. "3rdparty/SDL2/src/render/opengles2/SDL_render_gles2.c", + MAME_DIR .. "3rdparty/SDL2/src/render/opengles2/SDL_shaders_gles2.c", + MAME_DIR .. "3rdparty/SDL2/src/render/SDL_d3dmath.c", + MAME_DIR .. "3rdparty/SDL2/src/render/SDL_d3dmath.h", + MAME_DIR .. "3rdparty/SDL2/src/render/SDL_render.c", + MAME_DIR .. "3rdparty/SDL2/src/render/SDL_sysrender.h", + MAME_DIR .. "3rdparty/SDL2/src/render/SDL_yuv_mmx.c", + MAME_DIR .. "3rdparty/SDL2/src/render/SDL_yuv_sw.c", + MAME_DIR .. "3rdparty/SDL2/src/render/SDL_yuv_sw_c.h", + MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_blendfillrect.c", + MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_blendfillrect.h", + MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_blendline.c", + MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_blendline.h", + MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_blendpoint.c", + MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_blendpoint.h", + MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_draw.h", + MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_drawline.c", + MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_drawline.h", + MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_drawpoint.c", + MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_drawpoint.h", + MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_render_sw.c", + MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_render_sw_c.h", + MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_rotate.c", + MAME_DIR .. "3rdparty/SDL2/src/render/software/SDL_rotate.h", + MAME_DIR .. "3rdparty/SDL2/src/SDL.c", + MAME_DIR .. "3rdparty/SDL2/src/SDL_assert.c", + MAME_DIR .. "3rdparty/SDL2/src/SDL_error.c", + MAME_DIR .. "3rdparty/SDL2/src/SDL_error_c.h", + MAME_DIR .. "3rdparty/SDL2/src/SDL_hints.c", + MAME_DIR .. "3rdparty/SDL2/src/SDL_hints_c.h", + MAME_DIR .. "3rdparty/SDL2/src/SDL_log.c", + MAME_DIR .. "3rdparty/SDL2/src/stdlib/SDL_getenv.c", + MAME_DIR .. "3rdparty/SDL2/src/stdlib/SDL_iconv.c", + MAME_DIR .. "3rdparty/SDL2/src/stdlib/SDL_malloc.c", + MAME_DIR .. "3rdparty/SDL2/src/stdlib/SDL_qsort.c", + MAME_DIR .. "3rdparty/SDL2/src/stdlib/SDL_stdlib.c", + MAME_DIR .. "3rdparty/SDL2/src/stdlib/SDL_string.c", + MAME_DIR .. "3rdparty/SDL2/src/thread/SDL_systhread.h", + MAME_DIR .. "3rdparty/SDL2/src/thread/SDL_thread.c", + MAME_DIR .. "3rdparty/SDL2/src/thread/SDL_thread_c.h", + MAME_DIR .. "3rdparty/SDL2/src/timer/SDL_systimer.h", + MAME_DIR .. "3rdparty/SDL2/src/timer/SDL_timer.c", + MAME_DIR .. "3rdparty/SDL2/src/timer/SDL_timer_c.h", + MAME_DIR .. "3rdparty/SDL2/src/video/dummy/SDL_nullevents.c", + MAME_DIR .. "3rdparty/SDL2/src/video/dummy/SDL_nullevents_c.h", + MAME_DIR .. "3rdparty/SDL2/src/video/dummy/SDL_nullframebuffer.c", + MAME_DIR .. "3rdparty/SDL2/src/video/dummy/SDL_nullframebuffer_c.h", + MAME_DIR .. "3rdparty/SDL2/src/video/dummy/SDL_nullvideo.c", + MAME_DIR .. "3rdparty/SDL2/src/video/dummy/SDL_nullvideo.h", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit.c", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit.h", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_0.c", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_1.c", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_A.c", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_auto.c", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_auto.h", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_copy.c", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_copy.h", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_N.c", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_slow.c", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_blit_slow.h", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_bmp.c", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_clipboard.c", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_egl.c", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_fillrect.c", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_glesfuncs.h", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_glfuncs.h", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_pixels.c", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_pixels_c.h", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_rect.c", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_rect_c.h", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_RLEaccel.c", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_RLEaccel_c.h", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_shape.c", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_shape_internals.h", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_stretch.c", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_surface.c", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_sysvideo.h", + MAME_DIR .. "3rdparty/SDL2/src/video/SDL_video.c", + + } + if _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="windows" then + files { + MAME_DIR .. "3rdparty/SDL2/src/libm/e_atan2.c", + MAME_DIR .. "3rdparty/SDL2/src/libm/e_log.c", + MAME_DIR .. "3rdparty/SDL2/src/libm/e_pow.c", + MAME_DIR .. "3rdparty/SDL2/src/libm/e_rem_pio2.c", + MAME_DIR .. "3rdparty/SDL2/src/libm/e_sqrt.c", + MAME_DIR .. "3rdparty/SDL2/src/libm/k_cos.c", + MAME_DIR .. "3rdparty/SDL2/src/libm/k_rem_pio2.c", + MAME_DIR .. "3rdparty/SDL2/src/libm/k_sin.c", + MAME_DIR .. "3rdparty/SDL2/src/libm/k_tan.c", + MAME_DIR .. "3rdparty/SDL2/src/libm/math.h", + MAME_DIR .. "3rdparty/SDL2/src/libm/math_private.h", + MAME_DIR .. "3rdparty/SDL2/src/libm/s_atan.c", + MAME_DIR .. "3rdparty/SDL2/src/libm/s_copysign.c", + MAME_DIR .. "3rdparty/SDL2/src/libm/s_cos.c", + MAME_DIR .. "3rdparty/SDL2/src/libm/s_fabs.c", + MAME_DIR .. "3rdparty/SDL2/src/libm/s_floor.c", + MAME_DIR .. "3rdparty/SDL2/src/libm/s_scalbn.c", + MAME_DIR .. "3rdparty/SDL2/src/libm/s_sin.c", + MAME_DIR .. "3rdparty/SDL2/src/libm/s_tan.c", + } + end + if _OPTIONS["targetos"]~="windows" then + files { + MAME_DIR .. "3rdparty/SDL2/src/render/opengles/SDL_render_gles.c", + MAME_DIR .. "3rdparty/SDL2/src/render/opengles/SDL_glesfuncs.h", + } + end + + if _OPTIONS["targetos"]=="android" then + files { + MAME_DIR .. "3rdparty/SDL2/src/audio/android/SDL_androidaudio.c", + MAME_DIR .. "3rdparty/SDL2/src/audio/android/SDL_androidaudio.h", + MAME_DIR .. "3rdparty/SDL2/src/core/android/SDL_android.c", + MAME_DIR .. "3rdparty/SDL2/src/core/android/SDL_android.h", + MAME_DIR .. "3rdparty/SDL2/src/filesystem/android/SDL_sysfilesystem.c", + MAME_DIR .. "3rdparty/SDL2/src/haptic/dummy/SDL_syshaptic.c", + MAME_DIR .. "3rdparty/SDL2/src/joystick/android/SDL_sysjoystick.c", + MAME_DIR .. "3rdparty/SDL2/src/loadso/dlopen/SDL_sysloadso.c", + MAME_DIR .. "3rdparty/SDL2/src/power/android/SDL_syspower.c", + MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_syscond.c", + MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_sysmutex.c", + MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_sysmutex_c.h", + MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_syssem.c", + MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_systhread.c", + MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_systhread_c.h", + MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_systls.c", + MAME_DIR .. "3rdparty/SDL2/src/timer/unix/SDL_systimer.c", + MAME_DIR .. "3rdparty/SDL2/src/timer/unix/SDL_systimer_c.h", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidclipboard.c", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidclipboard.h", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidevents.c", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidevents.h", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidgl.c", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidkeyboard.c", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidkeyboard.h", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidmessagebox.c", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidmessagebox.h", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidmouse.c", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidmouse.h", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidtouch.c", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidtouch.h", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidvideo.c", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidvideo.h", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidwindow.c", + MAME_DIR .. "3rdparty/SDL2/src/video/android/SDL_androidwindow.h", + } + end + + if _OPTIONS["targetos"]=="macosx" then + files { + MAME_DIR .. "3rdparty/SDL2/src/audio/coreaudio/SDL_coreaudio.c", + MAME_DIR .. "3rdparty/SDL2/src/audio/coreaudio/SDL_coreaudio.h", + MAME_DIR .. "3rdparty/SDL2/src/file/cocoa/SDL_rwopsbundlesupport.m", + MAME_DIR .. "3rdparty/SDL2/src/file/cocoa/SDL_rwopsbundlesupport.h", + MAME_DIR .. "3rdparty/SDL2/src/filesystem/cocoa/SDL_sysfilesystem.m", + MAME_DIR .. "3rdparty/SDL2/src/haptic/darwin/SDL_syshaptic.c", + MAME_DIR .. "3rdparty/SDL2/src/haptic/darwin/SDL_syshaptic_c.h", + MAME_DIR .. "3rdparty/SDL2/src/joystick/darwin/SDL_sysjoystick.c", + MAME_DIR .. "3rdparty/SDL2/src/joystick/darwin/SDL_sysjoystick_c.h", + MAME_DIR .. "3rdparty/SDL2/src/loadso/dlopen/SDL_sysloadso.c", + MAME_DIR .. "3rdparty/SDL2/src/power/macosx/SDL_syspower.c", + MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_syscond.c", + MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_sysmutex.c", + MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_sysmutex_c.h", + MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_syssem.c", + MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_systhread.c", + MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_systhread_c.h", + MAME_DIR .. "3rdparty/SDL2/src/thread/pthread/SDL_systls.c", + MAME_DIR .. "3rdparty/SDL2/src/timer/unix/SDL_systimer.c", + MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoaclipboard.m", + MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoaclipboard.h", + MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoaevents.m", + MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoaevents.h", + MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoakeyboard.m", + MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoakeyboard.h", + MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoamessagebox.m", + MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoamessagebox.h", + MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoamodes.m", + MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoamodes.h", + MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoamouse.m", + MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoamouse.h", + MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoamousetap.m", + MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoamousetap.h", + MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoaopengl.m", + MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoaopengl.h", + MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoashape.m", + MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoashape.h", + MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoavideo.m", + MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoavideo.h", + MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoawindow.m", + MAME_DIR .. "3rdparty/SDL2/src/video/cocoa/SDL_cocoawindow.h", + + } + end + + if _OPTIONS["targetos"]=="windows" then + files { + MAME_DIR .. "3rdparty/SDL2/src/thread/generic/SDL_syscond.c", + MAME_DIR .. "3rdparty/SDL2/src/audio/directsound/SDL_directsound.c", + MAME_DIR .. "3rdparty/SDL2/src/audio/directsound/SDL_directsound.h", + MAME_DIR .. "3rdparty/SDL2/src/audio/winmm/SDL_winmm.c", + MAME_DIR .. "3rdparty/SDL2/src/audio/winmm/SDL_winmm.h", + MAME_DIR .. "3rdparty/SDL2/src/core/windows/SDL_directx.h", + MAME_DIR .. "3rdparty/SDL2/src/core/windows/SDL_windows.c", + MAME_DIR .. "3rdparty/SDL2/src/core/windows/SDL_windows.h", + MAME_DIR .. "3rdparty/SDL2/src/core/windows/SDL_xinput.c", + MAME_DIR .. "3rdparty/SDL2/src/core/windows/SDL_xinput.h", + MAME_DIR .. "3rdparty/SDL2/src/filesystem/windows/SDL_sysfilesystem.c", + MAME_DIR .. "3rdparty/SDL2/src/haptic/windows/SDL_dinputhaptic.c", + MAME_DIR .. "3rdparty/SDL2/src/haptic/windows/SDL_dinputhaptic_c.h", + MAME_DIR .. "3rdparty/SDL2/src/haptic/windows/SDL_windowshaptic.c", + MAME_DIR .. "3rdparty/SDL2/src/haptic/windows/SDL_windowshaptic_c.h", + MAME_DIR .. "3rdparty/SDL2/src/haptic/windows/SDL_xinputhaptic.c", + MAME_DIR .. "3rdparty/SDL2/src/haptic/windows/SDL_xinputhaptic_c.h", + MAME_DIR .. "3rdparty/SDL2/src/joystick/windows/SDL_dinputjoystick.c", + MAME_DIR .. "3rdparty/SDL2/src/joystick/windows/SDL_dinputjoystick_c.h", + MAME_DIR .. "3rdparty/SDL2/src/joystick/windows/SDL_mmjoystick.c", + MAME_DIR .. "3rdparty/SDL2/src/joystick/windows/SDL_windowsjoystick.c", + MAME_DIR .. "3rdparty/SDL2/src/joystick/windows/SDL_windowsjoystick_c.h", + MAME_DIR .. "3rdparty/SDL2/src/joystick/windows/SDL_xinputjoystick.c", + MAME_DIR .. "3rdparty/SDL2/src/joystick/windows/SDL_xinputjoystick_c.h", + MAME_DIR .. "3rdparty/SDL2/src/thread/windows/SDL_sysmutex.c", + MAME_DIR .. "3rdparty/SDL2/src/thread/windows/SDL_syssem.c", + MAME_DIR .. "3rdparty/SDL2/src/thread/windows/SDL_systhread.c", + MAME_DIR .. "3rdparty/SDL2/src/thread/windows/SDL_systhread_c.h", + MAME_DIR .. "3rdparty/SDL2/src/thread/windows/SDL_systls.c", + MAME_DIR .. "3rdparty/SDL2/src/timer/windows/SDL_systimer.c", + MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_vkeys.h", + MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsclipboard.c", + MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsclipboard.h", + MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsevents.c", + MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsevents.h", + MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsframebuffer.c", + MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsframebuffer.h", + MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowskeyboard.c", + MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowskeyboard.h", + MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsmessagebox.c", + MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsmessagebox.h", + MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsmodes.c", + MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsmodes.h", + MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsmouse.c", + MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsmouse.h", + MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsopengl.c", + MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsopengl.h", + MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsopengles.c", + MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsshape.c", + MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsshape.h", + MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsvideo.c", + MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowsvideo.h", + MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowswindow.c", + MAME_DIR .. "3rdparty/SDL2/src/video/windows/SDL_windowswindow.h", + MAME_DIR .. "3rdparty/SDL2/src/video/windows/wmmsg.h", + MAME_DIR .. "3rdparty/SDL2/src/main/windows/version.rc", + } + end + + configuration { "vs*" } + files { + MAME_DIR .. "3rdparty/SDL2/src/audio/xaudio2/SDL_xaudio2.c", + } + + buildoptions { + "/wd4200", -- warning C4200: nonstandard extension used: zero-sized array in struct/union + "/wd4055", -- warning C4055: 'type cast': from data pointer 'void *' to function pointer 'xxx' + "/wd4152", -- warning C4152: nonstandard extension, function/data pointer conversion in expression + "/wd4057", -- warning C4057: 'function': 'xxx' differs in indirection to slightly different base types from 'xxx' + "/wd4701", -- warning C4701: potentially uninitialized local variable 'xxx' used + "/wd4204", -- warning C4204: nonstandard extension used: non-constant aggregate initializer + "/wd4054", -- warning C4054: 'type cast': from function pointer 'xxx' to data pointer 'xxx' + } + defines { + "HAVE_LIBC", + } + + configuration { "mingw*"} + includedirs { + MAME_DIR .. "3rdparty/SDL2-override/mingw", + MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos", + } + buildoptions_c { + "-Wno-undef", + "-Wno-strict-prototypes", + "-Wno-bad-function-cast", + "-Wno-discarded-qualifiers", + "-Wno-unused-but-set-variable", + } + + configuration { "osx*"} + buildoptions { + "-Wno-undef", + } + buildoptions_objc { + "-x objective-c", + "-std=c99", + } + + buildoptions_c { + "-Wno-bad-function-cast", + } + + configuration { "android-*"} + defines { + "GL_GLEXT_PROTOTYPES", + } + buildoptions_c { + "-Wno-bad-function-cast", + "-Wno-incompatible-pointer-types-discards-qualifiers", + "-Wno-unneeded-internal-declaration", + "-Wno-unused-const-variable", + } + + configuration { } + includedirs { + MAME_DIR .. "3rdparty/SDL2/include", + } + +end diff --git a/docs/release/scripts/src/benchmarks.lua b/docs/release/scripts/src/benchmarks.lua index f774e3f45ca..a643939d6db 100644 --- a/docs/release/scripts/src/benchmarks.lua +++ b/docs/release/scripts/src/benchmarks.lua @@ -45,13 +45,13 @@ project "benchmark" project("benchmarks") uuid ("a9750a48-d283-4a6d-b126-31c7ce049af1") - kind "ConsoleApp" + kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } - if _OPTIONS["SEPARATE_BIN"]~="1" then + if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end diff --git a/docs/release/scripts/src/bus.lua b/docs/release/scripts/src/bus.lua index 9514e9f5a74..c525ce46732 100644 --- a/docs/release/scripts/src/bus.lua +++ b/docs/release/scripts/src/bus.lua @@ -705,6 +705,23 @@ end --------------------------------------------------- -- +--@src/devices/bus/intv_ctrl/ctrl.h,BUSES["INTV_CTRL"] = true +--------------------------------------------------- + +if (BUSES["INTV_CTRL"]~=null) then + files { + MAME_DIR .. "src/devices/bus/intv_ctrl/ctrl.cpp", + MAME_DIR .. "src/devices/bus/intv_ctrl/ctrl.h", + MAME_DIR .. "src/devices/bus/intv_ctrl/handctrl.cpp", + MAME_DIR .. "src/devices/bus/intv_ctrl/handctrl.h", + MAME_DIR .. "src/devices/bus/intv_ctrl/ecs_ctrl.cpp", + MAME_DIR .. "src/devices/bus/intv_ctrl/ecs_ctrl.h", + } +end + + +--------------------------------------------------- +-- --@src/devices/bus/isa/isa.h,BUSES["ISA"] = true --------------------------------------------------- @@ -1445,6 +1462,8 @@ if (BUSES["A2BUS"]~=null) then MAME_DIR .. "src/devices/bus/a2bus/ramcard128k.h", MAME_DIR .. "src/devices/bus/a2bus/ezcgi.cpp", MAME_DIR .. "src/devices/bus/a2bus/ezcgi.h", + MAME_DIR .. "src/devices/bus/a2bus/pc_xporter.cpp", + MAME_DIR .. "src/devices/bus/a2bus/pc_xporter.h", } end @@ -1932,6 +1951,58 @@ end --------------------------------------------------- -- +--@src/devices/bus/neogeo_ctrl/ctrl.h,BUSES["NEOGEO_CTRL"] = true +--------------------------------------------------- + +if (BUSES["NEOGEO_CTRL"]~=null) then + files { + MAME_DIR .. "src/devices/bus/neogeo_ctrl/ctrl.cpp", + MAME_DIR .. "src/devices/bus/neogeo_ctrl/ctrl.h", + MAME_DIR .. "src/devices/bus/neogeo_ctrl/joystick.cpp", + MAME_DIR .. "src/devices/bus/neogeo_ctrl/joystick.h", + MAME_DIR .. "src/devices/bus/neogeo_ctrl/mahjong.cpp", + MAME_DIR .. "src/devices/bus/neogeo_ctrl/mahjong.h", + MAME_DIR .. "src/devices/bus/neogeo_ctrl/dial.cpp", + MAME_DIR .. "src/devices/bus/neogeo_ctrl/dial.h", + MAME_DIR .. "src/devices/bus/neogeo_ctrl/irrmaze.cpp", + MAME_DIR .. "src/devices/bus/neogeo_ctrl/irrmaze.h", + MAME_DIR .. "src/devices/bus/neogeo_ctrl/kizuna4p.cpp", + MAME_DIR .. "src/devices/bus/neogeo_ctrl/kizuna4p.h", + } +end + +--------------------------------------------------- +-- +--@src/devices/bus/sat_ctrl/ctrl.h,BUSES["SAT_CTRL"] = true +--------------------------------------------------- + +if (BUSES["SAT_CTRL"]~=null) then + files { + MAME_DIR .. "src/devices/bus/sat_ctrl/ctrl.cpp", + MAME_DIR .. "src/devices/bus/sat_ctrl/ctrl.h", + MAME_DIR .. "src/devices/bus/sat_ctrl/analog.cpp", + MAME_DIR .. "src/devices/bus/sat_ctrl/analog.h", + MAME_DIR .. "src/devices/bus/sat_ctrl/joy.cpp", + MAME_DIR .. "src/devices/bus/sat_ctrl/joy.h", + MAME_DIR .. "src/devices/bus/sat_ctrl/joy_md.cpp", + MAME_DIR .. "src/devices/bus/sat_ctrl/joy_md.h", + MAME_DIR .. "src/devices/bus/sat_ctrl/keybd.cpp", + MAME_DIR .. "src/devices/bus/sat_ctrl/keybd.h", + MAME_DIR .. "src/devices/bus/sat_ctrl/mouse.cpp", + MAME_DIR .. "src/devices/bus/sat_ctrl/mouse.h", + MAME_DIR .. "src/devices/bus/sat_ctrl/multitap.cpp", + MAME_DIR .. "src/devices/bus/sat_ctrl/multitap.h", + MAME_DIR .. "src/devices/bus/sat_ctrl/pointer.cpp", + MAME_DIR .. "src/devices/bus/sat_ctrl/pointer.h", + MAME_DIR .. "src/devices/bus/sat_ctrl/racing.cpp", + MAME_DIR .. "src/devices/bus/sat_ctrl/racing.h", + MAME_DIR .. "src/devices/bus/sat_ctrl/segatap.cpp", + MAME_DIR .. "src/devices/bus/sat_ctrl/segatap.h", + } +end + +--------------------------------------------------- +-- --@src/devices/bus/saturn/sat_slot.h,BUSES["SATURN"] = true --------------------------------------------------- @@ -2027,8 +2098,6 @@ if (BUSES["TI99X"]~=null) then MAME_DIR .. "src/devices/bus/ti99x/datamux.h", MAME_DIR .. "src/devices/bus/ti99x/genboard.cpp", MAME_DIR .. "src/devices/bus/ti99x/genboard.h", - MAME_DIR .. "src/devices/bus/ti99x/grom.cpp", - MAME_DIR .. "src/devices/bus/ti99x/grom.h", MAME_DIR .. "src/devices/bus/ti99x/gromport.cpp", MAME_DIR .. "src/devices/bus/ti99x/gromport.h", MAME_DIR .. "src/devices/bus/ti99x/handset.cpp", @@ -2038,8 +2107,6 @@ if (BUSES["TI99X"]~=null) then MAME_DIR .. "src/devices/bus/ti99x/mecmouse.cpp", MAME_DIR .. "src/devices/bus/ti99x/mecmouse.h", MAME_DIR .. "src/devices/bus/ti99x/ti99defs.h", - MAME_DIR .. "src/devices/bus/ti99x/videowrp.cpp", - MAME_DIR .. "src/devices/bus/ti99x/videowrp.h", } end @@ -2452,6 +2519,8 @@ if (BUSES["VTECH_MEMEXP"]~=null) then MAME_DIR .. "src/devices/bus/vtech/memexp/memory.h", MAME_DIR .. "src/devices/bus/vtech/memexp/rs232.cpp", MAME_DIR .. "src/devices/bus/vtech/memexp/rs232.h", + MAME_DIR .. "src/devices/bus/vtech/memexp/rtty.cpp", + MAME_DIR .. "src/devices/bus/vtech/memexp/rtty.h", MAME_DIR .. "src/devices/bus/vtech/memexp/wordpro.cpp", MAME_DIR .. "src/devices/bus/vtech/memexp/wordpro.h", } @@ -2572,3 +2641,75 @@ if (BUSES["M5"]~=null) then } end +--------------------------------------------------- +-- +--@src/devices/bus/newbrain/exp.h,BUSES["NEWBRAIN"] = true +--------------------------------------------------- + +if (BUSES["NEWBRAIN"]~=null) then + files { + MAME_DIR .. "src/devices/bus/newbrain/exp.cpp", + MAME_DIR .. "src/devices/bus/newbrain/exp.h", + MAME_DIR .. "src/devices/bus/newbrain/eim.cpp", + MAME_DIR .. "src/devices/bus/newbrain/eim.h", + MAME_DIR .. "src/devices/bus/newbrain/fdc.cpp", + MAME_DIR .. "src/devices/bus/newbrain/fdc.h", + } +end + +--------------------------------------------------- +-- +--@src/devices/bus/svi3x8/expander/expander.h,BUSES["SVI_EXPANDER"] = true +--------------------------------------------------- + +if (BUSES["SVI_EXPANDER"]~=null) then + files { + MAME_DIR .. "src/devices/bus/svi3x8/expander/expander.cpp", + MAME_DIR .. "src/devices/bus/svi3x8/expander/expander.h", + MAME_DIR .. "src/devices/bus/svi3x8/expander/modules.cpp", + MAME_DIR .. "src/devices/bus/svi3x8/expander/modules.h", + MAME_DIR .. "src/devices/bus/svi3x8/expander/sv601.cpp", + MAME_DIR .. "src/devices/bus/svi3x8/expander/sv601.h", + MAME_DIR .. "src/devices/bus/svi3x8/expander/sv602.cpp", + MAME_DIR .. "src/devices/bus/svi3x8/expander/sv602.h", + MAME_DIR .. "src/devices/bus/svi3x8/expander/sv603.cpp", + MAME_DIR .. "src/devices/bus/svi3x8/expander/sv603.h", + } +end + +--------------------------------------------------- +-- +--@src/devices/bus/svi3x8/slot/slot.h,BUSES["SVI_SLOT"] = true +--------------------------------------------------- + +if (BUSES["SVI_SLOT"]~=null) then + files { + MAME_DIR .. "src/devices/bus/svi3x8/slot/slot.cpp", + MAME_DIR .. "src/devices/bus/svi3x8/slot/slot.h", + MAME_DIR .. "src/devices/bus/svi3x8/slot/cards.cpp", + MAME_DIR .. "src/devices/bus/svi3x8/slot/cards.h", + MAME_DIR .. "src/devices/bus/svi3x8/slot/sv801.cpp", + MAME_DIR .. "src/devices/bus/svi3x8/slot/sv801.h", + MAME_DIR .. "src/devices/bus/svi3x8/slot/sv802.cpp", + MAME_DIR .. "src/devices/bus/svi3x8/slot/sv802.h", + MAME_DIR .. "src/devices/bus/svi3x8/slot/sv803.cpp", + MAME_DIR .. "src/devices/bus/svi3x8/slot/sv803.h", + MAME_DIR .. "src/devices/bus/svi3x8/slot/sv805.cpp", + MAME_DIR .. "src/devices/bus/svi3x8/slot/sv805.h", + MAME_DIR .. "src/devices/bus/svi3x8/slot/sv806.cpp", + MAME_DIR .. "src/devices/bus/svi3x8/slot/sv806.h", + MAME_DIR .. "src/devices/bus/svi3x8/slot/sv807.cpp", + MAME_DIR .. "src/devices/bus/svi3x8/slot/sv807.h", + } +end + +--------------------------------------------------- +-- +--@src/devices/bus/hp_optroms/hp_optrom.h,BUSES["HP_OPTROM"] = true +--------------------------------------------------- + +if (BUSES["HP_OPTROM"]~=null) then + files { + MAME_DIR .. "src/devices/bus/hp_optroms/hp_optrom.cpp", + } +end diff --git a/docs/release/scripts/src/cpu.lua b/docs/release/scripts/src/cpu.lua index ed6378f93f8..2590dea1c93 100644 --- a/docs/release/scripts/src/cpu.lua +++ b/docs/release/scripts/src/cpu.lua @@ -35,7 +35,7 @@ if (CPUS["SH2"]~=null or CPUS["MIPS"]~=null or CPUS["POWERPC"]~=null or CPUS["RS MAME_DIR .. "src/devices/cpu/drcbex64.cpp", MAME_DIR .. "src/devices/cpu/drcbex64.h", MAME_DIR .. "src/devices/cpu/drcumlsh.h", - MAME_DIR .. "src/devices/cpu/x86emit.h", + MAME_DIR .. "src/devices/cpu/x86emit.h", } end @@ -86,7 +86,7 @@ if (CPUS["ARCOMPACT"]~=null) then MAME_DIR .. "src/devices/cpu/arcompact/arcompact_common.h", } dependency { - { MAME_DIR .. "src/devices/cpu/arcompact/arcompact.cpp", GEN_DIR .. "emu/cpu/arcompact/arcompact.inc" }, + { MAME_DIR .. "src/devices/cpu/arcompact/arcompact.cpp", GEN_DIR .. "emu/cpu/arcompact/arcompact.inc" }, { MAME_DIR .. "src/devices/cpu/arcompact/arcompact_execute.cpp", GEN_DIR .. "emu/cpu/arcompact/arcompact.inc" }, } @@ -577,7 +577,7 @@ if (CPUS["H8"]~=null) then MAME_DIR .. "src/devices/cpu/h8/h8_sci.cpp", MAME_DIR .. "src/devices/cpu/h8/h8_sci.h", } - + dependency { { MAME_DIR .. "src/devices/cpu/h8/h8.cpp", GEN_DIR .. "emu/cpu/h8/h8.inc" }, { MAME_DIR .. "src/devices/cpu/h8/h8h.cpp", GEN_DIR .. "emu/cpu/h8/h8h.inc" }, @@ -950,7 +950,7 @@ end if (CPUS["I960"]~=null) then files { MAME_DIR .. "src/devices/cpu/i960/i960.cpp", - MAME_DIR .. "src/devices/cpu/i960/i960.h", + MAME_DIR .. "src/devices/cpu/i960/i960.h", } end @@ -1163,7 +1163,7 @@ if (CPUS["M37710"]~=null) then MAME_DIR .. "src/devices/cpu/m37710/m37710cm.h", MAME_DIR .. "src/devices/cpu/m37710/m37710il.h", MAME_DIR .. "src/devices/cpu/m37710/m37710op.h", - MAME_DIR .. "src/devices/cpu/m37710/m7700ds.h", + MAME_DIR .. "src/devices/cpu/m37710/m7700ds.h", } end @@ -1233,7 +1233,7 @@ if (CPUS["M6502"]~=null) then MAME_DIR .. "src/devices/cpu/m6502/m5074x.cpp", MAME_DIR .. "src/devices/cpu/m6502/m5074x.h", } - + dependency { { MAME_DIR .. "src/devices/cpu/m6502/deco16.cpp", GEN_DIR .. "emu/cpu/m6502/deco16.inc" }, { MAME_DIR .. "src/devices/cpu/m6502/m4510.cpp", GEN_DIR .. "emu/cpu/m6502/m4510.inc" }, @@ -1432,14 +1432,14 @@ end -------------------------------------------------- if (CPUS["PATINHOFEIO"]~=null) then - files { - MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio.cpp", - MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio.h", - } + files { + MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio.cpp", + MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio.h", + } end if (CPUS["PATINHOFEIO"]~=null or _OPTIONS["with-tools"]) then - table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio_dasm.cpp") + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/patinhofeio/patinho_feio_dasm.cpp") end -------------------------------------------------- @@ -1465,6 +1465,8 @@ end -------------------------------------------------- -- NEC V-series Intel-compatible --@src/devices/cpu/nec/nec.h,CPUS["NEC"] = true +--@src/devices/cpu/nec/v25.h,CPUS["NEC"] = true +--@src/devices/cpu/nec/v53.h,CPUS["NEC"] = true --@src/devices/cpu/v30mz/v30mz.h,CPUS["V30MZ"] = true -------------------------------------------------- @@ -1612,7 +1614,7 @@ if (CPUS["MINX"]~=null) then MAME_DIR .. "src/devices/cpu/minx/minxfunc.h", MAME_DIR .. "src/devices/cpu/minx/minxopce.h", MAME_DIR .. "src/devices/cpu/minx/minxopcf.h", - MAME_DIR .. "src/devices/cpu/minx/minxops.h", + MAME_DIR .. "src/devices/cpu/minx/minxops.h", } end @@ -1696,7 +1698,7 @@ if (CPUS["SATURN"]~=null) then MAME_DIR .. "src/devices/cpu/saturn/saturn.cpp", MAME_DIR .. "src/devices/cpu/saturn/saturn.h", MAME_DIR .. "src/devices/cpu/saturn/satops.inc", - MAME_DIR .. "src/devices/cpu/saturn/sattable.inc", + MAME_DIR .. "src/devices/cpu/saturn/sattable.inc", } end @@ -1716,6 +1718,12 @@ if (CPUS["SM510"]~=null) then MAME_DIR .. "src/devices/cpu/sm510/sm510op.cpp", MAME_DIR .. "src/devices/cpu/sm510/sm510core.cpp", MAME_DIR .. "src/devices/cpu/sm510/sm511core.cpp", + MAME_DIR .. "src/devices/cpu/sm510/sm500.h", + MAME_DIR .. "src/devices/cpu/sm510/sm500op.cpp", + MAME_DIR .. "src/devices/cpu/sm510/sm500core.cpp", + MAME_DIR .. "src/devices/cpu/sm510/kb1013vk1-2.h", + MAME_DIR .. "src/devices/cpu/sm510/kb1013vk1-2op.cpp", + MAME_DIR .. "src/devices/cpu/sm510/kb1013vk1-2core.cpp", } end @@ -1842,19 +1850,39 @@ if (CPUS["AVR8"]~=null or _OPTIONS["with-tools"]) then end -------------------------------------------------- --- Texas Instruments TMS0980 ---@src/devices/cpu/tms0980/tms0980.h,CPUS["TMS0980"] = true +-- Texas Instruments TMS1000 series +--@src/devices/cpu/tms1000/tms1000.h,CPUS["TMS1000"] = true +--@src/devices/cpu/tms1000/tms1100.h,CPUS["TMS1000"] = true +--@src/devices/cpu/tms1000/tms1400.h,CPUS["TMS1000"] = true +--@src/devices/cpu/tms1000/tms0970.h,CPUS["TMS1000"] = true +--@src/devices/cpu/tms1000/tms0980.h,CPUS["TMS1000"] = true +--@src/devices/cpu/tms1000/tms0270.h,CPUS["TMS1000"] = true +--@src/devices/cpu/tms1000/tp0320.h,CPUS["TMS1000"] = true -------------------------------------------------- -if (CPUS["TMS0980"]~=null) then +if (CPUS["TMS1000"]~=null) then files { - MAME_DIR .. "src/devices/cpu/tms0980/tms0980.cpp", - MAME_DIR .. "src/devices/cpu/tms0980/tms0980.h", + MAME_DIR .. "src/devices/cpu/tms1000/tms1k_base.cpp", + MAME_DIR .. "src/devices/cpu/tms1000/tms1k_base.h", + MAME_DIR .. "src/devices/cpu/tms1000/tms1000.cpp", + MAME_DIR .. "src/devices/cpu/tms1000/tms1000.h", + MAME_DIR .. "src/devices/cpu/tms1000/tms1100.cpp", + MAME_DIR .. "src/devices/cpu/tms1000/tms1100.h", + MAME_DIR .. "src/devices/cpu/tms1000/tms1400.cpp", + MAME_DIR .. "src/devices/cpu/tms1000/tms1400.h", + MAME_DIR .. "src/devices/cpu/tms1000/tms0970.cpp", + MAME_DIR .. "src/devices/cpu/tms1000/tms0970.h", + MAME_DIR .. "src/devices/cpu/tms1000/tms0980.cpp", + MAME_DIR .. "src/devices/cpu/tms1000/tms0980.h", + MAME_DIR .. "src/devices/cpu/tms1000/tms0270.cpp", + MAME_DIR .. "src/devices/cpu/tms1000/tms0270.h", + MAME_DIR .. "src/devices/cpu/tms1000/tp0320.cpp", + MAME_DIR .. "src/devices/cpu/tms1000/tp0320.h", } end -if (CPUS["TMS0980"]~=null or _OPTIONS["with-tools"]) then - table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms0980/tms0980d.cpp") +if (CPUS["TMS1000"]~=null or _OPTIONS["with-tools"]) then + table.insert(disasm_files , MAME_DIR .. "src/devices/cpu/tms1000/tms1k_dasm.cpp") end -------------------------------------------------- @@ -1879,7 +1907,6 @@ end --@src/devices/cpu/tms9900/tms9900.h,CPUS["TMS9900"] = true --@src/devices/cpu/tms9900/tms9980a.h,CPUS["TMS9900"] = true --@src/devices/cpu/tms9900/tms9995.h,CPUS["TMS9900"] = true - -------------------------------------------------- if (CPUS["TMS9900"]~=null) then @@ -2024,7 +2051,7 @@ if (CPUS["TMS57002"]~=null) then { MAME_DIR .. "src/devices/cpu/tms57002/tms57kdec.cpp", GEN_DIR .. "emu/cpu/tms57002/tms57002.inc" }, { MAME_DIR .. "src/devices/cpu/tms57002/tms57002.cpp", GEN_DIR .. "emu/cpu/tms57002/tms57002.inc" }, } - custombuildtask { + custombuildtask { { MAME_DIR .. "src/devices/cpu/tms57002/tmsinstr.lst" , GEN_DIR .. "emu/cpu/tms57002/tms57002.inc", { MAME_DIR .. "src/devices/cpu/tms57002/tmsmake.py" }, {"@echo Generating TMS57002 source file...", PYTHON .. " $(1) $(<) $(@)" } } } end diff --git a/docs/release/scripts/src/devices.lua b/docs/release/scripts/src/devices.lua index 15e53a17cfb..1248bcc0fe5 100644 --- a/docs/release/scripts/src/devices.lua +++ b/docs/release/scripts/src/devices.lua @@ -37,17 +37,10 @@ function devicesProject(_target, _subtarget) MAME_DIR .. "3rdparty", GEN_DIR .. "emu", GEN_DIR .. "emu/layout", + ext_includedir("expat"), + ext_includedir("lua"), + ext_includedir("flac"), } - if _OPTIONS["with-bundled-expat"] then - includedirs { - MAME_DIR .. "3rdparty/expat/lib", - } - end - if _OPTIONS["with-bundled-lua"] then - includedirs { - MAME_DIR .. "3rdparty/lua/src", - } - end dofile(path.join("src", "cpu.lua")) @@ -57,44 +50,7 @@ function devicesProject(_target, _subtarget) dofile(path.join("src", "machine.lua")) -if (_OPTIONS["SOURCES"] == nil) then - project ("bus") - uuid ("5d782c89-cf7e-4cfe-8f9f-0d4bfc16c91d") - kind (LIBTYPE) - targetsubdir(_target .."_" .. _subtarget) - addprojectflags() - precompiledheaders() - options { - "ArchiveSplit", - } - - includedirs { - MAME_DIR .. "src/osd", - MAME_DIR .. "src/emu", - MAME_DIR .. "src/devices", - MAME_DIR .. "src/lib/netlist", - MAME_DIR .. "src/lib", - MAME_DIR .. "src/lib/util", - MAME_DIR .. "3rdparty", - MAME_DIR .. "src/mame", -- used for nes bus devices,some mess bus devices need this - GEN_DIR .. "emu", - GEN_DIR .. "emu/layout", - } - if _OPTIONS["with-bundled-expat"] then - includedirs { - MAME_DIR .. "3rdparty/expat/lib", - } - end - if _OPTIONS["with-bundled-lua"] then - includedirs { - MAME_DIR .. "3rdparty/lua/src", - } - end - dofile(path.join("src", "bus.lua")) -else - dofile(path.join("src", "bus.lua")) -end if #disasm_files > 0 then project ("dasm") @@ -112,17 +68,9 @@ if #disasm_files > 0 then MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", GEN_DIR .. "emu", + ext_includedir("expat"), + ext_includedir("lua"), } - if _OPTIONS["with-bundled-expat"] then - includedirs { - MAME_DIR .. "3rdparty/expat/lib", - } - end - if _OPTIONS["with-bundled-lua"] then - includedirs { - MAME_DIR .. "3rdparty/lua/src", - } - end files { disasm_files diff --git a/docs/release/scripts/src/emu.lua b/docs/release/scripts/src/emu.lua index c4bb8ece0cf..2fdefe75e3e 100644 --- a/docs/release/scripts/src/emu.lua +++ b/docs/release/scripts/src/emu.lua @@ -22,38 +22,23 @@ options { includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", - MAME_DIR .. "src/devices", -- till deps are fixed MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", GEN_DIR .. "emu", GEN_DIR .. "emu/layout", } -if _OPTIONS["with-bundled-expat"] then - includedirs { - MAME_DIR .. "3rdparty/expat/lib", - } -end -if _OPTIONS["with-bundled-lua"] then - includedirs { - MAME_DIR .. "3rdparty/lua/src", - } -end -if (_OPTIONS["targetos"] == "windows") then - defines { - "UI_WINDOWS", - } -end - -if (_OPTIONS["osd"] == "sdl") then - defines { - "UI_SDL", - } -end +includedirs { + ext_includedir("expat"), + ext_includedir("lua"), + ext_includedir("zlib"), + ext_includedir("flac"), +} files { MAME_DIR .. "src/emu/emu.h", + MAME_DIR .. "src/emu/main.h", MAME_DIR .. "src/emu/gamedrv.h", MAME_DIR .. "src/emu/hashfile.cpp", MAME_DIR .. "src/emu/hashfile.h", @@ -61,16 +46,8 @@ files { MAME_DIR .. "src/emu/addrmap.h", MAME_DIR .. "src/emu/attotime.cpp", MAME_DIR .. "src/emu/attotime.h", - MAME_DIR .. "src/emu/audit.cpp", - MAME_DIR .. "src/emu/audit.h", MAME_DIR .. "src/emu/bookkeeping.cpp", MAME_DIR .. "src/emu/bookkeeping.h", - MAME_DIR .. "src/emu/cheat.cpp", - MAME_DIR .. "src/emu/cheat.h", - MAME_DIR .. "src/emu/clifront.cpp", - MAME_DIR .. "src/emu/clifront.h", - MAME_DIR .. "src/emu/cliopts.cpp", - MAME_DIR .. "src/emu/cliopts.h", MAME_DIR .. "src/emu/config.cpp", MAME_DIR .. "src/emu/config.h", MAME_DIR .. "src/emu/crsshair.cpp", @@ -87,6 +64,7 @@ files { MAME_DIR .. "src/emu/devfind.h", MAME_DIR .. "src/emu/device.cpp", MAME_DIR .. "src/emu/device.h", + MAME_DIR .. "src/emu/device.ipp", MAME_DIR .. "src/emu/didisasm.cpp", MAME_DIR .. "src/emu/didisasm.h", MAME_DIR .. "src/emu/diexec.cpp", @@ -132,6 +110,8 @@ files { MAME_DIR .. "src/emu/emualloc.h", MAME_DIR .. "src/emu/emucore.cpp", MAME_DIR .. "src/emu/emucore.h", + MAME_DIR .. "src/emu/emumem.cpp", + MAME_DIR .. "src/emu/emumem.h", MAME_DIR .. "src/emu/emuopts.cpp", MAME_DIR .. "src/emu/emuopts.h", MAME_DIR .. "src/emu/emupal.cpp", @@ -142,31 +122,23 @@ files { MAME_DIR .. "src/emu/hash.h", MAME_DIR .. "src/emu/image.cpp", MAME_DIR .. "src/emu/image.h", - MAME_DIR .. "src/emu/info.cpp", - MAME_DIR .. "src/emu/info.h", MAME_DIR .. "src/emu/input.cpp", MAME_DIR .. "src/emu/input.h", MAME_DIR .. "src/emu/ioport.cpp", MAME_DIR .. "src/emu/ioport.h", MAME_DIR .. "src/emu/inpttype.h", - MAME_DIR .. "src/emu/luaengine.cpp", - MAME_DIR .. "src/emu/luaengine.h", - MAME_DIR .. "src/emu/language.cpp", - MAME_DIR .. "src/emu/language.h", - MAME_DIR .. "src/emu/mame.cpp", - MAME_DIR .. "src/emu/mame.h", MAME_DIR .. "src/emu/machine.cpp", MAME_DIR .. "src/emu/machine.h", MAME_DIR .. "src/emu/mconfig.cpp", MAME_DIR .. "src/emu/mconfig.h", MAME_DIR .. "src/emu/memarray.cpp", MAME_DIR .. "src/emu/memarray.h", - MAME_DIR .. "src/emu/memory.cpp", - MAME_DIR .. "src/emu/memory.h", MAME_DIR .. "src/emu/network.cpp", MAME_DIR .. "src/emu/network.h", MAME_DIR .. "src/emu/parameters.cpp", MAME_DIR .. "src/emu/parameters.h", + MAME_DIR .. "src/emu/profiler.cpp", + MAME_DIR .. "src/emu/profiler.h", MAME_DIR .. "src/emu/output.cpp", MAME_DIR .. "src/emu/output.h", MAME_DIR .. "src/emu/render.cpp", @@ -191,100 +163,20 @@ files { MAME_DIR .. "src/emu/sound.h", MAME_DIR .. "src/emu/speaker.cpp", MAME_DIR .. "src/emu/speaker.h", - MAME_DIR .. "src/emu/sprite.cpp", - MAME_DIR .. "src/emu/sprite.h", MAME_DIR .. "src/emu/tilemap.cpp", MAME_DIR .. "src/emu/tilemap.h", MAME_DIR .. "src/emu/timer.cpp", MAME_DIR .. "src/emu/timer.h", MAME_DIR .. "src/emu/uiinput.cpp", MAME_DIR .. "src/emu/uiinput.h", - MAME_DIR .. "src/emu/ui/ui.cpp", - MAME_DIR .. "src/emu/ui/ui.h", - MAME_DIR .. "src/emu/ui/devctrl.h", - MAME_DIR .. "src/emu/ui/menu.cpp", - MAME_DIR .. "src/emu/ui/menu.h", - MAME_DIR .. "src/emu/ui/mainmenu.cpp", - MAME_DIR .. "src/emu/ui/mainmenu.h", - MAME_DIR .. "src/emu/ui/miscmenu.cpp", - MAME_DIR .. "src/emu/ui/miscmenu.h", - MAME_DIR .. "src/emu/ui/barcode.cpp", - MAME_DIR .. "src/emu/ui/barcode.h", - MAME_DIR .. "src/emu/ui/cheatopt.cpp", - MAME_DIR .. "src/emu/ui/cheatopt.h", - MAME_DIR .. "src/emu/ui/devopt.cpp", - MAME_DIR .. "src/emu/ui/devopt.h", - MAME_DIR .. "src/emu/ui/filemngr.cpp", - MAME_DIR .. "src/emu/ui/filemngr.h", - MAME_DIR .. "src/emu/ui/filesel.cpp", - MAME_DIR .. "src/emu/ui/filesel.h", - MAME_DIR .. "src/emu/ui/imgcntrl.cpp", - MAME_DIR .. "src/emu/ui/imgcntrl.h", - MAME_DIR .. "src/emu/ui/info.cpp", - MAME_DIR .. "src/emu/ui/info.h", - MAME_DIR .. "src/emu/ui/info_pty.cpp", - MAME_DIR .. "src/emu/ui/info_pty.h", - MAME_DIR .. "src/emu/ui/inputmap.cpp", - MAME_DIR .. "src/emu/ui/inputmap.h", - MAME_DIR .. "src/emu/ui/sliders.cpp", - MAME_DIR .. "src/emu/ui/sliders.h", - MAME_DIR .. "src/emu/ui/slotopt.cpp", - MAME_DIR .. "src/emu/ui/slotopt.h", - MAME_DIR .. "src/emu/ui/swlist.cpp", - MAME_DIR .. "src/emu/ui/swlist.h", - MAME_DIR .. "src/emu/ui/tapectrl.cpp", - MAME_DIR .. "src/emu/ui/tapectrl.h", - MAME_DIR .. "src/emu/ui/videoopt.cpp", - MAME_DIR .. "src/emu/ui/videoopt.h", - MAME_DIR .. "src/emu/ui/viewgfx.cpp", - MAME_DIR .. "src/emu/ui/viewgfx.h", - MAME_DIR .. "src/emu/ui/auditmenu.cpp", - MAME_DIR .. "src/emu/ui/auditmenu.h", - MAME_DIR .. "src/emu/ui/cmddata.h", - MAME_DIR .. "src/emu/ui/cmdrender.h", - MAME_DIR .. "src/emu/ui/ctrlmenu.cpp", - MAME_DIR .. "src/emu/ui/ctrlmenu.h", - MAME_DIR .. "src/emu/ui/custmenu.cpp", - MAME_DIR .. "src/emu/ui/custmenu.h", - MAME_DIR .. "src/emu/ui/custui.cpp", - MAME_DIR .. "src/emu/ui/custui.h", - MAME_DIR .. "src/emu/ui/datfile.cpp", - MAME_DIR .. "src/emu/ui/datfile.h", - MAME_DIR .. "src/emu/ui/datmenu.cpp", - MAME_DIR .. "src/emu/ui/datmenu.h", - MAME_DIR .. "src/emu/ui/defimg.h", - MAME_DIR .. "src/emu/ui/dirmenu.cpp", - MAME_DIR .. "src/emu/ui/dirmenu.h", - MAME_DIR .. "src/emu/ui/dsplmenu.cpp", - MAME_DIR .. "src/emu/ui/dsplmenu.h", - MAME_DIR .. "src/emu/ui/icorender.h", - MAME_DIR .. "src/emu/ui/inifile.cpp", - MAME_DIR .. "src/emu/ui/inifile.h", - MAME_DIR .. "src/emu/ui/miscmenu.cpp", - MAME_DIR .. "src/emu/ui/miscmenu.h", - MAME_DIR .. "src/emu/ui/moptions.cpp", - MAME_DIR .. "src/emu/ui/moptions.h", - MAME_DIR .. "src/emu/ui/optsmenu.cpp", - MAME_DIR .. "src/emu/ui/optsmenu.h", - MAME_DIR .. "src/emu/ui/selector.cpp", - MAME_DIR .. "src/emu/ui/selector.h", - MAME_DIR .. "src/emu/ui/selgame.cpp", - MAME_DIR .. "src/emu/ui/selgame.h", - MAME_DIR .. "src/emu/ui/simpleselgame.cpp", - MAME_DIR .. "src/emu/ui/simpleselgame.h", - MAME_DIR .. "src/emu/ui/selsoft.cpp", - MAME_DIR .. "src/emu/ui/selsoft.h", - MAME_DIR .. "src/emu/ui/sndmenu.cpp", - MAME_DIR .. "src/emu/ui/sndmenu.h", - MAME_DIR .. "src/emu/ui/starimg.h", - MAME_DIR .. "src/emu/ui/toolbar.h", - MAME_DIR .. "src/emu/ui/utils.cpp", - MAME_DIR .. "src/emu/ui/utils.h", MAME_DIR .. "src/emu/validity.cpp", MAME_DIR .. "src/emu/validity.h", MAME_DIR .. "src/emu/video.cpp", MAME_DIR .. "src/emu/video.h", MAME_DIR .. "src/emu/rendersw.inc", + MAME_DIR .. "src/emu/ui/uimain.h", + MAME_DIR .. "src/emu/ui/cmdrender.h", -- TODO: remove + MAME_DIR .. "src/emu/ui/cmddata.h", -- TODO: remove MAME_DIR .. "src/emu/debug/debugcmd.cpp", MAME_DIR .. "src/emu/debug/debugcmd.h", MAME_DIR .. "src/emu/debug/debugcon.cpp", @@ -311,65 +203,8 @@ files { MAME_DIR .. "src/emu/debug/express.h", MAME_DIR .. "src/emu/debug/textbuf.cpp", MAME_DIR .. "src/emu/debug/textbuf.h", - MAME_DIR .. "src/emu/profiler.cpp", - MAME_DIR .. "src/emu/profiler.h", - MAME_DIR .. "src/emu/sound/filter.cpp", - MAME_DIR .. "src/emu/sound/filter.h", - MAME_DIR .. "src/devices/sound/flt_vol.cpp", - MAME_DIR .. "src/devices/sound/flt_vol.h", - MAME_DIR .. "src/devices/sound/flt_rc.cpp", - MAME_DIR .. "src/devices/sound/flt_rc.h", - MAME_DIR .. "src/emu/sound/wavwrite.cpp", - MAME_DIR .. "src/emu/sound/wavwrite.h", - MAME_DIR .. "src/devices/sound/samples.cpp", - MAME_DIR .. "src/devices/sound/samples.h", MAME_DIR .. "src/emu/drivers/empty.cpp", - MAME_DIR .. "src/emu/drivers/testcpu.cpp", MAME_DIR .. "src/emu/drivers/xtal.h", - MAME_DIR .. "src/devices/machine/bcreader.cpp", - MAME_DIR .. "src/devices/machine/bcreader.h", - MAME_DIR .. "src/devices/machine/buffer.cpp", - MAME_DIR .. "src/devices/machine/buffer.h", - MAME_DIR .. "src/devices/machine/clock.cpp", - MAME_DIR .. "src/devices/machine/clock.h", - MAME_DIR .. "src/devices/machine/keyboard.cpp", - MAME_DIR .. "src/devices/machine/keyboard.h", - MAME_DIR .. "src/devices/machine/laserdsc.cpp", - MAME_DIR .. "src/devices/machine/laserdsc.h", - MAME_DIR .. "src/devices/machine/latch.cpp", - MAME_DIR .. "src/devices/machine/latch.h", - MAME_DIR .. "src/devices/machine/nvram.cpp", - MAME_DIR .. "src/devices/machine/nvram.h", - MAME_DIR .. "src/devices/machine/ram.cpp", - MAME_DIR .. "src/devices/machine/ram.h", - MAME_DIR .. "src/devices/machine/legscsi.cpp", - MAME_DIR .. "src/devices/machine/legscsi.h", - MAME_DIR .. "src/devices/machine/terminal.cpp", - MAME_DIR .. "src/devices/machine/terminal.h", - MAME_DIR .. "src/devices/imagedev/bitbngr.cpp", - MAME_DIR .. "src/devices/imagedev/bitbngr.h", - MAME_DIR .. "src/devices/imagedev/cassette.cpp", - MAME_DIR .. "src/devices/imagedev/cassette.h", - MAME_DIR .. "src/devices/imagedev/chd_cd.cpp", - MAME_DIR .. "src/devices/imagedev/chd_cd.h", - MAME_DIR .. "src/devices/imagedev/diablo.cpp", - MAME_DIR .. "src/devices/imagedev/diablo.h", - MAME_DIR .. "src/devices/imagedev/flopdrv.cpp", - MAME_DIR .. "src/devices/imagedev/flopdrv.h", - MAME_DIR .. "src/devices/imagedev/floppy.cpp", - MAME_DIR .. "src/devices/imagedev/floppy.h", - MAME_DIR .. "src/devices/imagedev/harddriv.cpp", - MAME_DIR .. "src/devices/imagedev/harddriv.h", - MAME_DIR .. "src/devices/imagedev/mfmhd.cpp", - MAME_DIR .. "src/devices/imagedev/mfmhd.h", - MAME_DIR .. "src/devices/imagedev/midiin.cpp", - MAME_DIR .. "src/devices/imagedev/midiin.h", - MAME_DIR .. "src/devices/imagedev/midiout.cpp", - MAME_DIR .. "src/devices/imagedev/midiout.h", - MAME_DIR .. "src/devices/imagedev/printer.cpp", - MAME_DIR .. "src/devices/imagedev/printer.h", - MAME_DIR .. "src/devices/imagedev/snapquik.cpp", - MAME_DIR .. "src/devices/imagedev/snapquik.h", MAME_DIR .. "src/emu/video/generic.cpp", MAME_DIR .. "src/emu/video/generic.h", MAME_DIR .. "src/emu/video/resnet.cpp", @@ -381,9 +216,6 @@ files { MAME_DIR .. "src/emu/video/rgbsse.h", MAME_DIR .. "src/emu/video/rgbvmx.cpp", MAME_DIR .. "src/emu/video/rgbvmx.h", - MAME_DIR .. "src/emu/video/vector.cpp", - MAME_DIR .. "src/emu/video/vector.h", - MAME_DIR .. "src/devices/video/poly.h", } dependency { @@ -404,6 +236,7 @@ dependency { { MAME_DIR .. "src/emu/rendlay.cpp", GEN_DIR .. "emu/layout/vertical.lh" }, { MAME_DIR .. "src/emu/rendlay.cpp", GEN_DIR .. "emu/layout/lcd.lh" }, { MAME_DIR .. "src/emu/rendlay.cpp", GEN_DIR .. "emu/layout/lcd_rot.lh" }, + { MAME_DIR .. "src/emu/rendlay.cpp", GEN_DIR .. "emu/layout/svg.lh" }, { MAME_DIR .. "src/emu/rendlay.cpp", GEN_DIR .. "emu/layout/noscreens.lh" }, { MAME_DIR .. "src/emu/video.cpp", GEN_DIR .. "emu/layout/snap.lh" }, @@ -411,8 +244,11 @@ dependency { } custombuildtask { - { MAME_DIR .. "src/emu/uismall.png" , GEN_DIR .. "emu/uismall.fh", { MAME_DIR.. "scripts/build/png2bdc.py", MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting uismall.png...", PYTHON .. " $(1) $(<) temp.bdc", PYTHON .. " $(2) temp.bdc $(@) font_uismall UINT8" }}, - { MAME_DIR .. "src/emu/ui/uicmd14.png" , GEN_DIR .. "emu/ui/uicmd14.fh", { MAME_DIR.. "scripts/build/png2bdc.py", MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting uicmd14.png...", PYTHON .. " $(1) $(<) temp_cmd.bdc", PYTHON .. " $(2) temp_cmd.bdc $(@) font_uicmd14 UINT8" }}, + { MAME_DIR .. "scripts/font/NotoSans-Bold.bdc", GEN_DIR .. "emu/uismall.fh", { MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting NotoSans-Bold.bdc...", PYTHON .. " $(1) $(<) $(@) font_uismall UINT8" }}, +} + +custombuildtask { + { MAME_DIR .. "src/frontend/mame/ui/uicmd14.png" , GEN_DIR .. "emu/ui/uicmd14.fh", { MAME_DIR.. "scripts/build/png2bdc.py", MAME_DIR .. "scripts/build/file2str.py" }, {"@echo Converting uicmd14.png...", PYTHON .. " $(1) $(<) temp_cmd.bdc", PYTHON .. " $(2) temp_cmd.bdc $(@) font_uicmd14 UINT8" }}, layoutbuildtask("emu/layout", "dualhovu"), layoutbuildtask("emu/layout", "dualhsxs"), @@ -423,6 +259,7 @@ custombuildtask { layoutbuildtask("emu/layout", "vertical"), layoutbuildtask("emu/layout", "lcd"), layoutbuildtask("emu/layout", "lcd_rot"), + layoutbuildtask("emu/layout", "svg"), layoutbuildtask("emu/layout", "noscreens"), layoutbuildtask("emu/layout", "snap"), } @@ -438,12 +275,7 @@ precompiledheaders() includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", - MAME_DIR .. "src/devices", -- till deps are fixed - MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", - MAME_DIR .. "3rdparty", - GEN_DIR .. "emu", - GEN_DIR .. "emu/layout", } files { MAME_DIR .. "src/emu/drivers/empty.cpp", diff --git a/docs/release/scripts/src/lib.lua b/docs/release/scripts/src/lib.lua index 7620389f5dc..aacd4da54d4 100644 --- a/docs/release/scripts/src/lib.lua +++ b/docs/release/scripts/src/lib.lua @@ -19,17 +19,10 @@ project "utils" MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", + ext_includedir("expat"), + ext_includedir("zlib"), + ext_includedir("flac"), } - if _OPTIONS["with-bundled-expat"] then - includedirs { - MAME_DIR .. "3rdparty/expat/lib", - } - end - if _OPTIONS["with-bundled-zlib"] then - includedirs { - MAME_DIR .. "3rdparty/zlib", - } - end files { MAME_DIR .. "src/lib/util/bitstream.h", @@ -71,6 +64,7 @@ project "utils" MAME_DIR .. "src/lib/util/jedparse.h", MAME_DIR .. "src/lib/util/md5.cpp", MAME_DIR .. "src/lib/util/md5.h", + MAME_DIR .. "src/lib/util/nanosvg.cpp", MAME_DIR .. "src/lib/util/opresolv.cpp", MAME_DIR .. "src/lib/util/opresolv.h", MAME_DIR .. "src/lib/util/options.cpp", @@ -85,6 +79,7 @@ project "utils" MAME_DIR .. "src/lib/util/pool.h", MAME_DIR .. "src/lib/util/sha1.cpp", MAME_DIR .. "src/lib/util/sha1.h", + MAME_DIR .. "src/lib/util/strformat.h", MAME_DIR .. "src/lib/util/tagmap.h", MAME_DIR .. "src/lib/util/unicode.cpp", MAME_DIR .. "src/lib/util/unicode.h", @@ -94,6 +89,9 @@ project "utils" MAME_DIR .. "src/lib/util/un7z.h", MAME_DIR .. "src/lib/util/vbiparse.cpp", MAME_DIR .. "src/lib/util/vbiparse.h", + MAME_DIR .. "src/lib/util/vecstream.h", + MAME_DIR .. "src/lib/util/wavwrite.cpp", + MAME_DIR .. "src/lib/util/wavwrite.h", MAME_DIR .. "src/lib/util/xmlfile.cpp", MAME_DIR .. "src/lib/util/xmlfile.h", MAME_DIR .. "src/lib/util/zippath.cpp", @@ -117,17 +115,12 @@ project "formats" MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", + ext_includedir("zlib"), } - if _OPTIONS["with-bundled-zlib"] then - includedirs { - MAME_DIR .. "3rdparty/zlib", - } - end - files { - MAME_DIR .. "src/lib/formats/2d_dsk.cpp", - MAME_DIR .. "src/lib/formats/2d_dsk.h", +-- MAME_DIR .. "src/lib/formats/2d_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/2d_dsk.h", MAME_DIR .. "src/lib/formats/cassimg.cpp", MAME_DIR .. "src/lib/formats/cassimg.h", MAME_DIR .. "src/lib/formats/flopimg.cpp", @@ -136,299 +129,299 @@ project "formats" MAME_DIR .. "src/lib/formats/imageutl.h", MAME_DIR .. "src/lib/formats/ioprocs.cpp", MAME_DIR .. "src/lib/formats/ioprocs.h", - MAME_DIR .. "src/lib/formats/basicdsk.cpp", - MAME_DIR .. "src/lib/formats/basicdsk.h", - MAME_DIR .. "src/lib/formats/a26_cas.cpp", - MAME_DIR .. "src/lib/formats/a26_cas.h", - MAME_DIR .. "src/lib/formats/a5105_dsk.cpp", - MAME_DIR .. "src/lib/formats/a5105_dsk.h", - MAME_DIR .. "src/lib/formats/abc800_dsk.cpp", - MAME_DIR .. "src/lib/formats/abc800_dsk.h", - MAME_DIR .. "src/lib/formats/abcfd2_dsk.cpp", - MAME_DIR .. "src/lib/formats/abcfd2_dsk.h", - MAME_DIR .. "src/lib/formats/ace_tap.cpp", - MAME_DIR .. "src/lib/formats/ace_tap.h", - MAME_DIR .. "src/lib/formats/adam_cas.cpp", - MAME_DIR .. "src/lib/formats/adam_cas.h", - MAME_DIR .. "src/lib/formats/adam_dsk.cpp", - MAME_DIR .. "src/lib/formats/adam_dsk.h", - MAME_DIR .. "src/lib/formats/ami_dsk.cpp", - MAME_DIR .. "src/lib/formats/ami_dsk.h", - MAME_DIR .. "src/lib/formats/ap2_dsk.cpp", - MAME_DIR .. "src/lib/formats/ap2_dsk.h", - MAME_DIR .. "src/lib/formats/apf_apt.cpp", - MAME_DIR .. "src/lib/formats/apf_apt.h", - MAME_DIR .. "src/lib/formats/apridisk.cpp", - MAME_DIR .. "src/lib/formats/apridisk.h", - MAME_DIR .. "src/lib/formats/apollo_dsk.cpp", - MAME_DIR .. "src/lib/formats/apollo_dsk.h", - MAME_DIR .. "src/lib/formats/ap_dsk35.cpp", - MAME_DIR .. "src/lib/formats/ap_dsk35.h", - MAME_DIR .. "src/lib/formats/applix_dsk.cpp", - MAME_DIR .. "src/lib/formats/applix_dsk.h", - MAME_DIR .. "src/lib/formats/asst128_dsk.cpp", - MAME_DIR .. "src/lib/formats/asst128_dsk.h", - MAME_DIR .. "src/lib/formats/atari_dsk.cpp", - MAME_DIR .. "src/lib/formats/atari_dsk.h", - MAME_DIR .. "src/lib/formats/atom_dsk.cpp", - MAME_DIR .. "src/lib/formats/atom_dsk.h", - MAME_DIR .. "src/lib/formats/atom_tap.cpp", - MAME_DIR .. "src/lib/formats/atom_tap.h", - MAME_DIR .. "src/lib/formats/bbc_dsk.cpp", - MAME_DIR .. "src/lib/formats/bbc_dsk.h", - MAME_DIR .. "src/lib/formats/bw2_dsk.cpp", - MAME_DIR .. "src/lib/formats/bw2_dsk.h", - MAME_DIR .. "src/lib/formats/bw12_dsk.cpp", - MAME_DIR .. "src/lib/formats/bw12_dsk.h", - MAME_DIR .. "src/lib/formats/c3040_dsk.cpp", - MAME_DIR .. "src/lib/formats/c3040_dsk.h", - MAME_DIR .. "src/lib/formats/c4040_dsk.cpp", - MAME_DIR .. "src/lib/formats/c4040_dsk.h", - MAME_DIR .. "src/lib/formats/c8280_dsk.cpp", - MAME_DIR .. "src/lib/formats/c8280_dsk.h", - MAME_DIR .. "src/lib/formats/camplynx_cas.cpp", - MAME_DIR .. "src/lib/formats/camplynx_cas.h", - MAME_DIR .. "src/lib/formats/camplynx_dsk.cpp", - MAME_DIR .. "src/lib/formats/camplynx_dsk.h", - MAME_DIR .. "src/lib/formats/cbm_crt.cpp", - MAME_DIR .. "src/lib/formats/cbm_crt.h", - MAME_DIR .. "src/lib/formats/cbm_tap.cpp", - MAME_DIR .. "src/lib/formats/cbm_tap.h", - MAME_DIR .. "src/lib/formats/ccvf_dsk.cpp", - MAME_DIR .. "src/lib/formats/ccvf_dsk.h", - MAME_DIR .. "src/lib/formats/cd90_640_dsk.cpp", - MAME_DIR .. "src/lib/formats/cd90_640_dsk.h", - MAME_DIR .. "src/lib/formats/cgen_cas.cpp", - MAME_DIR .. "src/lib/formats/cgen_cas.h", - MAME_DIR .. "src/lib/formats/cgenie_dsk.cpp", - MAME_DIR .. "src/lib/formats/cgenie_dsk.h", - MAME_DIR .. "src/lib/formats/coco_cas.cpp", - MAME_DIR .. "src/lib/formats/coco_cas.h", - MAME_DIR .. "src/lib/formats/comx35_dsk.cpp", - MAME_DIR .. "src/lib/formats/comx35_dsk.h", - MAME_DIR .. "src/lib/formats/concept_dsk.cpp", - MAME_DIR .. "src/lib/formats/concept_dsk.h", - MAME_DIR .. "src/lib/formats/coupedsk.cpp", - MAME_DIR .. "src/lib/formats/coupedsk.h", - MAME_DIR .. "src/lib/formats/cpis_dsk.cpp", - MAME_DIR .. "src/lib/formats/cpis_dsk.h", +-- MAME_DIR .. "src/lib/formats/basicdsk.cpp", +-- MAME_DIR .. "src/lib/formats/basicdsk.h", +-- MAME_DIR .. "src/lib/formats/a26_cas.cpp", +-- MAME_DIR .. "src/lib/formats/a26_cas.h", +-- MAME_DIR .. "src/lib/formats/a5105_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/a5105_dsk.h", +-- MAME_DIR .. "src/lib/formats/abc800_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/abc800_dsk.h", +-- MAME_DIR .. "src/lib/formats/abcfd2_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/abcfd2_dsk.h", +-- MAME_DIR .. "src/lib/formats/ace_tap.cpp", +-- MAME_DIR .. "src/lib/formats/ace_tap.h", +-- MAME_DIR .. "src/lib/formats/adam_cas.cpp", +-- MAME_DIR .. "src/lib/formats/adam_cas.h", +-- MAME_DIR .. "src/lib/formats/adam_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/adam_dsk.h", +-- MAME_DIR .. "src/lib/formats/ami_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/ami_dsk.h", +-- MAME_DIR .. "src/lib/formats/ap2_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/ap2_dsk.h", +-- MAME_DIR .. "src/lib/formats/apf_apt.cpp", +-- MAME_DIR .. "src/lib/formats/apf_apt.h", +-- MAME_DIR .. "src/lib/formats/apridisk.cpp", +-- MAME_DIR .. "src/lib/formats/apridisk.h", +-- MAME_DIR .. "src/lib/formats/apollo_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/apollo_dsk.h", +-- MAME_DIR .. "src/lib/formats/ap_dsk35.cpp", +-- MAME_DIR .. "src/lib/formats/ap_dsk35.h", +-- MAME_DIR .. "src/lib/formats/applix_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/applix_dsk.h", +-- MAME_DIR .. "src/lib/formats/asst128_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/asst128_dsk.h", +-- MAME_DIR .. "src/lib/formats/atari_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/atari_dsk.h", +-- MAME_DIR .. "src/lib/formats/atom_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/atom_dsk.h", +-- MAME_DIR .. "src/lib/formats/atom_tap.cpp", +-- MAME_DIR .. "src/lib/formats/atom_tap.h", +-- MAME_DIR .. "src/lib/formats/bbc_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/bbc_dsk.h", +-- MAME_DIR .. "src/lib/formats/bw2_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/bw2_dsk.h", +-- MAME_DIR .. "src/lib/formats/bw12_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/bw12_dsk.h", +-- MAME_DIR .. "src/lib/formats/c3040_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/c3040_dsk.h", +-- MAME_DIR .. "src/lib/formats/c4040_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/c4040_dsk.h", +-- MAME_DIR .. "src/lib/formats/c8280_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/c8280_dsk.h", +-- MAME_DIR .. "src/lib/formats/camplynx_cas.cpp", +-- MAME_DIR .. "src/lib/formats/camplynx_cas.h", +-- MAME_DIR .. "src/lib/formats/camplynx_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/camplynx_dsk.h", +-- MAME_DIR .. "src/lib/formats/cbm_crt.cpp", +-- MAME_DIR .. "src/lib/formats/cbm_crt.h", +-- MAME_DIR .. "src/lib/formats/cbm_tap.cpp", +-- MAME_DIR .. "src/lib/formats/cbm_tap.h", +-- MAME_DIR .. "src/lib/formats/ccvf_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/ccvf_dsk.h", +-- MAME_DIR .. "src/lib/formats/cd90_640_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/cd90_640_dsk.h", +-- MAME_DIR .. "src/lib/formats/cgen_cas.cpp", +-- MAME_DIR .. "src/lib/formats/cgen_cas.h", +-- MAME_DIR .. "src/lib/formats/cgenie_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/cgenie_dsk.h", +-- MAME_DIR .. "src/lib/formats/coco_cas.cpp", +-- MAME_DIR .. "src/lib/formats/coco_cas.h", +-- MAME_DIR .. "src/lib/formats/comx35_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/comx35_dsk.h", +-- MAME_DIR .. "src/lib/formats/concept_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/concept_dsk.h", +-- MAME_DIR .. "src/lib/formats/coupedsk.cpp", +-- MAME_DIR .. "src/lib/formats/coupedsk.h", +-- MAME_DIR .. "src/lib/formats/cpis_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/cpis_dsk.h", MAME_DIR .. "src/lib/formats/cqm_dsk.cpp", MAME_DIR .. "src/lib/formats/cqm_dsk.h", - MAME_DIR .. "src/lib/formats/csw_cas.cpp", - MAME_DIR .. "src/lib/formats/csw_cas.h", - MAME_DIR .. "src/lib/formats/d64_dsk.cpp", - MAME_DIR .. "src/lib/formats/d64_dsk.h", - MAME_DIR .. "src/lib/formats/d71_dsk.cpp", - MAME_DIR .. "src/lib/formats/d71_dsk.h", - MAME_DIR .. "src/lib/formats/d80_dsk.cpp", - MAME_DIR .. "src/lib/formats/d80_dsk.h", - MAME_DIR .. "src/lib/formats/d81_dsk.cpp", - MAME_DIR .. "src/lib/formats/d81_dsk.h", - MAME_DIR .. "src/lib/formats/d82_dsk.cpp", - MAME_DIR .. "src/lib/formats/d82_dsk.h", +-- MAME_DIR .. "src/lib/formats/csw_cas.cpp", +-- MAME_DIR .. "src/lib/formats/csw_cas.h", +-- MAME_DIR .. "src/lib/formats/d64_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/d64_dsk.h", +-- MAME_DIR .. "src/lib/formats/d71_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/d71_dsk.h", +-- MAME_DIR .. "src/lib/formats/d80_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/d80_dsk.h", +-- MAME_DIR .. "src/lib/formats/d81_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/d81_dsk.h", +-- MAME_DIR .. "src/lib/formats/d82_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/d82_dsk.h", MAME_DIR .. "src/lib/formats/d88_dsk.cpp", MAME_DIR .. "src/lib/formats/d88_dsk.h", - MAME_DIR .. "src/lib/formats/dcp_dsk.cpp", - MAME_DIR .. "src/lib/formats/dcp_dsk.h", +-- MAME_DIR .. "src/lib/formats/dcp_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/dcp_dsk.h", MAME_DIR .. "src/lib/formats/dfi_dsk.cpp", MAME_DIR .. "src/lib/formats/dfi_dsk.h", - MAME_DIR .. "src/lib/formats/dim_dsk.cpp", - MAME_DIR .. "src/lib/formats/dim_dsk.h", - MAME_DIR .. "src/lib/formats/dip_dsk.cpp", - MAME_DIR .. "src/lib/formats/dip_dsk.h", - MAME_DIR .. "src/lib/formats/dmk_dsk.cpp", - MAME_DIR .. "src/lib/formats/dmk_dsk.h", - MAME_DIR .. "src/lib/formats/dmv_dsk.cpp", - MAME_DIR .. "src/lib/formats/dmv_dsk.h", +-- MAME_DIR .. "src/lib/formats/dim_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/dim_dsk.h", +-- MAME_DIR .. "src/lib/formats/dip_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/dip_dsk.h", +-- MAME_DIR .. "src/lib/formats/dmk_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/dmk_dsk.h", +-- MAME_DIR .. "src/lib/formats/dmv_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/dmv_dsk.h", MAME_DIR .. "src/lib/formats/dsk_dsk.cpp", MAME_DIR .. "src/lib/formats/dsk_dsk.h", - MAME_DIR .. "src/lib/formats/ep64_dsk.cpp", - MAME_DIR .. "src/lib/formats/ep64_dsk.h", - MAME_DIR .. "src/lib/formats/esq8_dsk.cpp", - MAME_DIR .. "src/lib/formats/esq8_dsk.h", - MAME_DIR .. "src/lib/formats/esq16_dsk.cpp", - MAME_DIR .. "src/lib/formats/esq16_dsk.h", - MAME_DIR .. "src/lib/formats/excali64_dsk.cpp", - MAME_DIR .. "src/lib/formats/excali64_dsk.h", - MAME_DIR .. "src/lib/formats/fc100_cas.cpp", - MAME_DIR .. "src/lib/formats/fc100_cas.h", +-- MAME_DIR .. "src/lib/formats/ep64_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/ep64_dsk.h", +-- MAME_DIR .. "src/lib/formats/esq8_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/esq8_dsk.h", +-- MAME_DIR .. "src/lib/formats/esq16_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/esq16_dsk.h", +-- MAME_DIR .. "src/lib/formats/excali64_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/excali64_dsk.h", +-- MAME_DIR .. "src/lib/formats/fc100_cas.cpp", +-- MAME_DIR .. "src/lib/formats/fc100_cas.h", MAME_DIR .. "src/lib/formats/fdi_dsk.cpp", MAME_DIR .. "src/lib/formats/fdd_dsk.cpp", - MAME_DIR .. "src/lib/formats/fdd_dsk.h", - MAME_DIR .. "src/lib/formats/flex_dsk.cpp", - MAME_DIR .. "src/lib/formats/flex_dsk.h", - MAME_DIR .. "src/lib/formats/fm7_cas.cpp", - MAME_DIR .. "src/lib/formats/fm7_cas.h", - MAME_DIR .. "src/lib/formats/fmsx_cas.cpp", - MAME_DIR .. "src/lib/formats/fmsx_cas.h", - MAME_DIR .. "src/lib/formats/fmtowns_dsk.cpp", - MAME_DIR .. "src/lib/formats/fmtowns_dsk.h", - MAME_DIR .. "src/lib/formats/fsd_dsk.cpp", - MAME_DIR .. "src/lib/formats/fsd_dsk.h", - MAME_DIR .. "src/lib/formats/g64_dsk.cpp", - MAME_DIR .. "src/lib/formats/g64_dsk.h", - MAME_DIR .. "src/lib/formats/gtp_cas.cpp", - MAME_DIR .. "src/lib/formats/gtp_cas.h", - MAME_DIR .. "src/lib/formats/guab_dsk.cpp", - MAME_DIR .. "src/lib/formats/guab_dsk.h", - MAME_DIR .. "src/lib/formats/hect_dsk.cpp", - MAME_DIR .. "src/lib/formats/hect_dsk.h", - MAME_DIR .. "src/lib/formats/hect_tap.cpp", - MAME_DIR .. "src/lib/formats/hect_tap.h", - MAME_DIR .. "src/lib/formats/hector_minidisc.cpp", - MAME_DIR .. "src/lib/formats/hector_minidisc.h", - MAME_DIR .. "src/lib/formats/iq151_dsk.cpp", - MAME_DIR .. "src/lib/formats/iq151_dsk.h", +-- MAME_DIR .. "src/lib/formats/fdd_dsk.h", +-- MAME_DIR .. "src/lib/formats/flex_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/flex_dsk.h", +-- MAME_DIR .. "src/lib/formats/fm7_cas.cpp", +-- MAME_DIR .. "src/lib/formats/fm7_cas.h", +-- MAME_DIR .. "src/lib/formats/fmsx_cas.cpp", +-- MAME_DIR .. "src/lib/formats/fmsx_cas.h", +-- MAME_DIR .. "src/lib/formats/fmtowns_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/fmtowns_dsk.h", +-- MAME_DIR .. "src/lib/formats/fsd_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/fsd_dsk.h", +-- MAME_DIR .. "src/lib/formats/g64_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/g64_dsk.h", +-- MAME_DIR .. "src/lib/formats/gtp_cas.cpp", +-- MAME_DIR .. "src/lib/formats/gtp_cas.h", +-- MAME_DIR .. "src/lib/formats/guab_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/guab_dsk.h", +-- MAME_DIR .. "src/lib/formats/hect_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/hect_dsk.h", +-- MAME_DIR .. "src/lib/formats/hect_tap.cpp", +-- MAME_DIR .. "src/lib/formats/hect_tap.h", +-- MAME_DIR .. "src/lib/formats/hector_minidisc.cpp", +-- MAME_DIR .. "src/lib/formats/hector_minidisc.h", +-- MAME_DIR .. "src/lib/formats/iq151_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/iq151_dsk.h", MAME_DIR .. "src/lib/formats/imd_dsk.cpp", MAME_DIR .. "src/lib/formats/imd_dsk.h", MAME_DIR .. "src/lib/formats/ipf_dsk.cpp", MAME_DIR .. "src/lib/formats/ipf_dsk.h", - MAME_DIR .. "src/lib/formats/jvc_dsk.cpp", - MAME_DIR .. "src/lib/formats/jvc_dsk.h", - MAME_DIR .. "src/lib/formats/kaypro_dsk.cpp", - MAME_DIR .. "src/lib/formats/kaypro_dsk.h", - MAME_DIR .. "src/lib/formats/kc_cas.cpp", - MAME_DIR .. "src/lib/formats/kc_cas.h", - MAME_DIR .. "src/lib/formats/kc85_dsk.cpp", - MAME_DIR .. "src/lib/formats/kc85_dsk.h", - MAME_DIR .. "src/lib/formats/kim1_cas.cpp", - MAME_DIR .. "src/lib/formats/kim1_cas.h", - MAME_DIR .. "src/lib/formats/lviv_lvt.cpp", - MAME_DIR .. "src/lib/formats/lviv_lvt.h", - MAME_DIR .. "src/lib/formats/m20_dsk.cpp", - MAME_DIR .. "src/lib/formats/m20_dsk.h", - MAME_DIR .. "src/lib/formats/m5_dsk.cpp", - MAME_DIR .. "src/lib/formats/m5_dsk.h", - MAME_DIR .. "src/lib/formats/mbee_cas.cpp", - MAME_DIR .. "src/lib/formats/mbee_cas.h", - MAME_DIR .. "src/lib/formats/mm_dsk.cpp", - MAME_DIR .. "src/lib/formats/mm_dsk.h", - MAME_DIR .. "src/lib/formats/msx_dsk.cpp", - MAME_DIR .. "src/lib/formats/msx_dsk.h", +-- MAME_DIR .. "src/lib/formats/jvc_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/jvc_dsk.h", +-- MAME_DIR .. "src/lib/formats/kaypro_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/kaypro_dsk.h", +-- MAME_DIR .. "src/lib/formats/kc_cas.cpp", +-- MAME_DIR .. "src/lib/formats/kc_cas.h", +-- MAME_DIR .. "src/lib/formats/kc85_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/kc85_dsk.h", +-- MAME_DIR .. "src/lib/formats/kim1_cas.cpp", +-- MAME_DIR .. "src/lib/formats/kim1_cas.h", +-- MAME_DIR .. "src/lib/formats/lviv_lvt.cpp", +-- MAME_DIR .. "src/lib/formats/lviv_lvt.h", +-- MAME_DIR .. "src/lib/formats/m20_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/m20_dsk.h", +-- MAME_DIR .. "src/lib/formats/m5_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/m5_dsk.h", +-- MAME_DIR .. "src/lib/formats/mbee_cas.cpp", +-- MAME_DIR .. "src/lib/formats/mbee_cas.h", +-- MAME_DIR .. "src/lib/formats/mm_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/mm_dsk.h", +-- MAME_DIR .. "src/lib/formats/msx_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/msx_dsk.h", MAME_DIR .. "src/lib/formats/mfi_dsk.cpp", MAME_DIR .. "src/lib/formats/mfi_dsk.h", - MAME_DIR .. "src/lib/formats/mfm_hd.cpp", - MAME_DIR .. "src/lib/formats/mfm_hd.h", - MAME_DIR .. "src/lib/formats/mz_cas.cpp", - MAME_DIR .. "src/lib/formats/mz_cas.h", - MAME_DIR .. "src/lib/formats/nanos_dsk.cpp", - MAME_DIR .. "src/lib/formats/nanos_dsk.h", - MAME_DIR .. "src/lib/formats/nascom_dsk.cpp", - MAME_DIR .. "src/lib/formats/nascom_dsk.h", - MAME_DIR .. "src/lib/formats/naslite_dsk.cpp", - MAME_DIR .. "src/lib/formats/naslite_dsk.h", - MAME_DIR .. "src/lib/formats/nes_dsk.cpp", - MAME_DIR .. "src/lib/formats/nes_dsk.h", - MAME_DIR .. "src/lib/formats/nfd_dsk.cpp", - MAME_DIR .. "src/lib/formats/nfd_dsk.h", - MAME_DIR .. "src/lib/formats/orao_cas.cpp", - MAME_DIR .. "src/lib/formats/orao_cas.h", - MAME_DIR .. "src/lib/formats/oric_dsk.cpp", - MAME_DIR .. "src/lib/formats/oric_dsk.h", - MAME_DIR .. "src/lib/formats/oric_tap.cpp", - MAME_DIR .. "src/lib/formats/oric_tap.h", - MAME_DIR .. "src/lib/formats/p6001_cas.cpp", - MAME_DIR .. "src/lib/formats/p6001_cas.h", - MAME_DIR .. "src/lib/formats/pasti_dsk.cpp", - MAME_DIR .. "src/lib/formats/pasti_dsk.h", - MAME_DIR .. "src/lib/formats/pc_dsk.cpp", - MAME_DIR .. "src/lib/formats/pc_dsk.h", - MAME_DIR .. "src/lib/formats/pc98_dsk.cpp", - MAME_DIR .. "src/lib/formats/pc98_dsk.h", - MAME_DIR .. "src/lib/formats/pc98fdi_dsk.cpp", - MAME_DIR .. "src/lib/formats/pc98fdi_dsk.h", - MAME_DIR .. "src/lib/formats/phc25_cas.cpp", - MAME_DIR .. "src/lib/formats/phc25_cas.h", - MAME_DIR .. "src/lib/formats/pk8020_dsk.cpp", - MAME_DIR .. "src/lib/formats/pk8020_dsk.h", - MAME_DIR .. "src/lib/formats/pmd_cas.cpp", - MAME_DIR .. "src/lib/formats/pmd_cas.h", - MAME_DIR .. "src/lib/formats/primoptp.cpp", - MAME_DIR .. "src/lib/formats/primoptp.h", - MAME_DIR .. "src/lib/formats/pyldin_dsk.cpp", - MAME_DIR .. "src/lib/formats/pyldin_dsk.h", - MAME_DIR .. "src/lib/formats/ql_dsk.cpp", - MAME_DIR .. "src/lib/formats/ql_dsk.h", - MAME_DIR .. "src/lib/formats/rk_cas.cpp", - MAME_DIR .. "src/lib/formats/rk_cas.h", - MAME_DIR .. "src/lib/formats/rx50_dsk.cpp", - MAME_DIR .. "src/lib/formats/rx50_dsk.h", - MAME_DIR .. "src/lib/formats/sc3000_bit.cpp", - MAME_DIR .. "src/lib/formats/sc3000_bit.h", - MAME_DIR .. "src/lib/formats/sf7000_dsk.cpp", - MAME_DIR .. "src/lib/formats/sf7000_dsk.h", - MAME_DIR .. "src/lib/formats/smx_dsk.cpp", - MAME_DIR .. "src/lib/formats/smx_dsk.h", - MAME_DIR .. "src/lib/formats/sol_cas.cpp", - MAME_DIR .. "src/lib/formats/sol_cas.h", - MAME_DIR .. "src/lib/formats/sorc_dsk.cpp", - MAME_DIR .. "src/lib/formats/sorc_dsk.h", - MAME_DIR .. "src/lib/formats/sorc_cas.cpp", - MAME_DIR .. "src/lib/formats/sorc_cas.h", - MAME_DIR .. "src/lib/formats/sord_cas.cpp", - MAME_DIR .. "src/lib/formats/sord_cas.h", - MAME_DIR .. "src/lib/formats/spc1000_cas.cpp", - MAME_DIR .. "src/lib/formats/spc1000_cas.h", - MAME_DIR .. "src/lib/formats/st_dsk.cpp", - MAME_DIR .. "src/lib/formats/st_dsk.h", - MAME_DIR .. "src/lib/formats/svi_cas.cpp", - MAME_DIR .. "src/lib/formats/svi_cas.h", - MAME_DIR .. "src/lib/formats/svi_dsk.cpp", - MAME_DIR .. "src/lib/formats/svi_dsk.h", - MAME_DIR .. "src/lib/formats/tandy2k_dsk.cpp", - MAME_DIR .. "src/lib/formats/tandy2k_dsk.h", +-- MAME_DIR .. "src/lib/formats/mfm_hd.cpp", +-- MAME_DIR .. "src/lib/formats/mfm_hd.h", +-- MAME_DIR .. "src/lib/formats/mz_cas.cpp", +-- MAME_DIR .. "src/lib/formats/mz_cas.h", +-- MAME_DIR .. "src/lib/formats/nanos_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/nanos_dsk.h", +-- MAME_DIR .. "src/lib/formats/nascom_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/nascom_dsk.h", +-- MAME_DIR .. "src/lib/formats/naslite_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/naslite_dsk.h", +-- MAME_DIR .. "src/lib/formats/nes_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/nes_dsk.h", +-- MAME_DIR .. "src/lib/formats/nfd_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/nfd_dsk.h", +-- MAME_DIR .. "src/lib/formats/orao_cas.cpp", +-- MAME_DIR .. "src/lib/formats/orao_cas.h", +-- MAME_DIR .. "src/lib/formats/oric_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/oric_dsk.h", +-- MAME_DIR .. "src/lib/formats/oric_tap.cpp", +-- MAME_DIR .. "src/lib/formats/oric_tap.h", +-- MAME_DIR .. "src/lib/formats/p6001_cas.cpp", +-- MAME_DIR .. "src/lib/formats/p6001_cas.h", +-- MAME_DIR .. "src/lib/formats/pasti_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/pasti_dsk.h", +-- MAME_DIR .. "src/lib/formats/pc_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/pc_dsk.h", +-- MAME_DIR .. "src/lib/formats/pc98_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/pc98_dsk.h", +-- MAME_DIR .. "src/lib/formats/pc98fdi_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/pc98fdi_dsk.h", +-- MAME_DIR .. "src/lib/formats/phc25_cas.cpp", +-- MAME_DIR .. "src/lib/formats/phc25_cas.h", +-- MAME_DIR .. "src/lib/formats/pk8020_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/pk8020_dsk.h", +-- MAME_DIR .. "src/lib/formats/pmd_cas.cpp", +-- MAME_DIR .. "src/lib/formats/pmd_cas.h", +-- MAME_DIR .. "src/lib/formats/primoptp.cpp", +-- MAME_DIR .. "src/lib/formats/primoptp.h", +-- MAME_DIR .. "src/lib/formats/pyldin_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/pyldin_dsk.h", +-- MAME_DIR .. "src/lib/formats/ql_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/ql_dsk.h", +-- MAME_DIR .. "src/lib/formats/rk_cas.cpp", +-- MAME_DIR .. "src/lib/formats/rk_cas.h", +-- MAME_DIR .. "src/lib/formats/rx50_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/rx50_dsk.h", +-- MAME_DIR .. "src/lib/formats/sc3000_bit.cpp", +-- MAME_DIR .. "src/lib/formats/sc3000_bit.h", +-- MAME_DIR .. "src/lib/formats/sf7000_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/sf7000_dsk.h", +-- MAME_DIR .. "src/lib/formats/smx_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/smx_dsk.h", +-- MAME_DIR .. "src/lib/formats/sol_cas.cpp", +-- MAME_DIR .. "src/lib/formats/sol_cas.h", +-- MAME_DIR .. "src/lib/formats/sorc_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/sorc_dsk.h", +-- MAME_DIR .. "src/lib/formats/sorc_cas.cpp", +-- MAME_DIR .. "src/lib/formats/sorc_cas.h", +-- MAME_DIR .. "src/lib/formats/sord_cas.cpp", +-- MAME_DIR .. "src/lib/formats/sord_cas.h", +-- MAME_DIR .. "src/lib/formats/spc1000_cas.cpp", +-- MAME_DIR .. "src/lib/formats/spc1000_cas.h", +-- MAME_DIR .. "src/lib/formats/st_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/st_dsk.h", +-- MAME_DIR .. "src/lib/formats/svi_cas.cpp", +-- MAME_DIR .. "src/lib/formats/svi_cas.h", +-- MAME_DIR .. "src/lib/formats/svi_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/svi_dsk.h", +-- MAME_DIR .. "src/lib/formats/tandy2k_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/tandy2k_dsk.h", MAME_DIR .. "src/lib/formats/td0_dsk.cpp", MAME_DIR .. "src/lib/formats/td0_dsk.h", - MAME_DIR .. "src/lib/formats/thom_cas.cpp", - MAME_DIR .. "src/lib/formats/thom_cas.h", - MAME_DIR .. "src/lib/formats/thom_dsk.cpp", - MAME_DIR .. "src/lib/formats/thom_dsk.h", - MAME_DIR .. "src/lib/formats/ti99_dsk.cpp", - MAME_DIR .. "src/lib/formats/ti99_dsk.h", - MAME_DIR .. "src/lib/formats/tiki100_dsk.cpp", - MAME_DIR .. "src/lib/formats/tiki100_dsk.h", - MAME_DIR .. "src/lib/formats/trd_dsk.cpp", - MAME_DIR .. "src/lib/formats/trd_dsk.h", - MAME_DIR .. "src/lib/formats/trs_cas.cpp", - MAME_DIR .. "src/lib/formats/trs_cas.h", - MAME_DIR .. "src/lib/formats/trs80_dsk.cpp", - MAME_DIR .. "src/lib/formats/trs80_dsk.h", - MAME_DIR .. "src/lib/formats/tvc_cas.cpp", - MAME_DIR .. "src/lib/formats/tvc_cas.h", - MAME_DIR .. "src/lib/formats/tvc_dsk.cpp", - MAME_DIR .. "src/lib/formats/tvc_dsk.h", - MAME_DIR .. "src/lib/formats/tzx_cas.cpp", - MAME_DIR .. "src/lib/formats/tzx_cas.h", - MAME_DIR .. "src/lib/formats/uef_cas.cpp", - MAME_DIR .. "src/lib/formats/uef_cas.h", - MAME_DIR .. "src/lib/formats/upd765_dsk.cpp", - MAME_DIR .. "src/lib/formats/upd765_dsk.h", - MAME_DIR .. "src/lib/formats/vdk_dsk.cpp", - MAME_DIR .. "src/lib/formats/vdk_dsk.h", - MAME_DIR .. "src/lib/formats/vector06_dsk.cpp", - MAME_DIR .. "src/lib/formats/vector06_dsk.h", - MAME_DIR .. "src/lib/formats/victor9k_dsk.cpp", - MAME_DIR .. "src/lib/formats/victor9k_dsk.h", - MAME_DIR .. "src/lib/formats/vg5k_cas.cpp", - MAME_DIR .. "src/lib/formats/vg5k_cas.h", - MAME_DIR .. "src/lib/formats/vt_cas.cpp", - MAME_DIR .. "src/lib/formats/vt_cas.h", +-- MAME_DIR .. "src/lib/formats/thom_cas.cpp", +-- MAME_DIR .. "src/lib/formats/thom_cas.h", +-- MAME_DIR .. "src/lib/formats/thom_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/thom_dsk.h", +-- MAME_DIR .. "src/lib/formats/ti99_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/ti99_dsk.h", +-- MAME_DIR .. "src/lib/formats/tiki100_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/tiki100_dsk.h", +-- MAME_DIR .. "src/lib/formats/trd_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/trd_dsk.h", +-- MAME_DIR .. "src/lib/formats/trs_cas.cpp", +-- MAME_DIR .. "src/lib/formats/trs_cas.h", +-- MAME_DIR .. "src/lib/formats/trs80_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/trs80_dsk.h", +-- MAME_DIR .. "src/lib/formats/tvc_cas.cpp", +-- MAME_DIR .. "src/lib/formats/tvc_cas.h", +-- MAME_DIR .. "src/lib/formats/tvc_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/tvc_dsk.h", +-- MAME_DIR .. "src/lib/formats/tzx_cas.cpp", +-- MAME_DIR .. "src/lib/formats/tzx_cas.h", +-- MAME_DIR .. "src/lib/formats/uef_cas.cpp", +-- MAME_DIR .. "src/lib/formats/uef_cas.h", +-- MAME_DIR .. "src/lib/formats/upd765_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/upd765_dsk.h", +-- MAME_DIR .. "src/lib/formats/vdk_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/vdk_dsk.h", +-- MAME_DIR .. "src/lib/formats/vector06_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/vector06_dsk.h", +-- MAME_DIR .. "src/lib/formats/victor9k_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/victor9k_dsk.h", +-- MAME_DIR .. "src/lib/formats/vg5k_cas.cpp", +-- MAME_DIR .. "src/lib/formats/vg5k_cas.h", +-- MAME_DIR .. "src/lib/formats/vt_cas.cpp", +-- MAME_DIR .. "src/lib/formats/vt_cas.h", MAME_DIR .. "src/lib/formats/wavfile.cpp", MAME_DIR .. "src/lib/formats/wavfile.h", - MAME_DIR .. "src/lib/formats/wd177x_dsk.cpp", - MAME_DIR .. "src/lib/formats/wd177x_dsk.h", - MAME_DIR .. "src/lib/formats/x07_cas.cpp", - MAME_DIR .. "src/lib/formats/x07_cas.h", - MAME_DIR .. "src/lib/formats/x1_tap.cpp", - MAME_DIR .. "src/lib/formats/x1_tap.h", - MAME_DIR .. "src/lib/formats/xdf_dsk.cpp", - MAME_DIR .. "src/lib/formats/xdf_dsk.h", - MAME_DIR .. "src/lib/formats/zx81_p.cpp", - MAME_DIR .. "src/lib/formats/zx81_p.h", +-- MAME_DIR .. "src/lib/formats/wd177x_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/wd177x_dsk.h", +-- MAME_DIR .. "src/lib/formats/x07_cas.cpp", +-- MAME_DIR .. "src/lib/formats/x07_cas.h", +-- MAME_DIR .. "src/lib/formats/x1_tap.cpp", +-- MAME_DIR .. "src/lib/formats/x1_tap.h", +-- MAME_DIR .. "src/lib/formats/xdf_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/xdf_dsk.h", +-- MAME_DIR .. "src/lib/formats/zx81_p.cpp", +-- MAME_DIR .. "src/lib/formats/zx81_p.h", MAME_DIR .. "src/lib/formats/hxcmfm_dsk.cpp", MAME_DIR .. "src/lib/formats/hxcmfm_dsk.h", - MAME_DIR .. "src/lib/formats/itt3030_dsk.cpp", - MAME_DIR .. "src/lib/formats/itt3030_dsk.h", +-- MAME_DIR .. "src/lib/formats/itt3030_dsk.cpp", +-- MAME_DIR .. "src/lib/formats/itt3030_dsk.h", } -- netlist now defines a project diff --git a/docs/release/scripts/src/machine.lua b/docs/release/scripts/src/machine.lua index fbc923b3073..1eb90f5a81a 100644 --- a/docs/release/scripts/src/machine.lua +++ b/docs/release/scripts/src/machine.lua @@ -9,7 +9,54 @@ -- ---------------------------------------------------------------------------- - +files { + MAME_DIR .. "src/devices/machine/bcreader.cpp", + MAME_DIR .. "src/devices/machine/bcreader.h", +-- MAME_DIR .. "src/devices/machine/buffer.cpp", +-- MAME_DIR .. "src/devices/machine/buffer.h", +-- MAME_DIR .. "src/devices/machine/clock.cpp", +-- MAME_DIR .. "src/devices/machine/clock.h", +-- MAME_DIR .. "src/devices/machine/keyboard.cpp", +-- MAME_DIR .. "src/devices/machine/keyboard.h", + MAME_DIR .. "src/devices/machine/laserdsc.cpp", + MAME_DIR .. "src/devices/machine/laserdsc.h", +-- MAME_DIR .. "src/devices/machine/latch.cpp", +-- MAME_DIR .. "src/devices/machine/latch.h", + MAME_DIR .. "src/devices/machine/nvram.cpp", + MAME_DIR .. "src/devices/machine/nvram.h", + MAME_DIR .. "src/devices/machine/ram.cpp", + MAME_DIR .. "src/devices/machine/ram.h", + MAME_DIR .. "src/devices/machine/legscsi.cpp", + MAME_DIR .. "src/devices/machine/legscsi.h", +-- MAME_DIR .. "src/devices/machine/terminal.cpp", +-- MAME_DIR .. "src/devices/machine/terminal.h", +} +files { +-- MAME_DIR .. "src/devices/imagedev/bitbngr.cpp", +-- MAME_DIR .. "src/devices/imagedev/bitbngr.h", + MAME_DIR .. "src/devices/imagedev/cassette.cpp", + MAME_DIR .. "src/devices/imagedev/cassette.h", + MAME_DIR .. "src/devices/imagedev/chd_cd.cpp", + MAME_DIR .. "src/devices/imagedev/chd_cd.h", +-- MAME_DIR .. "src/devices/imagedev/diablo.cpp", +-- MAME_DIR .. "src/devices/imagedev/diablo.h", + MAME_DIR .. "src/devices/imagedev/flopdrv.cpp", + MAME_DIR .. "src/devices/imagedev/flopdrv.h", + MAME_DIR .. "src/devices/imagedev/floppy.cpp", + MAME_DIR .. "src/devices/imagedev/floppy.h", + MAME_DIR .. "src/devices/imagedev/harddriv.cpp", + MAME_DIR .. "src/devices/imagedev/harddriv.h", +-- MAME_DIR .. "src/devices/imagedev/mfmhd.cpp", +-- MAME_DIR .. "src/devices/imagedev/mfmhd.h", +-- MAME_DIR .. "src/devices/imagedev/midiin.cpp", +-- MAME_DIR .. "src/devices/imagedev/midiin.h", +-- MAME_DIR .. "src/devices/imagedev/midiout.cpp", +-- MAME_DIR .. "src/devices/imagedev/midiout.h", +-- MAME_DIR .. "src/devices/imagedev/printer.cpp", +-- MAME_DIR .. "src/devices/imagedev/printer.h", +-- MAME_DIR .. "src/devices/imagedev/snapquik.cpp", +-- MAME_DIR .. "src/devices/imagedev/snapquik.h", +} --------------------------------------------------- -- --@src/devices/machine/akiko.h,MACHINES["AKIKO"] = true @@ -1709,6 +1756,8 @@ if (MACHINES["PCI"]~=null) then MAME_DIR .. "src/devices/machine/lpc-pit.h", MAME_DIR .. "src/devices/machine/vrc4373.cpp", MAME_DIR .. "src/devices/machine/vrc4373.h", + MAME_DIR .. "src/devices/machine/gt64xxx.cpp", + MAME_DIR .. "src/devices/machine/gt64xxx.h", } end @@ -2084,6 +2133,18 @@ end --------------------------------------------------- -- +--@src/devices/machine/tmc0430.h,MACHINES["TMC0430"] = true +--------------------------------------------------- + +if (MACHINES["TMC0430"]~=null) then + files { + MAME_DIR .. "src/devices/machine/tmc0430.cpp", + MAME_DIR .. "src/devices/machine/tmc0430.h", + } +end + +--------------------------------------------------- +-- --@src/devices/machine/tmp68301.h,MACHINES["TMP68301"] = true --------------------------------------------------- @@ -2724,3 +2785,27 @@ if (MACHINES["PDC"]~=null) then MAME_DIR .. "src/devices/machine/pdc.h", } end + +--------------------------------------------------- +-- +--@src/devices/machine/genpc.h,MACHINES["GENPC"] = true +--------------------------------------------------- + +if (MACHINES["GENPC"]~=null) then + files { + MAME_DIR .. "src/devices/machine/genpc.cpp", + MAME_DIR .. "src/devices/machine/genpc.h", + } +end + +--------------------------------------------------- +-- +--@src/devices/machine/gen_latch.h,MACHINES["GEN_LATCH] = true +--------------------------------------------------- + +if (MACHINES["GEN_LATCH"]~=null) then + files { + MAME_DIR .. "src/devices/machine/gen_latch.cpp", + MAME_DIR .. "src/devices/machine/gen_latch.h", + } +end diff --git a/docs/release/scripts/src/main.lua b/docs/release/scripts/src/main.lua index b8125bf1989..56c93a996ee 100644 --- a/docs/release/scripts/src/main.lua +++ b/docs/release/scripts/src/main.lua @@ -10,7 +10,7 @@ --------------------------------------------------------------------------- function mainProject(_target, _subtarget) -if (_OPTIONS["SOURCES"] == nil) then +if (_OPTIONS["SOURCES"] == nil) then if (_target == _subtarget) then project (_target) else @@ -19,17 +19,41 @@ if (_OPTIONS["SOURCES"] == nil) then else project (_target .. _subtarget) end - end + end else project (_subtarget) -end +end uuid (os.uuid(_target .."_" .. _subtarget)) kind "ConsoleApp" + configuration { "android*" } + targetprefix "lib" + targetname "main" + targetextension ".so" + linkoptions { + "-shared", + "-Wl,-soname,libmain.so" + } + links { + "EGL", + "GLESv1_CM", + "GLESv2", + "SDL2", + } + configuration { "pnacl" } + kind "ConsoleApp" + targetextension ".pexe" + links { + "ppapi", + "ppapi_gles2", + "pthread", + } + configuration { } + addprojectflags() flags { "NoManifest", - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } if _OPTIONS["SYMBOLS"] then @@ -39,7 +63,7 @@ end "$(SILENT) objdump --section=.text --line-numbers --syms --demangle $(TARGET) >$(subst .exe,.sym,$(TARGET))" } end - + configuration { "vs*" } flags { "Unicode", @@ -84,33 +108,80 @@ end configuration { "mingw*" or "vs*" } targetextension ".exe" + configuration { "rpi" } + targetextension "" + configuration { "asmjs" } - targetextension ".bc" + targetextension ".bc" if os.getenv("EMSCRIPTEN") then local emccopts = "" emccopts = emccopts .. " -O3" emccopts = emccopts .. " -s USE_SDL=2" + emccopts = emccopts .. " -s USE_SDL_TTF=2" emccopts = emccopts .. " --memory-init-file 0" emccopts = emccopts .. " -s ALLOW_MEMORY_GROWTH=0" emccopts = emccopts .. " -s TOTAL_MEMORY=268435456" emccopts = emccopts .. " -s DISABLE_EXCEPTION_CATCHING=2" - emccopts = emccopts .. " -s EXCEPTION_CATCHING_WHITELIST='[\"__ZN15running_machine17start_all_devicesEv\"]'" - emccopts = emccopts .. " -s EXPORTED_FUNCTIONS=\"['_main', '_malloc', '__Z14js_get_machinev', '__Z9js_get_uiv', '__Z12js_get_soundv', '__ZN10ui_manager12set_show_fpsEb', '__ZNK10ui_manager8show_fpsEv', '__ZN13sound_manager4muteEbh', '_SDL_PauseAudio']\"" + emccopts = emccopts .. " -s EXCEPTION_CATCHING_WHITELIST='[\"__ZN15running_machine17start_all_devicesEv\",\"__ZN12cli_frontend7executeEiPPc\"]'" + emccopts = emccopts .. " -s EXPORTED_FUNCTIONS=\"['_main', '_malloc', '__Z14js_get_machinev', '__Z9js_get_uiv', '__Z12js_get_soundv', '__ZN15mame_ui_manager12set_show_fpsEb', '__ZNK15mame_ui_manager8show_fpsEv', '__ZN13sound_manager4muteEbh', '_SDL_PauseAudio']\"" emccopts = emccopts .. " --pre-js " .. _MAKE.esc(MAME_DIR) .. "src/osd/modules/sound/js_sound.js" - emccopts = emccopts .. " --post-js " .. _MAKE.esc(MAME_DIR) .. "src/osd/sdl/emscripten_post.js" - emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx@bgfx" - emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "shaders/gles@shaders/gles" + emccopts = emccopts .. " --post-js " .. _MAKE.esc(MAME_DIR) .. "scripts/resources/emscripten/emscripten_post.js" + emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/chains@bgfx/chains" + emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/effects@bgfx/effects" + emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "bgfx/shaders/gles@bgfx/shaders/gles" + emccopts = emccopts .. " --embed-file " .. _MAKE.esc(MAME_DIR) .. "artwork/slot-mask.png@artwork/slot-mask.png" postbuildcommands { os.getenv("EMSCRIPTEN") .. "/emcc " .. emccopts .. " $(TARGET) -o " .. _MAKE.esc(MAME_DIR) .. _OPTIONS["target"] .. _OPTIONS["subtarget"] .. ".js", } end configuration { } - - if _OPTIONS["SEPARATE_BIN"]~="1" then - targetdir(MAME_DIR) + +if _OPTIONS["IGNORE_GIT"]~="1" then + GIT_VERSION = backtick( "git describe --dirty" ) + local p = string.find(GIT_VERSION, '-', 1) + if (p~=nil) then + defines { + "GIT_VERSION=" .. string.sub(GIT_VERSION,p+1) + } end +end + if _OPTIONS["targetos"]=="android" then + includedirs { + MAME_DIR .. "3rdparty/SDL2/include", + } + + files { + MAME_DIR .. "3rdparty/SDL2/src/main/android/SDL_android_main.c", + } + targetsuffix "" + if _OPTIONS["SEPARATE_BIN"]~="1" then + if _OPTIONS["PLATFORM"]=="arm" then + targetdir(MAME_DIR .. "android-project/app/src/main/libs/armeabi-v7a") + end + if _OPTIONS["PLATFORM"]=="arm64" then + targetdir(MAME_DIR .. "android-project/app/src/main/libs/arm64-v8a") + end + if _OPTIONS["PLATFORM"]=="mips" then + targetdir(MAME_DIR .. "android-project/app/src/main/libs/mips") + end + if _OPTIONS["PLATFORM"]=="mips64" then + targetdir(MAME_DIR .. "android-project/app/src/main/libs/mips64") + end + if _OPTIONS["PLATFORM"]=="x86" then + targetdir(MAME_DIR .. "android-project/app/src/main/libs/x86") + end + if _OPTIONS["PLATFORM"]=="x64" then + targetdir(MAME_DIR .. "android-project/app/src/main/libs/x86_64") + end + end + else + if _OPTIONS["SEPARATE_BIN"]~="1" then + targetdir(MAME_DIR) + end + end + findfunction("linkProjects_" .. _OPTIONS["target"] .. "_" .. _OPTIONS["subtarget"])(_OPTIONS["target"], _OPTIONS["subtarget"]) links { "osd_" .. _OPTIONS["osd"], @@ -118,12 +189,8 @@ end links { "qtdbg_" .. _OPTIONS["osd"], } - if (_OPTIONS["SOURCES"] == nil) then - links { - "bus", - } - end links { + "frontend", "netlist", "optional", "emu", @@ -136,59 +203,38 @@ if #disasm_files > 0 then end links { "utils", - "expat", + ext_lib("expat"), "softfloat", - "jpeg", + ext_lib("jpeg"), "7z", - "lua", + ext_lib("lua"), "lualibs", - "luv", - "uv", - "http-parser", } - if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } - else - links { - "z", - } - end - - if _OPTIONS["with-bundled-flac"] then - links { - "flac", - } - else - links { - "FLAC", - } - end - - if _OPTIONS["with-bundled-sqlite3"] then - links { - "sqllite3", - } - else + if _OPTIONS["USE_LIBUV"]=="1" then links { - "sqlite3", + ext_lib("uv"), + "http-parser", } end + links { + ext_lib("zlib"), + ext_lib("flac"), + ext_lib("sqlite3"), + } if _OPTIONS["NO_USE_MIDI"]~="1" then links { - "portmidi", + ext_lib("portmidi"), } end links { "bgfx", "ocore_" .. _OPTIONS["osd"], } - + override_resources = false; - + maintargetosdoptions(_target,_subtarget) includedirs { @@ -201,14 +247,10 @@ end MAME_DIR .. "3rdparty", GEN_DIR .. _target .. "/layout", GEN_DIR .. "resource", + ext_includedir("zlib"), + ext_includedir("flac"), } - if _OPTIONS["with-bundled-zlib"] then - includedirs { - MAME_DIR .. "3rdparty/zlib", - } - end - if _OPTIONS["targetos"]=="macosx" and (not override_resources) then linkoptions { "-sectcreate __TEXT __info_plist " .. _MAKE.esc(GEN_DIR) .. "resource/" .. _subtarget .. "-Info.plist" @@ -224,10 +266,7 @@ end local rctarget = _subtarget if _OPTIONS["targetos"]=="windows" and (not override_resources) then - local rcfile = MAME_DIR .. "src/" .. _target .. "/osd/".._OPTIONS["osd"].."/" .. _subtarget .. "/" .. rctarget ..".rc" - if not os.isfile(rcfile) then - rcfile = MAME_DIR .. "src/" .. _target .. "/osd/windows/" .. _subtarget .. "/" .. rctarget ..".rc" - end + rcfile = MAME_DIR .. "scripts/resources/windows/" .. _subtarget .. "/" .. rctarget ..".rc" if os.isfile(rcfile) then files { rcfile, @@ -238,12 +277,12 @@ end else rctarget = "mame" files { - MAME_DIR .. "src/mame/osd/windows/mame/mame.rc", + MAME_DIR .. "scripts/resources/windows/mame/mame.rc", } dependency { { "$(OBJDIR)/mame.res" , GEN_DIR .. "resource/" .. rctarget .. "vers.rc", true }, } - end + end end local mainfile = MAME_DIR .. "src/".._target .."/" .. _subtarget ..".cpp" @@ -255,45 +294,67 @@ end MAME_DIR .. "src/version.cpp", GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", } - -if (_OPTIONS["SOURCES"] == nil) then - dependency { - { "../../../../generated/mame/mame/drivlist.cpp", MAME_DIR .. "src/mame/mess.lst", true }, - { "../../../../generated/mame/mame/drivlist.cpp" , MAME_DIR .. "src/mame/arcade.lst", true}, - } - custombuildtask { - { MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makelist.py" }, {"@echo Building driver list...", PYTHON .. " $(1) $(<) > $(@)" }}, - } -end -if _OPTIONS["FORCE_VERSION_COMPILE"]=="1" then - configuration { "gmake" } +if (_OPTIONS["SOURCES"] == nil) then + + if os.isfile(MAME_DIR .. "src/".._target .."/" .. _subtarget ..".flt") then + dependency { + { + GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true }, + } + custombuildtask { + { MAME_DIR .. "src/".._target .."/" .. _subtarget ..".flt" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makelist.py", MAME_DIR .. "src/".._target .."/" .. _target ..".lst" }, {"@echo Building driver list...", PYTHON .. " $(1) $(2) $(<) > $(@)" }}, + } + else + if os.isfile(MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst") then + custombuildtask { + { MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makelist.py" }, {"@echo Building driver list...", PYTHON .. " $(1) $(<) > $(@)" }}, + } + else + dependency { + { + GEN_DIR .. _target .. "/" .. _target .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true }, + } + custombuildtask { + { MAME_DIR .. "src/".._target .."/" .. _target ..".lst" , GEN_DIR .. _target .. "/" .. _target .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makelist.py" }, {"@echo Building driver list...", PYTHON .. " $(1) $(<) > $(@)" }}, + } + end + end +end + +if (_OPTIONS["SOURCES"] ~= nil) then dependency { - { ".PHONY", ".FORCE", true }, - { "$(OBJDIR)/src/version.o", ".FORCE", true }, + { + GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true }, + } + custombuildtask { + { GEN_DIR .. _target .."/" .. _subtarget ..".flt" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makelist.py", MAME_DIR .. "src/".._target .."/" .. _target ..".lst" }, {"@echo Building driver list...", PYTHON .. " $(1) $(2) $(<) > $(@)" }}, } end + configuration { "mingw*" } - custombuildtask { + custombuildtask { { MAME_DIR .. "src/version.cpp" , GEN_DIR .. "resource/" .. rctarget .. "vers.rc", { MAME_DIR .. "scripts/build/verinfo.py" }, {"@echo Emitting " .. rctarget .. "vers.rc" .. "...", PYTHON .. " $(1) -r -b " .. rctarget .. " $(<) > $(@)" }}, - } - + } + configuration { "vs*" } - prebuildcommands { + prebuildcommands { "mkdir " .. path.translate(GEN_DIR .. "resource/","\\") .. " 2>NUL", "@echo Emitting ".. rctarget .. "vers.rc...", PYTHON .. " " .. path.translate(MAME_DIR .. "scripts/build/verinfo.py","\\") .. " -r -b " .. rctarget .. " " .. path.translate(MAME_DIR .. "src/version.cpp","\\") .. " > " .. path.translate(GEN_DIR .. "resource/" .. rctarget .. "vers.rc", "\\") , - } - - if (_OPTIONS["osd"] == "sdl") then - configuration { "x64","vs*" } - prelinkcommands { "copy " .. path.translate(MAME_DIR .."3rdparty/sdl2/lib/x64/SDL2.dll", "\\") .. " " .. path.translate(MAME_DIR .."SDL2.dll","\\") .. " /Y" } - configuration { "x32","vs*" } - prelinkcommands { "copy " .. path.translate(MAME_DIR .."3rdparty/sdl2/lib/x86/SDL2.dll", "\\") .. " " .. path.translate(MAME_DIR .."SDL2.dll","\\") .. " /Y" } - end - + } + configuration { } - debugdir (MAME_DIR) - debugargs ("-window") + if _OPTIONS["DEBUG_DIR"]~=nil then + debugabsolutedir(_OPTIONS["DEBUG_DIR"]) + else + debugdir (MAME_DIR) + end + if _OPTIONS["DEBUG_ARGS"]~=nil then + debugargs (_OPTIONS["DEBUG_ARGS"]) + else + debugargs ("-window") + end + end diff --git a/docs/release/scripts/src/mame/frontend.lua b/docs/release/scripts/src/mame/frontend.lua new file mode 100644 index 00000000000..2e4a35bf8a9 --- /dev/null +++ b/docs/release/scripts/src/mame/frontend.lua @@ -0,0 +1,154 @@ +-- license:BSD-3-Clause +-- copyright-holders:MAMEdev Team + +--------------------------------------------------------------------------- +-- +-- frontend.lua +-- +-- Rules for building frontend +-- +--------------------------------------------------------------------------- + +project ("frontend") +targetsubdir(_OPTIONS["target"] .."_" .. _OPTIONS["subtarget"]) +uuid ("e98e14c4-82a4-4988-ba29-01c90c817ab8") +kind (LIBTYPE) + +addprojectflags() +precompiledheaders() +options { + "ArchiveSplit", +} +includedirs { + MAME_DIR .. "src/osd", + MAME_DIR .. "src/emu", + MAME_DIR .. "src/frontend/mame", + MAME_DIR .. "src/devices", -- till deps are fixed + MAME_DIR .. "src/lib", + MAME_DIR .. "src/lib/util", + MAME_DIR .. "3rdparty/rapidjson/include", + MAME_DIR .. "3rdparty", + GEN_DIR .. "emu", + GEN_DIR .. "emu/layout", +} + +includedirs { + ext_includedir("expat"), + ext_includedir("lua"), + ext_includedir("zlib"), + ext_includedir("flac"), +} + +if (_OPTIONS["targetos"] == "windows") then + defines { + "UI_WINDOWS", + } +end + +if (_OPTIONS["osd"] == "sdl") then + defines { + "UI_SDL", + } +end + +files { + MAME_DIR .. "src/frontend/mame/audit.cpp", + MAME_DIR .. "src/frontend/mame/audit.h", + MAME_DIR .. "src/frontend/mame/cheat.cpp", + MAME_DIR .. "src/frontend/mame/cheat.h", + MAME_DIR .. "src/frontend/mame/clifront.cpp", + MAME_DIR .. "src/frontend/mame/clifront.h", + MAME_DIR .. "src/frontend/mame/info.cpp", + MAME_DIR .. "src/frontend/mame/info.h", + MAME_DIR .. "src/frontend/mame/language.cpp", + MAME_DIR .. "src/frontend/mame/language.h", + MAME_DIR .. "src/frontend/mame/luaengine.cpp", + MAME_DIR .. "src/frontend/mame/luaengine.h", + MAME_DIR .. "src/frontend/mame/mame.cpp", + MAME_DIR .. "src/frontend/mame/mame.h", + MAME_DIR .. "src/frontend/mame/mameopts.cpp", + MAME_DIR .. "src/frontend/mame/mameopts.h", + MAME_DIR .. "src/frontend/mame/pluginopts.cpp", + MAME_DIR .. "src/frontend/mame/pluginopts.h", + MAME_DIR .. "src/frontend/mame/ui/ui.cpp", + MAME_DIR .. "src/frontend/mame/ui/ui.h", + MAME_DIR .. "src/frontend/mame/ui/devctrl.h", + MAME_DIR .. "src/frontend/mame/ui/menu.cpp", + MAME_DIR .. "src/frontend/mame/ui/menu.h", + MAME_DIR .. "src/frontend/mame/ui/submenu.cpp", + MAME_DIR .. "src/frontend/mame/ui/submenu.h", + MAME_DIR .. "src/frontend/mame/ui/mainmenu.cpp", + MAME_DIR .. "src/frontend/mame/ui/mainmenu.h", + MAME_DIR .. "src/frontend/mame/ui/miscmenu.cpp", + MAME_DIR .. "src/frontend/mame/ui/miscmenu.h", + MAME_DIR .. "src/frontend/mame/ui/barcode.cpp", + MAME_DIR .. "src/frontend/mame/ui/barcode.h", + MAME_DIR .. "src/frontend/mame/ui/cheatopt.cpp", + MAME_DIR .. "src/frontend/mame/ui/cheatopt.h", + MAME_DIR .. "src/frontend/mame/ui/pluginopt.cpp", + MAME_DIR .. "src/frontend/mame/ui/pluginopt.h", + MAME_DIR .. "src/frontend/mame/ui/devopt.cpp", + MAME_DIR .. "src/frontend/mame/ui/devopt.h", + MAME_DIR .. "src/frontend/mame/ui/filemngr.cpp", + MAME_DIR .. "src/frontend/mame/ui/filemngr.h", + MAME_DIR .. "src/frontend/mame/ui/filesel.cpp", + MAME_DIR .. "src/frontend/mame/ui/filesel.h", + MAME_DIR .. "src/frontend/mame/ui/floppycntrl.cpp", + MAME_DIR .. "src/frontend/mame/ui/floppycntrl.h", + MAME_DIR .. "src/frontend/mame/ui/imgcntrl.cpp", + MAME_DIR .. "src/frontend/mame/ui/imgcntrl.h", + MAME_DIR .. "src/frontend/mame/ui/info.cpp", + MAME_DIR .. "src/frontend/mame/ui/info.h", + MAME_DIR .. "src/frontend/mame/ui/info_pty.cpp", + MAME_DIR .. "src/frontend/mame/ui/info_pty.h", + MAME_DIR .. "src/frontend/mame/ui/inputmap.cpp", + MAME_DIR .. "src/frontend/mame/ui/inputmap.h", + MAME_DIR .. "src/frontend/mame/ui/sliders.cpp", + MAME_DIR .. "src/frontend/mame/ui/sliders.h", + MAME_DIR .. "src/frontend/mame/ui/slotopt.cpp", + MAME_DIR .. "src/frontend/mame/ui/slotopt.h", + MAME_DIR .. "src/frontend/mame/ui/swlist.cpp", + MAME_DIR .. "src/frontend/mame/ui/swlist.h", + MAME_DIR .. "src/frontend/mame/ui/tapectrl.cpp", + MAME_DIR .. "src/frontend/mame/ui/tapectrl.h", + MAME_DIR .. "src/frontend/mame/ui/videoopt.cpp", + MAME_DIR .. "src/frontend/mame/ui/videoopt.h", + MAME_DIR .. "src/frontend/mame/ui/viewgfx.cpp", + MAME_DIR .. "src/frontend/mame/ui/viewgfx.h", + MAME_DIR .. "src/frontend/mame/ui/auditmenu.cpp", + MAME_DIR .. "src/frontend/mame/ui/auditmenu.h", + MAME_DIR .. "src/frontend/mame/ui/custmenu.cpp", + MAME_DIR .. "src/frontend/mame/ui/custmenu.h", + MAME_DIR .. "src/frontend/mame/ui/custui.cpp", + MAME_DIR .. "src/frontend/mame/ui/custui.h", + MAME_DIR .. "src/frontend/mame/ui/datfile.cpp", + MAME_DIR .. "src/frontend/mame/ui/datfile.h", + MAME_DIR .. "src/frontend/mame/ui/datmenu.cpp", + MAME_DIR .. "src/frontend/mame/ui/datmenu.h", + MAME_DIR .. "src/frontend/mame/ui/defimg.h", + MAME_DIR .. "src/frontend/mame/ui/dirmenu.cpp", + MAME_DIR .. "src/frontend/mame/ui/dirmenu.h", + MAME_DIR .. "src/frontend/mame/ui/icorender.h", + MAME_DIR .. "src/frontend/mame/ui/inifile.cpp", + MAME_DIR .. "src/frontend/mame/ui/inifile.h", + MAME_DIR .. "src/frontend/mame/ui/miscmenu.cpp", + MAME_DIR .. "src/frontend/mame/ui/miscmenu.h", + MAME_DIR .. "src/frontend/mame/ui/moptions.cpp", + MAME_DIR .. "src/frontend/mame/ui/moptions.h", + MAME_DIR .. "src/frontend/mame/ui/optsmenu.cpp", + MAME_DIR .. "src/frontend/mame/ui/optsmenu.h", + MAME_DIR .. "src/frontend/mame/ui/selector.cpp", + MAME_DIR .. "src/frontend/mame/ui/selector.h", + MAME_DIR .. "src/frontend/mame/ui/selgame.cpp", + MAME_DIR .. "src/frontend/mame/ui/selgame.h", + MAME_DIR .. "src/frontend/mame/ui/simpleselgame.cpp", + MAME_DIR .. "src/frontend/mame/ui/simpleselgame.h", + MAME_DIR .. "src/frontend/mame/ui/selsoft.cpp", + MAME_DIR .. "src/frontend/mame/ui/selsoft.h", + MAME_DIR .. "src/frontend/mame/ui/sndmenu.cpp", + MAME_DIR .. "src/frontend/mame/ui/sndmenu.h", + MAME_DIR .. "src/frontend/mame/ui/starimg.h", + MAME_DIR .. "src/frontend/mame/ui/toolbar.h", + MAME_DIR .. "src/frontend/mame/ui/utils.cpp", + MAME_DIR .. "src/frontend/mame/ui/utils.h", +} diff --git a/docs/release/scripts/src/netlist.lua b/docs/release/scripts/src/netlist.lua index 7b2dff521a5..cb389db8d8d 100644 --- a/docs/release/scripts/src/netlist.lua +++ b/docs/release/scripts/src/netlist.lua @@ -19,13 +19,8 @@ project "netlist" MAME_DIR .. "src/lib/netlist", MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", + -- ext_includedir("expat"), } - -- if _OPTIONS["with-bundled-expat"] then - -- includedirs { - -- MAME_DIR .. "3rdparty/expat/lib", - -- } - --end - files { MAME_DIR .. "src/lib/netlist/nl_config.h", @@ -47,6 +42,8 @@ project "netlist" MAME_DIR .. "src/lib/netlist/plib/pfmtlog.cpp", MAME_DIR .. "src/lib/netlist/plib/pfmtlog.h", MAME_DIR .. "src/lib/netlist/plib/plists.h", + MAME_DIR .. "src/lib/netlist/plib/pdynlib.cpp", + MAME_DIR .. "src/lib/netlist/plib/pdynlib.h", MAME_DIR .. "src/lib/netlist/plib/poptions.h", MAME_DIR .. "src/lib/netlist/plib/pparser.cpp", MAME_DIR .. "src/lib/netlist/plib/pparser.h", @@ -73,6 +70,7 @@ project "netlist" MAME_DIR .. "src/lib/netlist/analog/nld_opamps.h", MAME_DIR .. "src/lib/netlist/solver/nld_solver.cpp", MAME_DIR .. "src/lib/netlist/solver/nld_solver.h", + MAME_DIR .. "src/lib/netlist/solver/nld_matrix_solver.h", MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct.h", MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct1.h", MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct2.h", @@ -80,14 +78,14 @@ project "netlist" MAME_DIR .. "src/lib/netlist/solver/nld_ms_sor_mat.h", MAME_DIR .. "src/lib/netlist/solver/nld_ms_gmres.h", MAME_DIR .. "src/lib/netlist/solver/mat_cr.h", + MAME_DIR .. "src/lib/netlist/solver/nld_ms_sm.h", + MAME_DIR .. "src/lib/netlist/solver/nld_ms_w.h", MAME_DIR .. "src/lib/netlist/solver/nld_ms_direct_lu.h", - MAME_DIR .. "src/lib/netlist/solver/vector_base.h", + MAME_DIR .. "src/lib/netlist/solver/vector_base.h", MAME_DIR .. "src/lib/netlist/devices/nld_4020.cpp", MAME_DIR .. "src/lib/netlist/devices/nld_4020.h", MAME_DIR .. "src/lib/netlist/devices/nld_4066.cpp", MAME_DIR .. "src/lib/netlist/devices/nld_4066.h", - MAME_DIR .. "src/lib/netlist/devices/nld_7400.cpp", - MAME_DIR .. "src/lib/netlist/devices/nld_7400.h", MAME_DIR .. "src/lib/netlist/devices/nld_7402.cpp", MAME_DIR .. "src/lib/netlist/devices/nld_7402.h", MAME_DIR .. "src/lib/netlist/devices/nld_7404.cpp", @@ -173,5 +171,5 @@ project "netlist" MAME_DIR .. "src/lib/netlist/macro/nlm_opamp.cpp", MAME_DIR .. "src/lib/netlist/macro/nlm_opamp.h", MAME_DIR .. "src/lib/netlist/macro/nlm_other.cpp", - MAME_DIR .. "src/lib/netlist/macro/nlm_other.h", + MAME_DIR .. "src/lib/netlist/macro/nlm_other.h", } diff --git a/docs/release/scripts/src/osd/modules.lua b/docs/release/scripts/src/osd/modules.lua index 1dfa4317a48..fef235457fe 100644 --- a/docs/release/scripts/src/osd/modules.lua +++ b/docs/release/scripts/src/osd/modules.lua @@ -10,7 +10,7 @@ --------------------------------------------------------------------------- function string.starts(String,Start) - return string.sub(String,1,string.len(Start))==Start + return string.sub(String,1,string.len(Start))==Start end function addlibfromstring(str) @@ -44,18 +44,25 @@ function osdmodulesbuild() files { MAME_DIR .. "src/osd/osdnet.cpp", MAME_DIR .. "src/osd/osdnet.h", + MAME_DIR .. "src/osd/watchdog.cpp", + MAME_DIR .. "src/osd/watchdog.h", MAME_DIR .. "src/osd/modules/debugger/debug_module.h", MAME_DIR .. "src/osd/modules/font/font_module.h", MAME_DIR .. "src/osd/modules/midi/midi_module.h", MAME_DIR .. "src/osd/modules/netdev/netdev_module.h", MAME_DIR .. "src/osd/modules/sound/sound_module.h", + MAME_DIR .. "src/osd/modules/diagnostics/diagnostics_module.h", MAME_DIR .. "src/osd/modules/lib/osdobj_common.cpp", MAME_DIR .. "src/osd/modules/lib/osdobj_common.h", + MAME_DIR .. "src/osd/modules/diagnostics/none.cpp", + MAME_DIR .. "src/osd/modules/diagnostics/diagnostics_win32.cpp", MAME_DIR .. "src/osd/modules/debugger/none.cpp", MAME_DIR .. "src/osd/modules/debugger/debugint.cpp", MAME_DIR .. "src/osd/modules/debugger/debugwin.cpp", + MAME_DIR .. "src/osd/modules/debugger/debugimgui.cpp", MAME_DIR .. "src/osd/modules/font/font_sdl.cpp", MAME_DIR .. "src/osd/modules/font/font_windows.cpp", + MAME_DIR .. "src/osd/modules/font/font_dwrite.cpp", MAME_DIR .. "src/osd/modules/font/font_osx.cpp", MAME_DIR .. "src/osd/modules/font/font_none.cpp", MAME_DIR .. "src/osd/modules/netdev/taptun.cpp", @@ -69,12 +76,58 @@ function osdmodulesbuild() MAME_DIR .. "src/osd/modules/sound/sdl_sound.cpp", MAME_DIR .. "src/osd/modules/sound/xaudio2_sound.cpp", MAME_DIR .. "src/osd/modules/sound/none.cpp", + MAME_DIR .. "src/osd/modules/input/input_module.h", + MAME_DIR .. "src/osd/modules/input/input_common.cpp", + MAME_DIR .. "src/osd/modules/input/input_common.h", + MAME_DIR .. "src/osd/modules/input/input_dinput.cpp", + MAME_DIR .. "src/osd/modules/input/input_dinput.h", + MAME_DIR .. "src/osd/modules/input/input_none.cpp", + MAME_DIR .. "src/osd/modules/input/input_rawinput.cpp", + MAME_DIR .. "src/osd/modules/input/input_win32.cpp", + MAME_DIR .. "src/osd/modules/input/input_sdl.cpp", + MAME_DIR .. "src/osd/modules/input/input_sdlcommon.cpp", + MAME_DIR .. "src/osd/modules/input/input_sdlcommon.h", + MAME_DIR .. "src/osd/modules/input/input_x11.cpp", + MAME_DIR .. "src/osd/modules/input/input_windows.cpp", + MAME_DIR .. "src/osd/modules/input/input_windows.h", + MAME_DIR .. "src/osd/modules/input/input_xinput.cpp", + MAME_DIR .. "src/osd/modules/input/input_xinput.h", + MAME_DIR .. "src/osd/modules/input/input_winhybrid.cpp", + MAME_DIR .. "src/osd/modules/output/output_module.h", + MAME_DIR .. "src/osd/modules/output/none.cpp", + MAME_DIR .. "src/osd/modules/output/console.cpp", + MAME_DIR .. "src/osd/modules/output/network.cpp", + 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", + } + includedirs { + ext_includedir("uv"), } + includedirs { + MAME_DIR .. "src/frontend/mame", -- for internal debugger + } if _OPTIONS["targetos"]=="windows" then includedirs { MAME_DIR .. "3rdparty/winpcap/Include", + MAME_DIR .. "3rdparty/compat/mingw", } + + if _OPTIONS["MODERN_WIN_API"]~="1" then + includedirs { + MAME_DIR .. "3rdparty/compat/winsdk-override", + } + end end if _OPTIONS["NO_OPENGL"]=="1" then @@ -100,36 +153,65 @@ function osdmodulesbuild() end end + defines { + "__STDC_LIMIT_MACROS", + "__STDC_FORMAT_MACROS", + "__STDC_CONSTANT_MACROS", + "IMGUI_DISABLE_OBSOLETE_FUNCTIONS", + } + files { MAME_DIR .. "src/osd/modules/render/drawbgfx.cpp", + MAME_DIR .. "src/osd/modules/render/aviwrite.cpp", + MAME_DIR .. "src/osd/modules/render/aviwrite.h", + MAME_DIR .. "src/osd/modules/render/bgfxutil.cpp", + MAME_DIR .. "src/osd/modules/render/bgfxutil.h", MAME_DIR .. "src/osd/modules/render/binpacker.cpp", MAME_DIR .. "src/osd/modules/render/bgfx/blendreader.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/chain.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/chainentry.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/chainentryreader.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/chainmanager.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/chainreader.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/clear.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/clear.h", + MAME_DIR .. "src/osd/modules/render/bgfx/clearreader.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/clearreader.h", MAME_DIR .. "src/osd/modules/render/bgfx/cullreader.cpp", MAME_DIR .. "src/osd/modules/render/bgfx/depthreader.cpp", MAME_DIR .. "src/osd/modules/render/bgfx/effect.cpp", MAME_DIR .. "src/osd/modules/render/bgfx/effectmanager.cpp", MAME_DIR .. "src/osd/modules/render/bgfx/effectreader.cpp", - MAME_DIR .. "src/osd/modules/render/bgfx/chain.cpp", - MAME_DIR .. "src/osd/modules/render/bgfx/chainreader.cpp", - MAME_DIR .. "src/osd/modules/render/bgfx/chainentry.cpp", - MAME_DIR .. "src/osd/modules/render/bgfx/chainentryreader.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/entryuniformreader.cpp", MAME_DIR .. "src/osd/modules/render/bgfx/inputpair.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/frameparameter.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/timeparameter.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/paramreader.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/paramuniform.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/paramuniformreader.cpp", MAME_DIR .. "src/osd/modules/render/bgfx/shadermanager.cpp", - MAME_DIR .. "src/osd/modules/render/bgfx/statereader.cpp", MAME_DIR .. "src/osd/modules/render/bgfx/slider.cpp", MAME_DIR .. "src/osd/modules/render/bgfx/sliderreader.cpp", - MAME_DIR .. "src/osd/modules/render/bgfx/parameter.cpp", - MAME_DIR .. "src/osd/modules/render/bgfx/paramreader.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/slideruniform.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/slideruniformreader.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/statereader.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/suppressor.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/suppressorreader.cpp", MAME_DIR .. "src/osd/modules/render/bgfx/target.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/targetreader.cpp", MAME_DIR .. "src/osd/modules/render/bgfx/targetmanager.cpp", MAME_DIR .. "src/osd/modules/render/bgfx/texture.cpp", MAME_DIR .. "src/osd/modules/render/bgfx/texturemanager.cpp", MAME_DIR .. "src/osd/modules/render/bgfx/uniform.cpp", MAME_DIR .. "src/osd/modules/render/bgfx/uniformreader.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/valueuniform.cpp", + MAME_DIR .. "src/osd/modules/render/bgfx/valueuniformreader.cpp", MAME_DIR .. "src/osd/modules/render/bgfx/writereader.cpp", } includedirs { + MAME_DIR .. "3rdparty/bgfx/examples/common", MAME_DIR .. "3rdparty/bgfx/include", + MAME_DIR .. "3rdparty/bgfx/3rdparty", MAME_DIR .. "3rdparty/bx/include", MAME_DIR .. "3rdparty/rapidjson/include", } @@ -138,6 +220,10 @@ function osdmodulesbuild() defines { "NO_USE_MIDI", } + else + includedirs { + ext_includedir("portmidi"), + } end if _OPTIONS["USE_QTDEBUG"]=="1" then @@ -158,7 +244,7 @@ function qtdebuggerbuild() removeflags { "SingleOutputDir", } - local version = str_to_version(_OPTIONS["gcc_version"]) + local version = str_to_version(_OPTIONS["gcc_version"]) if _OPTIONS["gcc"]~=nil and (string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs")) then configuration { "gmake" } if (version >= 30600) then @@ -232,14 +318,14 @@ function qtdebuggerbuild() custombuildtask { - { MAME_DIR .. "src/osd/modules/debugger/qt/debuggerview.h", GEN_DIR .. "osd/modules/debugger/qt/debuggerview.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, - { MAME_DIR .. "src/osd/modules/debugger/qt/windowqt.h", GEN_DIR .. "osd/modules/debugger/qt/windowqt.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, - { MAME_DIR .. "src/osd/modules/debugger/qt/logwindow.h", GEN_DIR .. "osd/modules/debugger/qt/logwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, - { MAME_DIR .. "src/osd/modules/debugger/qt/dasmwindow.h", GEN_DIR .. "osd/modules/debugger/qt/dasmwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, - { MAME_DIR .. "src/osd/modules/debugger/qt/mainwindow.h", GEN_DIR .. "osd/modules/debugger/qt/mainwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, - { MAME_DIR .. "src/osd/modules/debugger/qt/memorywindow.h", GEN_DIR .. "osd/modules/debugger/qt/memorywindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, - { MAME_DIR .. "src/osd/modules/debugger/qt/breakpointswindow.h", GEN_DIR .. "osd/modules/debugger/qt/breakpointswindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, - { MAME_DIR .. "src/osd/modules/debugger/qt/deviceswindow.h", GEN_DIR .. "osd/modules/debugger/qt/deviceswindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, + { MAME_DIR .. "src/osd/modules/debugger/qt/debuggerview.h", GEN_DIR .. "osd/modules/debugger/qt/debuggerview.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, + { MAME_DIR .. "src/osd/modules/debugger/qt/windowqt.h", GEN_DIR .. "osd/modules/debugger/qt/windowqt.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, + { MAME_DIR .. "src/osd/modules/debugger/qt/logwindow.h", GEN_DIR .. "osd/modules/debugger/qt/logwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, + { MAME_DIR .. "src/osd/modules/debugger/qt/dasmwindow.h", GEN_DIR .. "osd/modules/debugger/qt/dasmwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, + { MAME_DIR .. "src/osd/modules/debugger/qt/mainwindow.h", GEN_DIR .. "osd/modules/debugger/qt/mainwindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, + { MAME_DIR .. "src/osd/modules/debugger/qt/memorywindow.h", GEN_DIR .. "osd/modules/debugger/qt/memorywindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, + { MAME_DIR .. "src/osd/modules/debugger/qt/breakpointswindow.h", GEN_DIR .. "osd/modules/debugger/qt/breakpointswindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, + { MAME_DIR .. "src/osd/modules/debugger/qt/deviceswindow.h", GEN_DIR .. "osd/modules/debugger/qt/deviceswindow.moc.cpp", { }, { MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, { MAME_DIR .. "src/osd/modules/debugger/qt/deviceinformationwindow.h", GEN_DIR .. "osd/modules/debugger/qt/deviceinformationwindow.moc.cpp", { },{ MOC .. "$(MOCINCPATH) $(<) -o $(@)" }}, } @@ -349,6 +435,7 @@ function osdmodulestargetconf() "gdi32", "dsound", "dxguid", + "oleaut32", } elseif _OPTIONS["targetos"]=="macosx" then links { @@ -399,7 +486,7 @@ newoption { } if not _OPTIONS["NO_USE_MIDI"] then - if _OPTIONS["targetos"]=="freebsd" or _OPTIONS["targetos"]=="openbsd" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" or _OPTIONS["targetos"] == "os2" then + if _OPTIONS["targetos"]=="freebsd" or _OPTIONS["targetos"]=="openbsd" or _OPTIONS["targetos"]=="netbsd" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" then _OPTIONS["NO_USE_MIDI"] = "1" else _OPTIONS["NO_USE_MIDI"] = "0" @@ -416,29 +503,6 @@ newoption { } newoption { - trigger = "USE_XAUDIO2", - description = "Use XAudio2 API for audio", - allowed = { - { "0", "Disable XAudio2" }, - { "1", "Enable XAudio2" }, - }, -} - -if _OPTIONS["USE_XAUDIO2"]=="1" then - _OPTIONS["MODERN_WIN_API"] = "1", - defines { - "USE_XAUDIO2=1", - }, - includedirs { - MAME_DIR .. "3rdparty/win81sdk/Include/um", - } -else - defines { - "USE_XAUDIO2=0", - } -end - -newoption { trigger = "USE_QTDEBUG", description = "Use QT debugger", allowed = { @@ -454,7 +518,7 @@ newoption { if not _OPTIONS["USE_QTDEBUG"] then - if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" or _OPTIONS["targetos"] == "os2" then + if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="solaris" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"] == "asmjs" then _OPTIONS["USE_QTDEBUG"] = "0" else _OPTIONS["USE_QTDEBUG"] = "1" diff --git a/docs/release/scripts/src/osd/newui.lua b/docs/release/scripts/src/osd/newui.lua index c8451ed90a9..a5527ef4b0d 100644 --- a/docs/release/scripts/src/osd/newui.lua +++ b/docs/release/scripts/src/osd/newui.lua @@ -1,3 +1,14 @@ +-- license:BSD-3-Clause +-- copyright-holders:Robbbert + +--------------------------------------------------------------------------- +-- +-- newui.lua +-- +-- Rules for the building for Windows +-- +--------------------------------------------------------------------------- + dofile("modules.lua") premake.make.linkoptions_after = false; @@ -26,10 +37,12 @@ function maintargetosdoptions(_target,_subtarget) "comctl32", "comdlg32", "psapi", + "ole32", } -- needs same resources as messui, because dropdown menus are in mameui.rc override_resources = true; + rctarget = _subtarget; local rcfile = MAME_DIR .. "src/osd/winui/" .. _subtarget .. ".rc" local uifile = MAME_DIR .. "src/osd/winui/" .. _subtarget .. "ui.rc" @@ -109,6 +122,7 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd", MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", + MAME_DIR .. "src/osd/modules/file", MAME_DIR .. "src/osd/modules/render", MAME_DIR .. "3rdparty", } @@ -118,32 +132,55 @@ project ("osd_" .. _OPTIONS["osd"]) } files { - MAME_DIR .. "src/osd/modules/render/drawd3d.cpp", MAME_DIR .. "src/osd/modules/render/d3d/d3d9intf.cpp", + MAME_DIR .. "src/osd/modules/render/d3d/d3dintf.h", MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.cpp", + MAME_DIR .. "src/osd/modules/render/d3d/d3dcomm.h", + MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.h", + MAME_DIR .. "src/osd/modules/render/drawd3d.cpp", + MAME_DIR .. "src/osd/modules/render/drawd3d.h", MAME_DIR .. "src/osd/modules/render/drawgdi.cpp", + MAME_DIR .. "src/osd/modules/render/drawgdi.h", MAME_DIR .. "src/osd/modules/render/drawnone.cpp", - MAME_DIR .. "src/osd/windows/input.cpp", - MAME_DIR .. "src/osd/windows/output.cpp", + MAME_DIR .. "src/osd/modules/render/drawnone.h", MAME_DIR .. "src/osd/windows/video.cpp", + MAME_DIR .. "src/osd/windows/video.h", MAME_DIR .. "src/osd/windows/window.cpp", + MAME_DIR .. "src/osd/windows/window.h", MAME_DIR .. "src/osd/modules/osdwindow.cpp", MAME_DIR .. "src/osd/modules/osdwindow.h", + MAME_DIR .. "src/osd/windows/winmain.cpp", + MAME_DIR .. "src/osd/windows/winmain.h", + MAME_DIR .. "src/osd/osdepend.h", MAME_DIR .. "src/osd/winui/newui.cpp", MAME_DIR .. "src/osd/windows/winmain.cpp", MAME_DIR .. "src/osd/modules/debugger/win/consolewininfo.cpp", + MAME_DIR .. "src/osd/modules/debugger/win/consolewininfo.h", MAME_DIR .. "src/osd/modules/debugger/win/debugbaseinfo.cpp", + MAME_DIR .. "src/osd/modules/debugger/win/debugbaseinfo.h", MAME_DIR .. "src/osd/modules/debugger/win/debugviewinfo.cpp", + MAME_DIR .. "src/osd/modules/debugger/win/debugviewinfo.h", MAME_DIR .. "src/osd/modules/debugger/win/debugwininfo.cpp", + MAME_DIR .. "src/osd/modules/debugger/win/debugwininfo.h", MAME_DIR .. "src/osd/modules/debugger/win/disasmbasewininfo.cpp", + MAME_DIR .. "src/osd/modules/debugger/win/disasmbasewininfo.h", MAME_DIR .. "src/osd/modules/debugger/win/disasmviewinfo.cpp", + MAME_DIR .. "src/osd/modules/debugger/win/disasmviewinfo.h", MAME_DIR .. "src/osd/modules/debugger/win/disasmwininfo.cpp", + MAME_DIR .. "src/osd/modules/debugger/win/disasmwininfo.h", MAME_DIR .. "src/osd/modules/debugger/win/editwininfo.cpp", + MAME_DIR .. "src/osd/modules/debugger/win/editwininfo.h", MAME_DIR .. "src/osd/modules/debugger/win/logwininfo.cpp", + MAME_DIR .. "src/osd/modules/debugger/win/logwininfo.h", MAME_DIR .. "src/osd/modules/debugger/win/memoryviewinfo.cpp", + MAME_DIR .. "src/osd/modules/debugger/win/memoryviewinfo.h", MAME_DIR .. "src/osd/modules/debugger/win/memorywininfo.cpp", + MAME_DIR .. "src/osd/modules/debugger/win/memorywininfo.h", MAME_DIR .. "src/osd/modules/debugger/win/pointswininfo.cpp", + MAME_DIR .. "src/osd/modules/debugger/win/pointswininfo.h", MAME_DIR .. "src/osd/modules/debugger/win/uimetrics.cpp", + MAME_DIR .. "src/osd/modules/debugger/win/uimetrics.h", + MAME_DIR .. "src/osd/modules/debugger/win/debugwin.h", } @@ -161,8 +198,10 @@ project ("ocore_" .. _OPTIONS["osd"]) dofile("windows_cfg.lua") includedirs { + MAME_DIR .. "3rdparty", MAME_DIR .. "src/emu", MAME_DIR .. "src/osd", + MAME_DIR .. "src/osd/modules/file", MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", } @@ -177,30 +216,33 @@ project ("ocore_" .. _OPTIONS["osd"]) } files { + MAME_DIR .. "src/osd/eigccppc.h", + MAME_DIR .. "src/osd/eigccx86.h", + MAME_DIR .. "src/osd/eivc.h", + MAME_DIR .. "src/osd/eivcx86.h", + MAME_DIR .. "src/osd/eminline.h", + MAME_DIR .. "src/osd/osdcomm.h", MAME_DIR .. "src/osd/osdcore.cpp", + MAME_DIR .. "src/osd/osdcore.h", MAME_DIR .. "src/osd/strconv.cpp", + MAME_DIR .. "src/osd/strconv.h", 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/osdsync.cpp", + MAME_DIR .. "src/osd/osdsync.h", MAME_DIR .. "src/osd/windows/winutf8.cpp", + MAME_DIR .. "src/osd/windows/winutf8.h", MAME_DIR .. "src/osd/windows/winutil.cpp", - MAME_DIR .. "src/osd/windows/winclip.cpp", - MAME_DIR .. "src/osd/windows/winsocket.cpp", - MAME_DIR .. "src/osd/windows/winptty.cpp", + MAME_DIR .. "src/osd/windows/winutil.h", MAME_DIR .. "src/osd/modules/osdmodule.cpp", + MAME_DIR .. "src/osd/modules/osdmodule.h", + MAME_DIR .. "src/osd/modules/file/winfile.cpp", + MAME_DIR .. "src/osd/modules/file/winfile.h", + MAME_DIR .. "src/osd/modules/file/winptty.cpp", + MAME_DIR .. "src/osd/modules/file/winsocket.cpp", MAME_DIR .. "src/osd/modules/lib/osdlib_win32.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 -------------------------------------------------- diff --git a/docs/release/scripts/src/osd/sdl.lua b/docs/release/scripts/src/osd/sdl.lua index 76947ad777a..d1a83229698 100644 --- a/docs/release/scripts/src/osd/sdl.lua +++ b/docs/release/scripts/src/osd/sdl.lua @@ -38,7 +38,7 @@ function maintargetosdoptions(_target,_subtarget) } end - if BASE_TARGETOS=="unix" and _OPTIONS["targetos"]~="macosx" then + if BASE_TARGETOS=="unix" and _OPTIONS["targetos"]~="macosx" and _OPTIONS["targetos"]~="android" then links { "SDL2_ttf", } @@ -48,35 +48,53 @@ function maintargetosdoptions(_target,_subtarget) end if _OPTIONS["targetos"]=="windows" then - if _OPTIONS["USE_LIBSDL"]~="1" then + if _OPTIONS["with-bundled-sdl2"]~=nil then configuration { "mingw*"} links { - "SDL2.dll", - } - configuration { "x64","vs*" } - libdirs { - MAME_DIR .. "3rdparty/sdl2/lib/x64", - } - configuration { "x32","vs*" } - libdirs { - MAME_DIR .. "3rdparty/sdl2/lib/x86", + "SDL2", + "Imm32", + "Version", + "Ole32", + "OleAut32", } - - configuration { "vs*"} + configuration { "vs*" } links { "SDL2", + "Imm32", + "Version", } configuration { } else - local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'") - addlibfromstring(str) - addoptionsfromstring(str) + if _OPTIONS["USE_LIBSDL"]~="1" then + configuration { "mingw*"} + links { + "SDL2.dll", + } + configuration { "vs*" } + links { + "SDL2", + "Imm32", + "Version", + } + configuration { } + else + local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'") + addlibfromstring(str) + addoptionsfromstring(str) + end + configuration { "x32", "vs*" } + libdirs { + path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x86") + } + configuration { "x64", "vs*" } + libdirs { + path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x64") + } end links { "psapi", } - - configuration { "mingw*-gcc" } + configuration { "mingw*" } linkoptions{ "-municode", } @@ -84,14 +102,6 @@ function maintargetosdoptions(_target,_subtarget) flags { "Unicode", } - configuration { "x32", "vs*" } - libdirs { - path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x86") - } - configuration { "x64", "vs*" } - libdirs { - path.join(_OPTIONS["SDL_INSTALL_ROOT"],"lib","x64") - } configuration {} elseif _OPTIONS["targetos"]=="haiku" then links { @@ -105,8 +115,16 @@ function maintargetosdoptions(_target,_subtarget) links { "psapi" } - configuration { } + + if _OPTIONS["targetos"]=="macosx" then + if _OPTIONS["with-bundled-sdl2"]~=nil then + links { + "SDL2", + } + end + end + end @@ -127,8 +145,8 @@ newoption { } newoption { - trigger = "SDL_INI_PATH", - description = "Default search path for .ini files", + trigger = "SDL_INI_PATH", + description = "Default search path for .ini files", } newoption { @@ -141,7 +159,7 @@ newoption { } if not _OPTIONS["NO_X11"] then - if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"]=="asmjs" or _OPTIONS["targetos"]=="os2" then + if _OPTIONS["targetos"]=="windows" or _OPTIONS["targetos"]=="macosx" or _OPTIONS["targetos"]=="haiku" or _OPTIONS["targetos"]=="asmjs" then _OPTIONS["NO_X11"] = "1" else _OPTIONS["NO_X11"] = "0" @@ -204,34 +222,28 @@ 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" -elseif _OPTIONS["targetos"]=="os2" then - BASE_TARGETOS = "os2" - SDLOS_TARGETOS = "os2" - SYNC_IMPLEMENTATION = "os2" end +if _OPTIONS["with-bundled-sdl2"]~=nil or _OPTIONS["targetos"]=="android" then + includedirs { + GEN_DIR .. "includes", + } +end if BASE_TARGETOS=="unix" then if _OPTIONS["targetos"]=="macosx" then local os_version = str_to_version(backtick("sw_vers -productVersion")) @@ -243,22 +255,35 @@ if BASE_TARGETOS=="unix" then "-framework QuartzCore", "-framework OpenGL", } + + if os_version>=101100 then linkoptions { "-weak_framework Metal", } end - if _OPTIONS["USE_LIBSDL"]~="1" then + if _OPTIONS["with-bundled-sdl2"]~=nil then linkoptions { - "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"], - } - links { - "SDL2.framework", + "-framework AudioUnit", + "-framework CoreAudio", + "-framework Carbon", + "-framework ForceFeedback", + "-framework IOKit", + "-framework CoreVideo", } else - local str = backtick(sdlconfigcmd() .. " --libs --static | sed 's/-lSDLmain//'") - addlibfromstring(str) - addoptionsfromstring(str) + if _OPTIONS["USE_LIBSDL"]~="1" then + linkoptions { + "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"], + } + links { + "SDL2.framework", + } + else + local str = backtick(sdlconfigcmd() .. " --libs --static | sed 's/-lSDLmain//'") + addlibfromstring(str) + addoptionsfromstring(str) + end end else if _OPTIONS["NO_X11"]=="1" then @@ -270,10 +295,17 @@ if BASE_TARGETOS=="unix" then "/usr/openwin/lib", } end - local str = backtick(sdlconfigcmd() .. " --libs") - addlibfromstring(str) - addoptionsfromstring(str) - if _OPTIONS["targetos"]~="haiku" then + if _OPTIONS["with-bundled-sdl2"]~=nil and _OPTIONS["targetos"]~="android" then + links { + "SDL2", + } + else + local str = backtick(sdlconfigcmd() .. " --libs") + addlibfromstring(str) + addoptionsfromstring(str) + end + + if _OPTIONS["targetos"]~="haiku" and _OPTIONS["targetos"]~="android" then links { "m", "pthread", @@ -290,13 +322,6 @@ if BASE_TARGETOS=="unix" then end end end -elseif BASE_TARGETOS=="os2" then - local str = backtick(sdlconfigcmd() .. " --libs") - addlibfromstring(str) - addoptionsfromstring(str) - links { - "pthread" - } end project ("qtdbg_" .. _OPTIONS["osd"]) @@ -335,6 +360,7 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd", MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", + MAME_DIR .. "src/osd/modules/file", MAME_DIR .. "src/osd/modules/render", MAME_DIR .. "3rdparty", MAME_DIR .. "src/osd/sdl", @@ -342,7 +368,7 @@ project ("osd_" .. _OPTIONS["osd"]) if _OPTIONS["targetos"]=="windows" then files { - MAME_DIR .. "src/osd/sdl/main.cpp", + MAME_DIR .. "src/osd/windows/main.cpp", } end @@ -393,17 +419,12 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/sdl/sdlprefix.h", MAME_DIR .. "src/osd/sdl/sdlmain.cpp", MAME_DIR .. "src/osd/osdepend.h", - MAME_DIR .. "src/osd/sdl/input.cpp", - MAME_DIR .. "src/osd/sdl/input.h", MAME_DIR .. "src/osd/sdl/video.cpp", MAME_DIR .. "src/osd/sdl/video.h", MAME_DIR .. "src/osd/sdl/window.cpp", MAME_DIR .. "src/osd/sdl/window.h", MAME_DIR .. "src/osd/modules/osdwindow.cpp", MAME_DIR .. "src/osd/modules/osdwindow.h", - MAME_DIR .. "src/osd/sdl/output.cpp", - MAME_DIR .. "src/osd/sdl/watchdog.cpp", - MAME_DIR .. "src/osd/sdl/watchdog.h", MAME_DIR .. "src/osd/modules/render/drawsdl.cpp", } files { @@ -436,153 +457,37 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/osdcore.h", MAME_DIR .. "src/osd/strconv.cpp", MAME_DIR .. "src/osd/strconv.h", + MAME_DIR .. "src/osd/osdsync.cpp", + MAME_DIR .. "src/osd/osdsync.h", MAME_DIR .. "src/osd/sdl/sdldir.cpp", - MAME_DIR .. "src/osd/sdl/sdlfile.cpp", - MAME_DIR .. "src/osd/sdl/sdlfile.h", - MAME_DIR .. "src/osd/sdl/sdlptty_" .. BASE_TARGETOS ..".cpp", - MAME_DIR .. "src/osd/sdl/sdlsocket.cpp", - MAME_DIR .. "src/osd/sdl/sdlos_" .. SDLOS_TARGETOS .. ".cpp", MAME_DIR .. "src/osd/modules/osdmodule.cpp", 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.h", } - if _OPTIONS["NOASM"]=="1" then - files { - MAME_DIR .. "src/osd/modules/sync/work_mini.cpp", - } - else + if BASE_TARGETOS=="unix" then files { - MAME_DIR .. "src/osd/modules/sync/work_osd.cpp", + MAME_DIR .. "src/osd/modules/file/posixfile.cpp", + MAME_DIR .. "src/osd/modules/file/posixfile.h", + MAME_DIR .. "src/osd/modules/file/posixptty.cpp", + MAME_DIR .. "src/osd/modules/file/posixsocket.cpp", } - end - - if _OPTIONS["targetos"]=="macosx" then - files { - MAME_DIR .. "src/osd/sdl/osxutils.h", - MAME_DIR .. "src/osd/sdl/osxutils.mm", - } - end - - --------------------------------------------------- --- testkeys --------------------------------------------------- - -if _OPTIONS["with-tools"] then - project("testkeys") - uuid ("744cec21-c3b6-4d69-93cb-6811fed0ffe3") - kind "ConsoleApp" - - flags { - "Symbols", -- always include minimum symbols for executables - } - - dofile("sdl_cfg.lua") - + elseif BASE_TARGETOS=="win32" then includedirs { - MAME_DIR .. "src/osd", - MAME_DIR .. "src/lib/util", - } - - if _OPTIONS["SEPARATE_BIN"]~="1" then - targetdir(MAME_DIR) - end - - links { - "utils", - "ocore_" .. _OPTIONS["osd"], + MAME_DIR .. "src/osd/windows", } - files { - MAME_DIR .. "src/osd/sdl/testkeys.cpp", + MAME_DIR .. "src/osd/modules/file/winfile.cpp", + MAME_DIR .. "src/osd/modules/file/winfile.h", + MAME_DIR .. "src/osd/modules/file/winptty.cpp", + MAME_DIR .. "src/osd/modules/file/winsocket.cpp", + MAME_DIR .. "src/osd/windows/winutil.cpp", -- FIXME put the necessary functions somewhere more appropriate } - - if _OPTIONS["targetos"] == "windows" then - if _OPTIONS["USE_LIBSDL"]~="1" then - configuration { "mingw*"} - links { - "SDL2.dll", - } - configuration { "x64","vs*" } - libdirs { - MAME_DIR .. "3rdparty/sdl2/lib/x64", - } - configuration { "x32","vs*" } - libdirs { - MAME_DIR .. "3rdparty/sdl2/lib/x86", - } - configuration { "vs*"} - links { - "SDL2", - } - configuration { } - else - local str = backtick(sdlconfigcmd() .. " --libs | sed 's/ -lSDLmain//'") - addlibfromstring(str) - addoptionsfromstring(str) - end - links { - "psapi", - } - linkoptions{ - "-municode", - } - files { - MAME_DIR .. "src/osd/sdl/main.cpp", - } - end - - configuration { "mingw*" or "vs*" } - targetextension ".exe" - - configuration { } - - strip() -end - - --------------------------------------------------- --- aueffectutil --------------------------------------------------- - -if _OPTIONS["targetos"] == "macosx" and _OPTIONS["with-tools"] then - project("aueffectutil") - uuid ("3db8316d-fad7-4f5b-b46a-99373c91550e") - kind "ConsoleApp" - - flags { - "Symbols", -- always include minimum symbols for executables - } - - dofile("sdl_cfg.lua") - - if _OPTIONS["SEPARATE_BIN"]~="1" then - targetdir(MAME_DIR) - end - - linkoptions { - "-sectcreate __TEXT __info_plist " .. MAME_DIR .. "src/osd/sdl/aueffectutil-Info.plist", - } - - dependency { - { "aueffectutil", MAME_DIR .. "src/osd/sdl/aueffectutil-Info.plist", true }, - } - - links { - "AudioUnit.framework", - "AudioToolbox.framework", - "CoreAudio.framework", - "CoreAudioKit.framework", - "CoreServices.framework", - } - + else files { - MAME_DIR .. "src/osd/sdl/aueffectutil.mm", + MAME_DIR .. "src/osd/modules/file/stdfile.cpp", } + end + - strip() -end diff --git a/docs/release/scripts/src/osd/sdl_cfg.lua b/docs/release/scripts/src/osd/sdl_cfg.lua index e3a6f913e75..0fd15e5ca27 100644 --- a/docs/release/scripts/src/osd/sdl_cfg.lua +++ b/docs/release/scripts/src/osd/sdl_cfg.lua @@ -19,9 +19,9 @@ if _OPTIONS["NO_OPENGL"]~="1" and _OPTIONS["USE_DISPATCH_GL"]~="1" and _OPTIONS[ end if _OPTIONS["SDL_INI_PATH"]~=nil then - defines { - "'INI_PATH=\"" .. _OPTIONS["SDL_INI_PATH"] .. "\"'", - } + defines { + "'INI_PATH=\"" .. _OPTIONS["SDL_INI_PATH"] .. "\"'", + } end if _OPTIONS["NO_X11"]=="1" then @@ -67,7 +67,6 @@ end defines { "OSD_SDL", - "SYNC_IMPLEMENTATION=" .. SYNC_IMPLEMENTATION, } if BASE_TARGETOS=="unix" then @@ -75,18 +74,20 @@ if BASE_TARGETOS=="unix" then "SDLMAME_UNIX", } if _OPTIONS["targetos"]=="macosx" then - if _OPTIONS["USE_LIBSDL"]~="1" then - buildoptions { - "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"], - } - else - defines { - "MACOSX_USE_LIBSDL", - } - buildoptions { - backtick(sdlconfigcmd() .. " --cflags | sed 's:/SDL::'"), - } - end + if _OPTIONS["with-bundled-sdl2"]==nil then + if _OPTIONS["USE_LIBSDL"]~="1" then + buildoptions { + "-F" .. _OPTIONS["SDL_FRAMEWORK_PATH"], + } + else + defines { + "MACOSX_USE_LIBSDL", + } + buildoptions { + backtick(sdlconfigcmd() .. " --cflags | sed 's:/SDL::'"), + } + end + end else buildoptions { backtick(sdlconfigcmd() .. " --cflags"), @@ -100,7 +101,7 @@ if BASE_TARGETOS=="unix" then end if _OPTIONS["targetos"]=="windows" then - configuration { "mingw*-gcc or vs*" } + configuration { "mingw* or vs*" } defines { "UNICODE", "_UNICODE", @@ -111,10 +112,6 @@ if _OPTIONS["targetos"]=="windows" then defines { "MALLOC_DEBUG", } - configuration { "vs*" } - includedirs { - MAME_DIR .. "3rdparty/sdl2/include", - } configuration { } elseif _OPTIONS["targetos"]=="linux" then @@ -137,13 +134,6 @@ elseif _OPTIONS["targetos"]=="freebsd" then -- /usr/local/include is not considered a system include director on FreeBSD. GL.h resides there and throws warnings "-isystem /usr/local/include", } -elseif _OPTIONS["targetos"]=="os2" then - defines { - "SDLMAME_OS2", - } - buildoptions { - backtick(sdlconfigcmd() .. " --cflags"), - } end configuration { "osx*" } diff --git a/docs/release/scripts/src/osd/windows.lua b/docs/release/scripts/src/osd/windows.lua index 154d4732bc1..b4be2dc7ce4 100644 --- a/docs/release/scripts/src/osd/windows.lua +++ b/docs/release/scripts/src/osd/windows.lua @@ -15,7 +15,7 @@ dofile("modules.lua") function maintargetosdoptions(_target,_subtarget) osdmodulestargetconf() - configuration { "mingw*-gcc" } + configuration { "mingw*" } linkoptions { "-municode", } @@ -46,6 +46,7 @@ function maintargetosdoptions(_target,_subtarget) "comctl32", "comdlg32", "psapi", + "ole32", } end @@ -143,6 +144,7 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd", MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", + MAME_DIR .. "src/osd/modules/file", MAME_DIR .. "src/osd/modules/render", MAME_DIR .. "3rdparty", } @@ -163,10 +165,6 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/modules/render/drawgdi.h", MAME_DIR .. "src/osd/modules/render/drawnone.cpp", MAME_DIR .. "src/osd/modules/render/drawnone.h", - MAME_DIR .. "src/osd/windows/input.cpp", - MAME_DIR .. "src/osd/windows/input.h", - MAME_DIR .. "src/osd/windows/output.cpp", - MAME_DIR .. "src/osd/windows/output.h", MAME_DIR .. "src/osd/windows/video.cpp", MAME_DIR .. "src/osd/windows/video.h", MAME_DIR .. "src/osd/windows/window.cpp", @@ -218,15 +216,16 @@ project ("ocore_" .. _OPTIONS["osd"]) dofile("windows_cfg.lua") includedirs { + MAME_DIR .. "3rdparty", MAME_DIR .. "src/emu", MAME_DIR .. "src/osd", + MAME_DIR .. "src/osd/modules/file", MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", } BASE_TARGETOS = "win32" SDLOS_TARGETOS = "win32" - SYNC_IMPLEMENTATION = "windows" includedirs { MAME_DIR .. "src/osd/windows", @@ -244,61 +243,19 @@ project ("ocore_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd/osdcore.h", MAME_DIR .. "src/osd/strconv.cpp", MAME_DIR .. "src/osd/strconv.h", + MAME_DIR .. "src/osd/osdsync.cpp", + MAME_DIR .. "src/osd/osdsync.h", 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.h", MAME_DIR .. "src/osd/windows/winutf8.cpp", MAME_DIR .. "src/osd/windows/winutf8.h", MAME_DIR .. "src/osd/windows/winutil.cpp", MAME_DIR .. "src/osd/windows/winutil.h", - MAME_DIR .. "src/osd/windows/winfile.h", - MAME_DIR .. "src/osd/windows/winclip.cpp", - MAME_DIR .. "src/osd/windows/winsocket.cpp", - MAME_DIR .. "src/osd/windows/winptty.cpp", MAME_DIR .. "src/osd/modules/osdmodule.cpp", MAME_DIR .. "src/osd/modules/osdmodule.h", + MAME_DIR .. "src/osd/modules/file/winfile.cpp", + MAME_DIR .. "src/osd/modules/file/winfile.h", + MAME_DIR .. "src/osd/modules/file/winptty.cpp", + MAME_DIR .. "src/osd/modules/file/winsocket.cpp", MAME_DIR .. "src/osd/modules/lib/osdlib_win32.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 --------------------------------------------------- - -if _OPTIONS["with-tools"] then - project("ledutil") - uuid ("061293ca-7290-44ac-b2b5-5913ae8dc9c0") - kind "ConsoleApp" - - flags { - "Symbols", -- always include minimum symbols for executables - } - - if _OPTIONS["SEPARATE_BIN"]~="1" then - targetdir(MAME_DIR) - end - - links { - "ocore_" .. _OPTIONS["osd"], - } - - includedirs { - MAME_DIR .. "src/osd", - } - - files { - MAME_DIR .. "src/osd/windows/ledutil.cpp", - } -end diff --git a/docs/release/scripts/src/osd/windows_cfg.lua b/docs/release/scripts/src/osd/windows_cfg.lua index 3e656017816..b7636e5b435 100644 --- a/docs/release/scripts/src/osd/windows_cfg.lua +++ b/docs/release/scripts/src/osd/windows_cfg.lua @@ -5,7 +5,7 @@ defines { "OSD_WINDOWS", } -configuration { "mingw*-gcc or vs*" } +configuration { "mingw* or vs*" } defines { "UNICODE", "_UNICODE", diff --git a/docs/release/scripts/src/osd/winui.lua b/docs/release/scripts/src/osd/winui.lua index cff0beea684..263e4f42a74 100644 --- a/docs/release/scripts/src/osd/winui.lua +++ b/docs/release/scripts/src/osd/winui.lua @@ -1,3 +1,14 @@ +-- license:BSD-3-Clause +-- copyright-holders:Robbbert + +--------------------------------------------------------------------------- +-- +-- winui.lua +-- +-- Rules for the building for Windows +-- +--------------------------------------------------------------------------- + dofile("modules.lua") premake.make.linkoptions_after = false; @@ -48,11 +59,13 @@ function maintargetosdoptions(_target,_subtarget) "comctl32", "comdlg32", "psapi", + "ole32", } -- Local file gives correct icon in mame instance inside of mameui -- Local file must #include mameui.rc override_resources = true; + rctarget = _target; local rcfile = MAME_DIR .. "src/osd/winui/" .. _target .. ".rc" local uifile = MAME_DIR .. "src/osd/winui/" .. _target .. "ui.rc" @@ -132,6 +145,7 @@ project ("osd_" .. _OPTIONS["osd"]) MAME_DIR .. "src/osd", MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", + MAME_DIR .. "src/osd/modules/file", MAME_DIR .. "src/osd/modules/render", MAME_DIR .. "3rdparty", } @@ -141,60 +155,84 @@ project ("osd_" .. _OPTIONS["osd"]) } files { - MAME_DIR .. "src/osd/modules/render/drawd3d.cpp", MAME_DIR .. "src/osd/modules/render/d3d/d3d9intf.cpp", + MAME_DIR .. "src/osd/modules/render/d3d/d3dintf.h", MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.cpp", + MAME_DIR .. "src/osd/modules/render/d3d/d3dcomm.h", + MAME_DIR .. "src/osd/modules/render/d3d/d3dhlsl.h", + MAME_DIR .. "src/osd/modules/render/drawd3d.cpp", + MAME_DIR .. "src/osd/modules/render/drawd3d.h", MAME_DIR .. "src/osd/modules/render/drawgdi.cpp", + MAME_DIR .. "src/osd/modules/render/drawgdi.h", MAME_DIR .. "src/osd/modules/render/drawnone.cpp", - MAME_DIR .. "src/osd/windows/input.cpp", - MAME_DIR .. "src/osd/windows/output.cpp", + MAME_DIR .. "src/osd/modules/render/drawnone.h", MAME_DIR .. "src/osd/windows/video.cpp", + MAME_DIR .. "src/osd/windows/video.h", MAME_DIR .. "src/osd/windows/window.cpp", + MAME_DIR .. "src/osd/windows/window.h", MAME_DIR .. "src/osd/modules/osdwindow.cpp", MAME_DIR .. "src/osd/modules/osdwindow.h", + MAME_DIR .. "src/osd/windows/winmain.cpp", + MAME_DIR .. "src/osd/windows/winmain.h", + MAME_DIR .. "src/osd/osdepend.h", -- MAME_DIR .. "src/osd/windows/winmenu.cpp", MAME_DIR .. "src/osd/winui/newui.cpp", MAME_DIR .. "src/osd/windows/winmain.cpp", MAME_DIR .. "src/osd/modules/debugger/win/consolewininfo.cpp", + MAME_DIR .. "src/osd/modules/debugger/win/consolewininfo.h", MAME_DIR .. "src/osd/modules/debugger/win/debugbaseinfo.cpp", + MAME_DIR .. "src/osd/modules/debugger/win/debugbaseinfo.h", MAME_DIR .. "src/osd/modules/debugger/win/debugviewinfo.cpp", + MAME_DIR .. "src/osd/modules/debugger/win/debugviewinfo.h", MAME_DIR .. "src/osd/modules/debugger/win/debugwininfo.cpp", + MAME_DIR .. "src/osd/modules/debugger/win/debugwininfo.h", MAME_DIR .. "src/osd/modules/debugger/win/disasmbasewininfo.cpp", + MAME_DIR .. "src/osd/modules/debugger/win/disasmbasewininfo.h", MAME_DIR .. "src/osd/modules/debugger/win/disasmviewinfo.cpp", + MAME_DIR .. "src/osd/modules/debugger/win/disasmviewinfo.h", MAME_DIR .. "src/osd/modules/debugger/win/disasmwininfo.cpp", + MAME_DIR .. "src/osd/modules/debugger/win/disasmwininfo.h", MAME_DIR .. "src/osd/modules/debugger/win/editwininfo.cpp", + MAME_DIR .. "src/osd/modules/debugger/win/editwininfo.h", MAME_DIR .. "src/osd/modules/debugger/win/logwininfo.cpp", + MAME_DIR .. "src/osd/modules/debugger/win/logwininfo.h", MAME_DIR .. "src/osd/modules/debugger/win/memoryviewinfo.cpp", + MAME_DIR .. "src/osd/modules/debugger/win/memoryviewinfo.h", MAME_DIR .. "src/osd/modules/debugger/win/memorywininfo.cpp", + MAME_DIR .. "src/osd/modules/debugger/win/memorywininfo.h", MAME_DIR .. "src/osd/modules/debugger/win/pointswininfo.cpp", + MAME_DIR .. "src/osd/modules/debugger/win/pointswininfo.h", MAME_DIR .. "src/osd/modules/debugger/win/uimetrics.cpp", - MAME_DIR .. "src/osd/winui/win_options.cpp", - MAME_DIR .. "src/osd/winui/mui_util.cpp", - MAME_DIR .. "src/osd/winui/directinput.cpp", + MAME_DIR .. "src/osd/modules/debugger/win/uimetrics.h", + MAME_DIR .. "src/osd/modules/debugger/win/debugwin.h", + MAME_DIR .. "src/osd/winui/bitmask.cpp", + MAME_DIR .. "src/osd/winui/columnedit.cpp", + MAME_DIR .. "src/osd/winui/datafile.cpp", + MAME_DIR .. "src/osd/winui/datamap.cpp", + MAME_DIR .. "src/osd/winui/dialogs.cpp", MAME_DIR .. "src/osd/winui/dijoystick.cpp", MAME_DIR .. "src/osd/winui/directdraw.cpp", + MAME_DIR .. "src/osd/winui/directinput.cpp", MAME_DIR .. "src/osd/winui/directories.cpp", - MAME_DIR .. "src/osd/winui/mui_audit.cpp", - MAME_DIR .. "src/osd/winui/columnedit.cpp", - MAME_DIR .. "src/osd/winui/screenshot.cpp", - MAME_DIR .. "src/osd/winui/treeview.cpp", - MAME_DIR .. "src/osd/winui/splitters.cpp", - MAME_DIR .. "src/osd/winui/bitmask.cpp", - MAME_DIR .. "src/osd/winui/datamap.cpp", + MAME_DIR .. "src/osd/winui/dirwatch.cpp", MAME_DIR .. "src/osd/winui/dxdecode.cpp", - MAME_DIR .. "src/osd/winui/picker.cpp", - MAME_DIR .. "src/osd/winui/properties.cpp", - MAME_DIR .. "src/osd/winui/tabview.cpp", MAME_DIR .. "src/osd/winui/help.cpp", + MAME_DIR .. "src/osd/winui/helpids.cpp", MAME_DIR .. "src/osd/winui/history.cpp", - MAME_DIR .. "src/osd/winui/dialogs.cpp", - MAME_DIR .. "src/osd/winui/mui_opts.cpp", MAME_DIR .. "src/osd/winui/layout.cpp", - MAME_DIR .. "src/osd/winui/datafile.cpp", - MAME_DIR .. "src/osd/winui/dirwatch.cpp", - MAME_DIR .. "src/osd/winui/winui.cpp", - MAME_DIR .. "src/osd/winui/helpids.cpp", + MAME_DIR .. "src/osd/winui/mui_audit.cpp", MAME_DIR .. "src/osd/winui/mui_main.cpp", + MAME_DIR .. "src/osd/winui/mui_opts.cpp", + MAME_DIR .. "src/osd/winui/mui_util.cpp", + MAME_DIR .. "src/osd/winui/picker.cpp", + MAME_DIR .. "src/osd/winui/properties.cpp", + MAME_DIR .. "src/osd/winui/resource.h", + MAME_DIR .. "src/osd/winui/screenshot.cpp", + MAME_DIR .. "src/osd/winui/splitters.cpp", + MAME_DIR .. "src/osd/winui/tabview.cpp", + MAME_DIR .. "src/osd/winui/treeview.cpp", + MAME_DIR .. "src/osd/winui/winui.cpp", + MAME_DIR .. "src/osd/winui/win_options.cpp", } project ("ocore_" .. _OPTIONS["osd"]) @@ -211,8 +249,10 @@ project ("ocore_" .. _OPTIONS["osd"]) dofile("windows_cfg.lua") includedirs { + MAME_DIR .. "3rdparty", MAME_DIR .. "src/emu", MAME_DIR .. "src/osd", + MAME_DIR .. "src/osd/modules/file", MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", } @@ -227,18 +267,30 @@ project ("ocore_" .. _OPTIONS["osd"]) } files { + MAME_DIR .. "src/osd/eigccppc.h", + MAME_DIR .. "src/osd/eigccx86.h", + MAME_DIR .. "src/osd/eivc.h", + MAME_DIR .. "src/osd/eivcx86.h", + MAME_DIR .. "src/osd/eminline.h", + MAME_DIR .. "src/osd/osdcomm.h", MAME_DIR .. "src/osd/osdcore.cpp", + MAME_DIR .. "src/osd/osdcore.h", MAME_DIR .. "src/osd/strconv.cpp", + MAME_DIR .. "src/osd/strconv.h", + 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/osdsync.cpp", + MAME_DIR .. "src/osd/osdsync.h", MAME_DIR .. "src/osd/windows/winutf8.cpp", + MAME_DIR .. "src/osd/windows/winutf8.h", MAME_DIR .. "src/osd/windows/winutil.cpp", - MAME_DIR .. "src/osd/windows/winclip.cpp", - MAME_DIR .. "src/osd/windows/winsocket.cpp", - MAME_DIR .. "src/osd/windows/winptty.cpp", + MAME_DIR .. "src/osd/windows/winutil.h", MAME_DIR .. "src/osd/modules/osdmodule.cpp", - MAME_DIR .. "src/osd/modules/sync/work_osd.cpp", + MAME_DIR .. "src/osd/modules/osdmodule.h", + MAME_DIR .. "src/osd/modules/file/winfile.cpp", + MAME_DIR .. "src/osd/modules/file/winfile.h", + MAME_DIR .. "src/osd/modules/file/winptty.cpp", + MAME_DIR .. "src/osd/modules/file/winsocket.cpp", MAME_DIR .. "src/osd/modules/lib/osdlib_win32.cpp", } @@ -252,11 +304,9 @@ if _OPTIONS["with-tools"] then uuid ("061293ca-7290-44ac-b2b5-5913ae8dc9c0") kind "ConsoleApp" - options { - "ForceCPP", - } - - targetdir(MAME_DIR) + if _OPTIONS["SEPARATE_BIN"]~="1" then + targetdir(MAME_DIR) + end links { "ocore_" .. _OPTIONS["osd"], diff --git a/docs/release/scripts/src/sound.lua b/docs/release/scripts/src/sound.lua index 6fd7e6398d7..17f9c6aa2b2 100644 --- a/docs/release/scripts/src/sound.lua +++ b/docs/release/scripts/src/sound.lua @@ -9,6 +9,14 @@ -- ---------------------------------------------------------------------------- +files { + MAME_DIR .. "src/devices/sound/flt_vol.cpp", + MAME_DIR .. "src/devices/sound/flt_vol.h", + MAME_DIR .. "src/devices/sound/flt_rc.cpp", + MAME_DIR .. "src/devices/sound/flt_rc.h", + MAME_DIR .. "src/devices/sound/samples.cpp", + MAME_DIR .. "src/devices/sound/samples.h", +} --------------------------------------------------- -- DACs @@ -81,7 +89,7 @@ if (SOUNDS["DISCRETE"]~=null) then MAME_DIR .. "src/devices/sound/disc_mth.inc", MAME_DIR .. "src/devices/sound/disc_sys.inc", MAME_DIR .. "src/devices/sound/disc_wav.h", - MAME_DIR .. "src/devices/sound/disc_wav.inc", + MAME_DIR .. "src/devices/sound/disc_wav.inc", } end @@ -135,8 +143,8 @@ end if (SOUNDS["TIA"]~=null) then files { - MAME_DIR .. "src/devices/sound/tiasound.cpp", - MAME_DIR .. "src/devices/sound/tiasound.h", + MAME_DIR .. "src/devices/sound/tiasound.cpp", + MAME_DIR .. "src/devices/sound/tiasound.h", MAME_DIR .. "src/devices/sound/tiaintf.cpp", MAME_DIR .. "src/devices/sound/tiaintf.h", } @@ -483,7 +491,7 @@ end --------------------------------------------------- --- L7A1045 L6028 DSP-A +-- L7A1045 L6028 DSP-A --@src/devices/sound/l7a1045_l6028_dsp_a.h,SOUNDS["L7A1045"] = true --------------------------------------------------- @@ -730,8 +738,8 @@ end if (SOUNDS["QSOUND"]~=null) then files { - MAME_DIR .. "src/devices/sound/qsound.cpp", - MAME_DIR .. "src/devices/sound/qsound.h", + MAME_DIR .. "src/devices/sound/qsound.cpp", + MAME_DIR .. "src/devices/sound/qsound.h", MAME_DIR .. "src/devices/cpu/dsp16/dsp16.cpp", MAME_DIR .. "src/devices/cpu/dsp16/dsp16.h", MAME_DIR .. "src/devices/cpu/dsp16/dsp16dis.cpp", @@ -1154,8 +1162,8 @@ if (SOUNDS["YM2413"]~=null) then } end -if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null or SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then ---if (SOUNDS["YM2203"]~=null) then +if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null or SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then +--if (SOUNDS["YM2203"]~=null) then files { MAME_DIR .. "src/devices/sound/2203intf.cpp", MAME_DIR .. "src/devices/sound/2203intf.h", @@ -1169,12 +1177,12 @@ if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null o --if (SOUNDS["YM2608"]~=null) then files { - MAME_DIR .. "src/devices/sound/2608intf.cpp", - MAME_DIR .. "src/devices/sound/2608intf.h", - MAME_DIR .. "src/devices/sound/ay8910.cpp", - MAME_DIR .. "src/devices/sound/ay8910.h", - MAME_DIR .. "src/devices/sound/fm.cpp", - MAME_DIR .. "src/devices/sound/fm.h", + MAME_DIR .. "src/devices/sound/2608intf.cpp", + MAME_DIR .. "src/devices/sound/2608intf.h", + MAME_DIR .. "src/devices/sound/ay8910.cpp", + MAME_DIR .. "src/devices/sound/ay8910.h", + MAME_DIR .. "src/devices/sound/fm.cpp", + MAME_DIR .. "src/devices/sound/fm.h", MAME_DIR .. "src/devices/sound/ymdeltat.cpp", MAME_DIR .. "src/devices/sound/ymdeltat.h", } @@ -1182,12 +1190,12 @@ if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null o --if (SOUNDS["YM2610"]~=null or SOUNDS["YM2610B"]~=null) then files { - MAME_DIR .. "src/devices/sound/2610intf.cpp", - MAME_DIR .. "src/devices/sound/2610intf.h", - MAME_DIR .. "src/devices/sound/ay8910.cpp", - MAME_DIR .. "src/devices/sound/ay8910.h", - MAME_DIR .. "src/devices/sound/fm.cpp", - MAME_DIR .. "src/devices/sound/fm.h", + MAME_DIR .. "src/devices/sound/2610intf.cpp", + MAME_DIR .. "src/devices/sound/2610intf.h", + MAME_DIR .. "src/devices/sound/ay8910.cpp", + MAME_DIR .. "src/devices/sound/ay8910.h", + MAME_DIR .. "src/devices/sound/fm.cpp", + MAME_DIR .. "src/devices/sound/fm.h", MAME_DIR .. "src/devices/sound/ymdeltat.cpp", MAME_DIR .. "src/devices/sound/ymdeltat.h", } @@ -1195,10 +1203,10 @@ if (SOUNDS["YM2203"]~=null or SOUNDS["YM2608"]~=null or SOUNDS["YM2610"]~=null o --if (SOUNDS["YM2612"]~=null or SOUNDS["YM3438"]~=null) then files { - MAME_DIR .. "src/devices/sound/2612intf.cpp", - MAME_DIR .. "src/devices/sound/2612intf.h", - MAME_DIR .. "src/devices/sound/ay8910.cpp", - MAME_DIR .. "src/devices/sound/ay8910.h", + MAME_DIR .. "src/devices/sound/2612intf.cpp", + MAME_DIR .. "src/devices/sound/2612intf.h", + MAME_DIR .. "src/devices/sound/ay8910.cpp", + MAME_DIR .. "src/devices/sound/ay8910.h", MAME_DIR .. "src/devices/sound/fm2612.cpp", } --end @@ -1207,10 +1215,10 @@ end if (SOUNDS["YM3812"]~=null or SOUNDS["YM3526"]~=null or SOUNDS["Y8950"]~=null) then --if (SOUNDS["YM3812"]~=null) then files { - MAME_DIR .. "src/devices/sound/3812intf.cpp", - MAME_DIR .. "src/devices/sound/3812intf.h", - MAME_DIR .. "src/devices/sound/fmopl.cpp", - MAME_DIR .. "src/devices/sound/fmopl.h", + MAME_DIR .. "src/devices/sound/3812intf.cpp", + MAME_DIR .. "src/devices/sound/3812intf.h", + MAME_DIR .. "src/devices/sound/fmopl.cpp", + MAME_DIR .. "src/devices/sound/fmopl.h", MAME_DIR .. "src/devices/sound/ymdeltat.cpp", MAME_DIR .. "src/devices/sound/ymdeltat.h", } @@ -1218,10 +1226,10 @@ if (SOUNDS["YM3812"]~=null or SOUNDS["YM3526"]~=null or SOUNDS["Y8950"]~=null) t --if (SOUNDS["YM3526"]~=null) then files { - MAME_DIR .. "src/devices/sound/3526intf.cpp", - MAME_DIR .. "src/devices/sound/3526intf.h", - MAME_DIR .. "src/devices/sound/fmopl.cpp", - MAME_DIR .. "src/devices/sound/fmopl.h", + MAME_DIR .. "src/devices/sound/3526intf.cpp", + MAME_DIR .. "src/devices/sound/3526intf.h", + MAME_DIR .. "src/devices/sound/fmopl.cpp", + MAME_DIR .. "src/devices/sound/fmopl.h", MAME_DIR .. "src/devices/sound/ymdeltat.cpp", MAME_DIR .. "src/devices/sound/ymdeltat.h", } @@ -1229,10 +1237,10 @@ if (SOUNDS["YM3812"]~=null or SOUNDS["YM3526"]~=null or SOUNDS["Y8950"]~=null) t --if (SOUNDS["Y8950"]~=null) then files { - MAME_DIR .. "src/devices/sound/8950intf.cpp", - MAME_DIR .. "src/devices/sound/8950intf.h", - MAME_DIR .. "src/devices/sound/fmopl.cpp", - MAME_DIR .. "src/devices/sound/fmopl.h", + MAME_DIR .. "src/devices/sound/8950intf.cpp", + MAME_DIR .. "src/devices/sound/8950intf.h", + MAME_DIR .. "src/devices/sound/fmopl.cpp", + MAME_DIR .. "src/devices/sound/fmopl.h", MAME_DIR .. "src/devices/sound/ymdeltat.cpp", MAME_DIR .. "src/devices/sound/ymdeltat.h", } @@ -1241,8 +1249,8 @@ end if (SOUNDS["YMF262"]~=null) then files { - MAME_DIR .. "src/devices/sound/ymf262.cpp", - MAME_DIR .. "src/devices/sound/ymf262.h", + MAME_DIR .. "src/devices/sound/ymf262.cpp", + MAME_DIR .. "src/devices/sound/ymf262.h", MAME_DIR .. "src/devices/sound/262intf.cpp", MAME_DIR .. "src/devices/sound/262intf.h", } @@ -1283,8 +1291,18 @@ end if (SOUNDS["YMZ770"]~=null) then files { - MAME_DIR .. "src/devices/sound/ymz770.cpp", - MAME_DIR .. "src/devices/sound/ymz770.h", + MAME_DIR .. "src/devices/sound/ymz770.cpp", + MAME_DIR .. "src/devices/sound/ymz770.h", + } +end + +--------------------------------------------------- +-- MPEG AUDIO +--@src/devices/sound/mpeg_audio.h,SOUNDS["MPEG_AUDIO"] = true +--------------------------------------------------- + +if (SOUNDS["MPEG_AUDIO"]~=null) then + files { MAME_DIR .. "src/devices/sound/mpeg_audio.cpp", MAME_DIR .. "src/devices/sound/mpeg_audio.h", } @@ -1314,3 +1332,14 @@ if (SOUNDS["VRC6"]~=null) then } end +--------------------------------------------------- +-- AD1848 +--@src/devices/sound/ad1848.h,SOUNDS["AD1848"] = true +--------------------------------------------------- + +if (SOUNDS["AD1848"]~=null) then + files { + MAME_DIR .. "src/devices/sound/ad1848.cpp", + MAME_DIR .. "src/devices/sound/ad1848.h", + } +end diff --git a/docs/release/scripts/src/tests.lua b/docs/release/scripts/src/tests.lua index d30cff64df2..b5bb5b37366 100644 --- a/docs/release/scripts/src/tests.lua +++ b/docs/release/scripts/src/tests.lua @@ -22,15 +22,10 @@ project "gtest" "-Wno-unused-variable", } - configuration { "mingw-clang" } - buildoptions { - "-O0", -- crash of compiler when doing optimization - } - configuration { "vs*" } if _OPTIONS["vs"]=="intel-15" then buildoptions { - "/Qwd1195", -- error #1195: conversion from integer to smaller pointer + "/Qwd1195", -- error #1195: conversion from integer to smaller pointer } end @@ -45,15 +40,15 @@ end } -project("tests") +project("mametests") uuid ("66d4c639-196b-4065-a411-7ee9266564f5") - kind "ConsoleApp" + kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } - if _OPTIONS["SEPARATE_BIN"]~="1" then + if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -67,19 +62,23 @@ project("tests") links { "gtest", "utils", - "expat", - "zlib", + ext_lib("expat"), + ext_lib("zlib"), "ocore_" .. _OPTIONS["osd"], } includedirs { MAME_DIR .. "3rdparty/googletest/googletest/include", MAME_DIR .. "src/osd", + MAME_DIR .. "src/emu", MAME_DIR .. "src/lib/util", + ext_includedir("expat"), + ext_includedir("zlib"), } files { MAME_DIR .. "tests/main.cpp", MAME_DIR .. "tests/lib/util/corestr.cpp", + MAME_DIR .. "tests/emu/attotime.cpp", } diff --git a/docs/release/scripts/src/tools.lua b/docs/release/scripts/src/tools.lua index 421f5cc76b5..a2e5ad73496 100644 --- a/docs/release/scripts/src/tools.lua +++ b/docs/release/scripts/src/tools.lua @@ -15,32 +15,24 @@ project("romcmp") uuid ("1b40275b-194c-497b-8abd-9338775a21b8") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end links { "utils", - "expat", + ext_lib("expat"), + "7z", "ocore_" .. _OPTIONS["osd"], + ext_lib("zlib"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -48,6 +40,7 @@ includedirs { files { MAME_DIR .. "src/tools/romcmp.cpp", + MAME_DIR .. "src/emu/emucore.cpp", } configuration { "mingw*" or "vs*" } @@ -63,51 +56,37 @@ strip() project("chdman") uuid ("7d948868-42db-432a-9bb5-70ce5c5f4620") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end links { "utils", - "expat", + ext_lib("expat"), "7z", "ocore_" .. _OPTIONS["osd"], + ext_lib("zlib"), + ext_lib("flac"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - -if _OPTIONS["with-bundled-flac"] then - links { - "flac", - } -else - links { - "FLAC", - } -end - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", } +includedirs { + ext_includedir("flac"), +} files { MAME_DIR .. "src/tools/chdman.cpp", + MAME_DIR .. "src/emu/emucore.cpp", MAME_DIR .. "src/version.cpp", } @@ -124,32 +103,23 @@ strip() project("jedutil") uuid ("bda60edb-f7f5-489f-b232-23d33c43dda1") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end links { "utils", - "expat", + ext_lib("expat"), "ocore_" .. _OPTIONS["osd"], + ext_lib("zlib"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -157,6 +127,7 @@ includedirs { files { MAME_DIR .. "src/tools/jedutil.cpp", + MAME_DIR .. "src/emu/emucore.cpp", } configuration { "mingw*" or "vs*" } @@ -172,44 +143,26 @@ strip() project("unidasm") uuid ("65f81d3b-299a-4b08-a3fa-d5241afa9fd1") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end links { "dasm", "utils", - "expat", - "7z", + ext_lib("expat"), + "7z", "ocore_" .. _OPTIONS["osd"], + ext_lib("zlib"), + ext_lib("flac"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - -if _OPTIONS["with-bundled-flac"] then - links { - "flac", - } -else - links { - "FLAC", - } -end - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", @@ -235,51 +188,37 @@ strip() project("ldresample") uuid ("3401561a-4407-4e13-9c6d-c0801330f7cc") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end links { "utils", - "expat", - "7z", + ext_lib("expat"), + "7z", "ocore_" .. _OPTIONS["osd"], + ext_lib("zlib"), + ext_lib("flac"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - -if _OPTIONS["with-bundled-flac"] then - links { - "flac", - } -else - links { - "FLAC", - } -end - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", } +includedirs { + ext_includedir("flac"), +} files { MAME_DIR .. "src/tools/ldresample.cpp", + MAME_DIR .. "src/emu/emucore.cpp", } configuration { "mingw*" or "vs*" } @@ -295,51 +234,37 @@ strip() project("ldverify") uuid ("3e66560d-b928-4227-928b-eadd0a10f00a") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end links { "utils", - "expat", - "7z", + ext_lib("expat"), + "7z", "ocore_" .. _OPTIONS["osd"], + ext_lib("zlib"), + ext_lib("flac"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - -if _OPTIONS["with-bundled-flac"] then - links { - "flac", - } -else - links { - "FLAC", - } -end - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", MAME_DIR .. "3rdparty", } +includedirs { + ext_includedir("flac"), +} files { MAME_DIR .. "src/tools/ldverify.cpp", + MAME_DIR .. "src/emu/emucore.cpp", } configuration { "mingw*" or "vs*" } @@ -355,32 +280,23 @@ strip() project("regrep") uuid ("7f6de580-d800-4e8d-bed6-9fc86829584d") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end links { "utils", - "expat", + ext_lib("expat"), "ocore_" .. _OPTIONS["osd"], + ext_lib("zlib"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -388,6 +304,7 @@ includedirs { files { MAME_DIR .. "src/tools/regrep.cpp", + MAME_DIR .. "src/emu/emucore.cpp", } configuration { "mingw*" or "vs*" } @@ -403,32 +320,23 @@ strip() project("srcclean") uuid ("4dd58139-313a-42c5-965d-f378bdeed220") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end links { "utils", - "expat", + ext_lib("expat"), "ocore_" .. _OPTIONS["osd"], + ext_lib("zlib"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -436,6 +344,7 @@ includedirs { files { MAME_DIR .. "src/tools/srcclean.cpp", + MAME_DIR .. "src/emu/emucore.cpp", } configuration { "mingw*" or "vs*" } @@ -451,32 +360,23 @@ strip() project("src2html") uuid ("b31e963a-09ef-4696-acbd-e663e35ce6f7") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end links { "utils", - "expat", + ext_lib("expat"), "ocore_" .. _OPTIONS["osd"], + ext_lib("zlib"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -484,6 +384,7 @@ includedirs { files { MAME_DIR .. "src/tools/src2html.cpp", + MAME_DIR .. "src/emu/emucore.cpp", } configuration { "mingw*" or "vs*" } @@ -499,43 +400,25 @@ strip() project("split") uuid ("8ef6ff18-3199-4cc2-afd0-d64033070faa") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end links { "utils", - "expat", + ext_lib("expat"), "7z", "ocore_" .. _OPTIONS["osd"], + ext_lib("zlib"), + ext_lib("flac"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - -if _OPTIONS["with-bundled-flac"] then - links { - "flac", - } -else - links { - "FLAC", - } -end - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -543,6 +426,7 @@ includedirs { files { MAME_DIR .. "src/tools/split.cpp", + MAME_DIR .. "src/emu/emucore.cpp", } configuration { "mingw*" or "vs*" } @@ -558,32 +442,23 @@ strip() project("pngcmp") uuid ("61f647d9-b129-409b-9c62-8acf98ed39be") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end links { "utils", - "expat", + ext_lib("expat"), "ocore_" .. _OPTIONS["osd"], + ext_lib("zlib"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -591,6 +466,7 @@ includedirs { files { MAME_DIR .. "src/tools/pngcmp.cpp", + MAME_DIR .. "src/emu/emucore.cpp", } configuration { "mingw*" or "vs*" } @@ -606,44 +482,26 @@ strip() project("nltool") uuid ("853a03b7-fa37-41a8-8250-0dc23dd935d6") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end links { "utils", - "expat", + ext_lib("expat"), "7z", "ocore_" .. _OPTIONS["osd"], "netlist", + ext_lib("zlib"), + ext_lib("flac"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - -if _OPTIONS["with-bundled-flac"] then - links { - "flac", - } -else - links { - "FLAC", - } -end - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/lib/util", @@ -652,6 +510,7 @@ includedirs { files { MAME_DIR .. "src/lib/netlist/prg/nltool.cpp", + MAME_DIR .. "src/emu/emucore.cpp", } configuration { "mingw*" or "vs*" } @@ -667,30 +526,31 @@ strip() project("nlwav") uuid ("7c5396d1-2a1a-4c93-bed6-6b8fa182054a") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then - targetdir(MAME_DIR) +if _OPTIONS["SEPARATE_BIN"]~="1" then + targetdir(MAME_DIR) end links { - "utils", - "ocore_" .. _OPTIONS["osd"], - "netlist", + "utils", + "ocore_" .. _OPTIONS["osd"], + "netlist", } includedirs { - MAME_DIR .. "src/osd", - MAME_DIR .. "src/lib/util", - MAME_DIR .. "src/lib/netlist", + MAME_DIR .. "src/osd", + MAME_DIR .. "src/lib/util", + MAME_DIR .. "src/lib/netlist", } files { - MAME_DIR .. "src/lib/netlist/prg/nlwav.cpp", + MAME_DIR .. "src/lib/netlist/prg/nlwav.cpp", + MAME_DIR .. "src/emu/emucore.cpp", } configuration { "mingw*" or "vs*" } @@ -706,52 +566,35 @@ strip() project("castool") uuid ("7d9ed428-e2ba-4448-832d-d882a64d5c22") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end links { "formats", "utils", - "expat", + ext_lib("expat"), "7z", "ocore_" .. _OPTIONS["osd"], + ext_lib("zlib"), + ext_lib("flac"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - -if _OPTIONS["with-bundled-flac"] then - links { - "flac", - } -else - links { - "FLAC", - } -end - includedirs { MAME_DIR .. "src/osd", - MAME_DIR .. "src/lib", + MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", } files { MAME_DIR .. "src/tools/castool.cpp", + MAME_DIR .. "src/emu/emucore.cpp", } configuration { "mingw*" or "vs*" } @@ -767,13 +610,13 @@ strip() project("floptool") uuid ("85d8e3a6-1661-4ac9-8c21-281d20cbaf5b") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -781,39 +624,22 @@ links { "formats", "emu", "utils", - "expat", + ext_lib("expat"), "7z", "ocore_" .. _OPTIONS["osd"], + ext_lib("zlib"), + ext_lib("flac"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - -if _OPTIONS["with-bundled-flac"] then - links { - "flac", - } -else - links { - "FLAC", - } -end - includedirs { MAME_DIR .. "src/osd", - MAME_DIR .. "src/lib", + MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", } files { MAME_DIR .. "src/tools/floptool.cpp", + MAME_DIR .. "src/emu/emucore.cpp", } configuration { "mingw*" or "vs*" } @@ -829,13 +655,13 @@ strip() project("imgtool") uuid ("f3707807-e587-4297-a5d8-bc98f3d0b1ca") -kind "ConsoleApp" +kind "ConsoleApp" flags { - "Symbols", -- always include minimum symbols for executables + "Symbols", -- always include minimum symbols for executables } -if _OPTIONS["SEPARATE_BIN"]~="1" then +if _OPTIONS["SEPARATE_BIN"]~="1" then targetdir(MAME_DIR) end @@ -843,37 +669,19 @@ links { "formats", "emu", "utils", - "expat", + ext_lib("expat"), "7z", "ocore_" .. _OPTIONS["osd"], + ext_lib("zlib"), + ext_lib("flac"), } -if _OPTIONS["with-bundled-zlib"] then - links { - "zlib", - } -else - links { - "z", - } -end - -if _OPTIONS["with-bundled-flac"] then - links { - "flac", - } -else - links { - "FLAC", - } -end - includedirs { MAME_DIR .. "src/osd", - MAME_DIR .. "src/lib", + MAME_DIR .. "src/lib", MAME_DIR .. "src/lib/util", - MAME_DIR .. "3rdparty/zlib", - MAME_DIR .. "src/tools/imgtool", + ext_includedir("zlib"), + MAME_DIR .. "src/tools/imgtool", } files { @@ -894,21 +702,21 @@ files { MAME_DIR .. "src/tools/imgtool/imgtool.cpp", MAME_DIR .. "src/tools/imgtool/imgtool.h", MAME_DIR .. "src/tools/imgtool/imgterrs.cpp", - MAME_DIR .. "src/tools/imgtool/imgterrs.h", - MAME_DIR .. "src/tools/imgtool/imghd.cpp", + MAME_DIR .. "src/tools/imgtool/imgterrs.h", + MAME_DIR .. "src/tools/imgtool/imghd.cpp", MAME_DIR .. "src/tools/imgtool/imghd.h", MAME_DIR .. "src/tools/imgtool/charconv.cpp", MAME_DIR .. "src/tools/imgtool/charconv.h", MAME_DIR .. "src/tools/imgtool/formats/vt_dsk.cpp", MAME_DIR .. "src/tools/imgtool/formats/vt_dsk.h", MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.cpp", - MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.h", + MAME_DIR .. "src/tools/imgtool/formats/coco_dsk.h", MAME_DIR .. "src/tools/imgtool/modules/amiga.cpp", MAME_DIR .. "src/tools/imgtool/modules/macbin.cpp", MAME_DIR .. "src/tools/imgtool/modules/rsdos.cpp", MAME_DIR .. "src/tools/imgtool/modules/os9.cpp", MAME_DIR .. "src/tools/imgtool/modules/mac.cpp", - MAME_DIR .. "src/tools/imgtool/modules/ti99.cpp", + MAME_DIR .. "src/tools/imgtool/modules/ti99.cpp", MAME_DIR .. "src/tools/imgtool/modules/ti990hd.cpp", MAME_DIR .. "src/tools/imgtool/modules/concept.cpp", MAME_DIR .. "src/tools/imgtool/modules/fat.cpp", @@ -933,3 +741,45 @@ configuration { "mingw*" or "vs*" } configuration { } strip() + +-------------------------------------------------- +-- aueffectutil +-------------------------------------------------- + +if _OPTIONS["targetos"] == "macosx" then + project("aueffectutil") + uuid ("3db8316d-fad7-4f5b-b46a-99373c91550e") + kind "ConsoleApp" + + flags { + "Symbols", -- always include minimum symbols for executables + } + + if _OPTIONS["SEPARATE_BIN"]~="1" then + targetdir(MAME_DIR) + end + + linkoptions { + "-sectcreate __TEXT __info_plist " .. MAME_DIR .. "src/tools/aueffectutil-Info.plist", + } + + dependency { + { "aueffectutil", MAME_DIR .. "src/tools/aueffectutil-Info.plist", true }, + } + + links { + "AudioUnit.framework", + "AudioToolbox.framework", + "CoreAudio.framework", + "CoreAudioKit.framework", + "CoreServices.framework", + } + + files { + MAME_DIR .. "src/tools/aueffectutil.mm", + } + + configuration { } + + strip() +end diff --git a/docs/release/scripts/src/video.lua b/docs/release/scripts/src/video.lua index 96a310f154b..984bac6a950 100644 --- a/docs/release/scripts/src/video.lua +++ b/docs/release/scripts/src/video.lua @@ -9,6 +9,14 @@ -- --------------------------------------------------------------------------- +files { + MAME_DIR .. "src/devices/video/poly.h", + MAME_DIR .. "src/devices/video/sprite.cpp", + MAME_DIR .. "src/devices/video/sprite.h", + MAME_DIR .. "src/devices/video/vector.cpp", + MAME_DIR .. "src/devices/video/vector.h", +} + -------------------------------------------------- -- --@src/devices/video/315_5124.h,VIDEOS["SEGA315_5124"] = true @@ -513,9 +521,9 @@ if (VIDEOS["MOS6566"]~=null) then end -files { +files { MAME_DIR .. "src/devices/video/cgapal.cpp", - MAME_DIR .. "src/devices/video/cgapal.h", + MAME_DIR .. "src/devices/video/cgapal.h", } -------------------------------------------------- diff --git a/docs/release/scripts/target/hbmame/hbmame.lua b/docs/release/scripts/target/hbmame/hbmame.lua index 8ac8f1b465a..1ef6d7c7dc3 100644 --- a/docs/release/scripts/target/hbmame/hbmame.lua +++ b/docs/release/scripts/target/hbmame/hbmame.lua @@ -148,6 +148,7 @@ MACHINES["Z80PIO"] = true BUSES["GENERIC"] = true BUSES["NEOGEO"] = true +BUSES["NEOGEO_CTRL"] = true BUSES["SCSI"] = true -------------------------------------------------- @@ -202,10 +203,6 @@ function createHBMAMEProjects(_target, _subtarget, _name) -- addprojectflags() -- no idea if this is needed, seems to work fine without it precompiledheaders() --- options { --- "ForceCPP", --- } - includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", @@ -221,6 +218,9 @@ function createHBMAMEProjects(_target, _subtarget, _name) GEN_DIR .. "mame/layout", GEN_DIR .. "hbmame/layout", } + includedirs { + ext_includedir("flac"), + } end function createProjects_hbmame_hbmame(_target, _subtarget) @@ -284,7 +284,7 @@ files { MAME_DIR .. "src/hbmame/drivers/cps1.cpp", MAME_DIR .. "src/hbmame/video/cps1.cpp", MAME_DIR .. "src/hbmame/drivers/cps2.cpp", - MAME_DIR .. "src/mame/machine/cps2crpt.cpp", + MAME_DIR .. "src/mame/machine/cps2crypt.cpp", MAME_DIR .. "src/hbmame/drivers/cps3.cpp", MAME_DIR .. "src/mame/audio/cps3.cpp", MAME_DIR .. "src/hbmame/drivers/fcrash.cpp", @@ -361,6 +361,7 @@ files { MAME_DIR .. "src/hbmame/drivers/m52.cpp", MAME_DIR .. "src/mame/video/m52.cpp", MAME_DIR .. "src/mame/machine/irem_cpu.cpp", + MAME_DIR .. "src/mame/audio/nl_kidniki.cpp", MAME_DIR .. "src/mame/audio/irem.cpp", } @@ -559,8 +560,10 @@ files { MAME_DIR .. "src/mame/machine/fd1094.cpp", MAME_DIR .. "src/mame/machine/mc8123.cpp", MAME_DIR .. "src/mame/machine/segaic16.cpp", - MAME_DIR .. "src/mame/machine/segacrpt.cpp", - MAME_DIR .. "src/mame/machine/segacrp2.cpp", + MAME_DIR .. "src/mame/machine/segacrpt_device.cpp", + MAME_DIR .. "src/mame/machine/segacrpt_device.h", + MAME_DIR .. "src/mame/machine/segacrp2_device.cpp", + MAME_DIR .. "src/mame/machine/segacrp2_device.h", MAME_DIR .. "src/mame/audio/segasnd.cpp", MAME_DIR .. "src/mame/video/segaic16.cpp", MAME_DIR .. "src/mame/video/segaic16_road.cpp", diff --git a/docs/release/scripts/target/ldplayer/ldplayer.lua b/docs/release/scripts/target/ldplayer/ldplayer.lua index 1f4aafcd69f..4348f3bd318 100644 --- a/docs/release/scripts/target/ldplayer/ldplayer.lua +++ b/docs/release/scripts/target/ldplayer/ldplayer.lua @@ -56,7 +56,7 @@ function createProjects_ldplayer_ldplayer(_target, _subtarget) targetsubdir(_target .."_" .. _subtarget) kind (LIBTYPE) uuid (os.uuid("drvldplayer")) - + includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", @@ -78,7 +78,7 @@ function createProjects_ldplayer_ldplayer(_target, _subtarget) custombuildtask { layoutbuildtask("ldplayer/layout", "pr8210"), - } + } end function linkProjects_ldplayer_ldplayer(_target, _subtarget) diff --git a/docs/release/scripts/target/mame/arcade.lua b/docs/release/scripts/target/mame/arcade.lua index f59119796fc..ca5fc78e502 100644 --- a/docs/release/scripts/target/mame/arcade.lua +++ b/docs/release/scripts/target/mame/arcade.lua @@ -100,7 +100,7 @@ CPUS["SM8500"] = true CPUS["MINX"] = true CPUS["SSEM"] = true CPUS["AVR8"] = true ---CPUS["TMS0980"] = true +--CPUS["TMS1000"] = true CPUS["I4004"] = true CPUS["SUPERFX"] = true CPUS["Z8"] = true @@ -249,6 +249,7 @@ SOUNDS["TMS5110A"] = true SOUNDS["LMC1992"] = true SOUNDS["AWACS"] = true SOUNDS["YMZ770"] = true +SOUNDS["MPEG_AUDIO"] = true SOUNDS["T6721A"] = true SOUNDS["MOS7360"] = true --SOUNDS["ESQPUMP"] = true @@ -257,6 +258,7 @@ SOUNDS["SB0400"] = true SOUNDS["AC97"] = true SOUNDS["ES1373"] = true SOUNDS["L7A1045"] = true +SOUNDS["AD1848"] = true -------------------------------------------------- -- specify available video cores @@ -563,6 +565,8 @@ MACHINES["STEPPERS"] = true --MACHINES["DIABLO_HD"] = true MACHINES["PCI9050"] = true --MACHINES["TMS1024"] = true +MACHINES["GENPC"] = true +MACHINES["GEN_LATCH"] = true -------------------------------------------------- -- specify available bus cores @@ -598,6 +602,7 @@ BUSES["CENTRONICS"] = true --BUSES["EP64"] = true --BUSES["EPSON_SIO"] = true --BUSES["GAMEBOY"] = true +BUSES["GAMEGEAR"] = true --BUSES["GBA"] = true BUSES["GENERIC"] = true --BUSES["IEEE488"] = true @@ -613,25 +618,27 @@ BUSES["MIDI"] = true --BUSES["MEGADRIVE"] = true --BUSES["MSX_SLOT"] = true BUSES["NEOGEO"] = true +BUSES["NEOGEO_CTRL"] = true --BUSES["NES"] = true --BUSES["NUBUS"] = true --BUSES["O2"] = true --BUSES["ORICEXT"] = true --BUSES["PCE"] = true BUSES["PC_JOY"] = true ---BUSES["PC_KBD"] = true +BUSES["PC_KBD"] = true --BUSES["PET"] = true --BUSES["PLUS4"] = true --BUSES["PSX_CONTROLLER"] = true --BUSES["QL"] = true BUSES["RS232"] = true --BUSES["S100"] = true +BUSES["SAT_CTRL"] = true --BUSES["SATURN"] = true BUSES["SCSI"] = true --BUSES["SCV"] = true ---BUSES["SEGA8"] = true ---BUSES["SMS_CTRL"] = true ---BUSES["SMS_EXP"] = true +BUSES["SEGA8"] = true +BUSES["SMS_CTRL"] = true +BUSES["SMS_EXP"] = true --BUSES["SNES"] = true --BUSES["SPC1000"] = true --BUSES["TI99PEB"] = true @@ -781,6 +788,10 @@ function createMAMEProjects(_target, _subtarget, _name) MAME_DIR .. "3rdparty", GEN_DIR .. "mame/layout", } + includedirs { + ext_includedir("flac"), + } + end function createProjects_mame_arcade(_target, _subtarget) @@ -795,10 +806,8 @@ files { MAME_DIR .. "src/mame/machine/nmk112.h", MAME_DIR .. "src/mame/machine/pcshare.cpp", MAME_DIR .. "src/mame/machine/pcshare.h", - MAME_DIR .. "src/mame/machine/segacrpt.cpp", - MAME_DIR .. "src/mame/machine/segacrpt.h", - MAME_DIR .. "src/mame/machine/segacrp2.cpp", - MAME_DIR .. "src/mame/machine/segacrp2.h", + MAME_DIR .. "src/mame/machine/segacrpt_device.cpp", + MAME_DIR .. "src/mame/machine/segacrpt_device.h", MAME_DIR .. "src/mame/machine/ticket.cpp", MAME_DIR .. "src/mame/machine/ticket.h", MAME_DIR .. "src/mame/video/avgdvg.cpp", @@ -1277,7 +1286,7 @@ files { MAME_DIR .. "src/mame/video/cps1.cpp", MAME_DIR .. "src/mame/drivers/kenseim.cpp", MAME_DIR .. "src/mame/drivers/cps2.cpp", - MAME_DIR .. "src/mame/machine/cps2crpt.cpp", + MAME_DIR .. "src/mame/machine/cps2crypt.cpp", MAME_DIR .. "src/mame/machine/cps2crypt.h", MAME_DIR .. "src/mame/drivers/cps3.cpp", MAME_DIR .. "src/mame/includes/cps3.h", @@ -1328,6 +1337,7 @@ files { MAME_DIR .. "src/mame/machine/kabuki.cpp", MAME_DIR .. "src/mame/machine/kabuki.h", MAME_DIR .. "src/mame/drivers/tvcapcom.cpp", + MAME_DIR .. "src/mame/drivers/instantm.cpp", } createMAMEProjects(_target, _subtarget, "cinemat") @@ -1655,9 +1665,9 @@ files { MAME_DIR .. "src/mame/video/exidy440.cpp", MAME_DIR .. "src/mame/drivers/exidyttl.cpp", MAME_DIR .. "src/mame/drivers/maxaflex.cpp", - MAME_DIR .. "src/mame/machine/atari.cpp", - MAME_DIR .. "src/mame/includes/atari.h", - MAME_DIR .. "src/mame/video/atari.cpp", + MAME_DIR .. "src/mame/machine/atari400.cpp", + MAME_DIR .. "src/mame/includes/atari400.h", + MAME_DIR .. "src/mame/video/atari400.cpp", MAME_DIR .. "src/mame/video/antic.cpp", MAME_DIR .. "src/mame/video/antic.h", MAME_DIR .. "src/mame/video/gtia.cpp", @@ -1860,6 +1870,7 @@ files { MAME_DIR .. "src/mame/drivers/m62.cpp", MAME_DIR .. "src/mame/includes/m62.h", MAME_DIR .. "src/mame/video/m62.cpp", + MAME_DIR .. "src/mame/drivers/spartanxtec.cpp", MAME_DIR .. "src/mame/drivers/m63.cpp", MAME_DIR .. "src/mame/drivers/m72.cpp", MAME_DIR .. "src/mame/includes/m72.h", @@ -1894,6 +1905,7 @@ files { MAME_DIR .. "src/mame/machine/irem_cpu.h", MAME_DIR .. "src/mame/audio/irem.cpp", MAME_DIR .. "src/mame/audio/irem.h", + MAME_DIR .. "src/mame/audio/nl_kidniki.cpp", } createMAMEProjects(_target, _subtarget, "itech") @@ -2440,6 +2452,7 @@ files { MAME_DIR .. "src/mame/drivers/mcr3.cpp", MAME_DIR .. "src/mame/includes/mcr3.h", MAME_DIR .. "src/mame/video/mcr3.cpp", + MAME_DIR .. "src/mame/drivers/spyhuntertec.cpp", MAME_DIR .. "src/mame/drivers/mcr68.cpp", MAME_DIR .. "src/mame/includes/mcr68.h", MAME_DIR .. "src/mame/machine/mcr68.cpp", @@ -2590,8 +2603,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 +2834,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", } @@ -2996,7 +3003,7 @@ files { MAME_DIR .. "src/mame/machine/segabb.cpp", MAME_DIR .. "src/mame/machine/segabb.h", MAME_DIR .. "src/mame/machine/megadriv.cpp", - MAME_DIR .. "src/mame/includes/md_cons.h", + MAME_DIR .. "src/mame/includes/megadriv.h", MAME_DIR .. "src/mame/drivers/megadrvb.cpp", MAME_DIR .. "src/mame/drivers/megaplay.cpp", MAME_DIR .. "src/mame/drivers/megatech.cpp", @@ -3042,6 +3049,8 @@ files { MAME_DIR .. "src/mame/machine/naomim2.h", MAME_DIR .. "src/mame/machine/naomim4.cpp", MAME_DIR .. "src/mame/machine/naomim4.h", + MAME_DIR .. "src/mame/machine/m3comm.cpp", + MAME_DIR .. "src/mame/machine/m3comm.h", MAME_DIR .. "src/mame/machine/315-5881_crypt.cpp", MAME_DIR .. "src/mame/machine/315-5881_crypt.h", MAME_DIR .. "src/mame/machine/awboard.cpp", @@ -3060,6 +3069,10 @@ files { MAME_DIR .. "src/mame/drivers/puckpkmn.cpp", MAME_DIR .. "src/mame/drivers/segac2.cpp", MAME_DIR .. "src/mame/drivers/segae.cpp", + MAME_DIR .. "src/mame/drivers/sms.cpp", + MAME_DIR .. "src/mame/includes/sms.h", + MAME_DIR .. "src/mame/machine/sms.cpp", + MAME_DIR .. "src/mame/drivers/sms_bootleg.cpp", MAME_DIR .. "src/mame/drivers/shtzone.cpp", MAME_DIR .. "src/mame/drivers/segacoin.cpp", MAME_DIR .. "src/mame/drivers/segag80r.cpp", @@ -3119,6 +3132,8 @@ files { MAME_DIR .. "src/mame/video/suprloco.cpp", MAME_DIR .. "src/mame/drivers/system1.cpp", MAME_DIR .. "src/mame/includes/system1.h", + MAME_DIR .. "src/mame/machine/segacrp2_device.cpp", + MAME_DIR .. "src/mame/machine/segacrp2_device.h", MAME_DIR .. "src/mame/video/system1.cpp", MAME_DIR .. "src/mame/drivers/system16.cpp", MAME_DIR .. "src/mame/includes/system16.h", @@ -3240,7 +3255,7 @@ files { MAME_DIR .. "src/mame/machine/n64.cpp", MAME_DIR .. "src/mame/video/n64.cpp", MAME_DIR .. "src/mame/video/n64types.h", - MAME_DIR .. "src/mame/video/rdpfiltr.inc", + MAME_DIR .. "src/mame/video/rdpfiltr.inc", MAME_DIR .. "src/mame/video/n64.h", MAME_DIR .. "src/mame/video/rdpblend.cpp", MAME_DIR .. "src/mame/video/rdpblend.h", @@ -3327,6 +3342,8 @@ files { MAME_DIR .. "src/mame/drivers/snk68.cpp", MAME_DIR .. "src/mame/includes/snk68.h", MAME_DIR .. "src/mame/video/snk68.cpp", + MAME_DIR .. "src/mame/video/snk68_spr.cpp", + } createMAMEProjects(_target, _subtarget, "sony") @@ -4291,9 +4308,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", @@ -4349,6 +4363,7 @@ files { MAME_DIR .. "src/mame/drivers/jongkyo.cpp", MAME_DIR .. "src/mame/drivers/joystand.cpp", MAME_DIR .. "src/mame/drivers/jubilee.cpp", + MAME_DIR .. "src/mame/drivers/jungleyo.cpp", MAME_DIR .. "src/mame/drivers/kas89.cpp", MAME_DIR .. "src/mame/drivers/kingpin.cpp", MAME_DIR .. "src/mame/drivers/koikoi.cpp", @@ -4479,8 +4494,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/docs/release/scripts/target/mame/dummy.lua b/docs/release/scripts/target/mame/dummy.lua index f64a02fbae7..ec5d366abc6 100644 --- a/docs/release/scripts/target/mame/dummy.lua +++ b/docs/release/scripts/target/mame/dummy.lua @@ -19,7 +19,7 @@ function createProjects_mame_dummy(_target, _subtarget) uuid (os.uuid("drv-mame_dummy")) addprojectflags() precompiledheaders() - + includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", diff --git a/docs/release/scripts/target/mame/mame.lua b/docs/release/scripts/target/mame/mame.lua index 6769f26a701..b7360486042 100644 --- a/docs/release/scripts/target/mame/mame.lua +++ b/docs/release/scripts/target/mame/mame.lua @@ -14,7 +14,7 @@ dofile("mess.lua") function createProjects_mame_mame(_target, _subtarget) createProjects_mame_arcade(_target, _subtarget) - createProjects_mame_mess(_target, _subtarget) + createProjects_mame_mess(_target, _subtarget) end function linkProjects_mame_mame(_target, _subtarget) diff --git a/docs/release/scripts/target/mame/mess.lua b/docs/release/scripts/target/mame/mess.lua index 281601e4d5f..a4ebde0ff24 100644 --- a/docs/release/scripts/target/mame/mess.lua +++ b/docs/release/scripts/target/mame/mess.lua @@ -101,7 +101,7 @@ CPUS["SM8500"] = true CPUS["MINX"] = true CPUS["SSEM"] = true CPUS["AVR8"] = true -CPUS["TMS0980"] = true +CPUS["TMS1000"] = true CPUS["I4004"] = true CPUS["SUPERFX"] = true CPUS["Z8"] = true @@ -251,6 +251,7 @@ SOUNDS["TMS5110A"] = true SOUNDS["LMC1992"] = true SOUNDS["AWACS"] = true --SOUNDS["YMZ770"] = true +--SOUNDS["MPEG_AUDIO"] = true SOUNDS["T6721A"] = true SOUNDS["MOS7360"] = true SOUNDS["ESQPUMP"] = true @@ -522,6 +523,7 @@ MACHINES["SMPC"] = true MACHINES["STVCD"] = true MACHINES["TC0091LVC"] = true MACHINES["TIMEKPR"] = true +MACHINES["TMC0430"] = true MACHINES["TMP68301"] = true MACHINES["TMS5501"] = true MACHINES["TMS6100"] = true @@ -571,6 +573,8 @@ MACHINES["DIABLO_HD"] = true MACHINES["TMS1024"] = true MACHINES["NSC810"] = true MACHINES["VT82C496"] = true +MACHINES["GENPC"] = true +MACHINES["GEN_LATCH"] = true -------------------------------------------------- -- specify available bus cores @@ -615,9 +619,11 @@ BUSES["GENERIC"] = true BUSES["IEEE488"] = true BUSES["IMI7000"] = true BUSES["INTV"] = true +BUSES["INTV_CTRL"] = true BUSES["IQ151"] = true BUSES["ISA"] = true BUSES["ISBX"] = true +BUSES["HP_OPTROM"] = true BUSES["KC"] = true BUSES["LPCI"] = true BUSES["M5"] = true @@ -627,8 +633,10 @@ BUSES["MEGADRIVE"] = true BUSES["MSX_SLOT"] = true BUSES["NASBUS"] = true BUSES["NEOGEO"] = true +BUSES["NEOGEO_CTRL"] = true BUSES["NES"] = true BUSES["NES_CTRL"] = true +BUSES["NEWBRAIN"] = true BUSES["NUBUS"] = true BUSES["O2"] = true BUSES["ORICEXT"] = true @@ -641,6 +649,7 @@ BUSES["PSX_CONTROLLER"] = true BUSES["QL"] = true BUSES["RS232"] = true BUSES["S100"] = true +BUSES["SAT_CTRL"] = true BUSES["SATURN"] = true BUSES["SCSI"] = true BUSES["SCV"] = true @@ -650,6 +659,8 @@ BUSES["SMS_EXP"] = true BUSES["SNES"] = true BUSES["SNES_CTRL"] = true BUSES["SPC1000"] = true +BUSES["SVI_EXPANDER"] = true +BUSES["SVI_SLOT"] = true BUSES["TI99PEB"] = true BUSES["TI99X"] = true BUSES["TIKI100"] = true @@ -941,9 +952,9 @@ files { MAME_DIR .. "src/mame/video/amigaaga.cpp", MAME_DIR .. "src/mame/video/tia.cpp", MAME_DIR .. "src/mame/video/tia.h", - MAME_DIR .. "src/mame/machine/atari.cpp", - MAME_DIR .. "src/mame/video/atari.cpp", - MAME_DIR .. "src/mame/includes/atari.h", + MAME_DIR .. "src/mame/machine/atari400.cpp", + MAME_DIR .. "src/mame/video/atari400.cpp", + MAME_DIR .. "src/mame/includes/atari400.h", MAME_DIR .. "src/mame/video/antic.cpp", MAME_DIR .. "src/mame/video/antic.h", MAME_DIR .. "src/mame/video/gtia.cpp", @@ -954,7 +965,7 @@ files { MAME_DIR .. "src/mame/video/jaguar.cpp", MAME_DIR .. "src/mame/video/jagblit.h", MAME_DIR .. "src/mame/video/jagblit.inc", - MAME_DIR .. "src/mame/video/jagobj.inc", + MAME_DIR .. "src/mame/video/jagobj.inc", MAME_DIR .. "src/mame/audio/gorf.cpp", MAME_DIR .. "src/mame/audio/wow.cpp", MAME_DIR .. "src/mame/drivers/astrocde.cpp", @@ -971,7 +982,7 @@ files { MAME_DIR .. "src/mame/machine/n64.cpp", MAME_DIR .. "src/mame/video/n64.cpp", MAME_DIR .. "src/mame/video/n64types.h", - MAME_DIR .. "src/mame/video/rdpfiltr.inc", + MAME_DIR .. "src/mame/video/rdpfiltr.inc", MAME_DIR .. "src/mame/video/n64.h", MAME_DIR .. "src/mame/video/rdpblend.cpp", MAME_DIR .. "src/mame/video/rdpblend.h", @@ -1262,7 +1273,9 @@ files { createMESSProjects(_target, _subtarget, "at") files { MAME_DIR .. "src/mame/drivers/at.cpp", - MAME_DIR .. "src/mame/includes/at.h", + MAME_DIR .. "src/mame/drivers/atpci.cpp", + MAME_DIR .. "src/mame/drivers/ps2.cpp", + MAME_DIR .. "src/mame/machine/at.h", MAME_DIR .. "src/mame/machine/at.cpp", MAME_DIR .. "src/mame/drivers/ct486.cpp", } @@ -1312,11 +1325,11 @@ files { MAME_DIR .. "src/mame/drivers/tamag1.cpp", MAME_DIR .. "src/mame/drivers/wswan.cpp", MAME_DIR .. "src/mame/includes/wswan.h", - MAME_DIR .. "src/mame/audio/wswan_snd.cpp", - MAME_DIR .. "src/mame/audio/wswan_snd.h", + MAME_DIR .. "src/mame/audio/wswan.cpp", + MAME_DIR .. "src/mame/audio/wswan.h", MAME_DIR .. "src/mame/machine/wswan.cpp", - MAME_DIR .. "src/mame/video/wswan_video.cpp", - MAME_DIR .. "src/mame/video/wswan_video.h", + MAME_DIR .. "src/mame/video/wswan.cpp", + MAME_DIR .. "src/mame/video/wswan.h", } createMESSProjects(_target, _subtarget, "be") @@ -1664,8 +1677,8 @@ files { MAME_DIR .. "src/mame/includes/gamepock.h", MAME_DIR .. "src/mame/machine/gamepock.cpp", MAME_DIR .. "src/mame/drivers/scv.cpp", - MAME_DIR .. "src/mame/audio/upd1771.cpp", - MAME_DIR .. "src/mame/audio/upd1771.h", + MAME_DIR .. "src/devices/sound/upd1771.cpp", + MAME_DIR .. "src/devices/sound/upd1771.h", } createMESSProjects(_target, _subtarget, "epson") @@ -1774,8 +1787,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") @@ -1865,8 +1876,8 @@ createMESSProjects(_target, _subtarget, "interton") files { MAME_DIR .. "src/mame/drivers/vc4000.cpp", MAME_DIR .. "src/mame/includes/vc4000.h", - MAME_DIR .. "src/mame/audio/vc4000snd.cpp", - MAME_DIR .. "src/mame/audio/vc4000snd.h", + MAME_DIR .. "src/mame/audio/vc4000.cpp", + MAME_DIR .. "src/mame/audio/vc4000.h", MAME_DIR .. "src/mame/video/vc4000.cpp", } @@ -1961,6 +1972,7 @@ createMESSProjects(_target, _subtarget, "mb") files { MAME_DIR .. "src/mame/drivers/mbdtower.cpp", MAME_DIR .. "src/mame/drivers/microvsn.cpp", + MAME_DIR .. "src/mame/drivers/phantom.cpp", } createMESSProjects(_target, _subtarget, "mchester") @@ -2169,10 +2181,10 @@ createMESSProjects(_target, _subtarget, "novag") files { MAME_DIR .. "src/mame/drivers/mk1.cpp", MAME_DIR .. "src/mame/drivers/mk2.cpp", + MAME_DIR .. "src/mame/drivers/novag6502.cpp", MAME_DIR .. "src/mame/drivers/ssystem3.cpp", MAME_DIR .. "src/mame/includes/ssystem3.h", MAME_DIR .. "src/mame/video/ssystem3.cpp", - MAME_DIR .. "src/mame/drivers/supercon.cpp", } createMESSProjects(_target, _subtarget, "olivetti") @@ -2254,8 +2266,6 @@ files { MAME_DIR .. "src/mame/drivers/asst128.cpp", MAME_DIR .. "src/mame/drivers/europc.cpp", MAME_DIR .. "src/mame/drivers/genpc.cpp", - MAME_DIR .. "src/mame/includes/genpc.h", - MAME_DIR .. "src/mame/machine/genpc.cpp", MAME_DIR .. "src/mame/drivers/ibmpc.cpp", MAME_DIR .. "src/mame/drivers/ibmpcjr.cpp", MAME_DIR .. "src/mame/drivers/pc.cpp", @@ -2428,7 +2438,6 @@ files { MAME_DIR .. "src/mame/machine/dccons.cpp", MAME_DIR .. "src/mame/drivers/megadriv.cpp", MAME_DIR .. "src/mame/includes/megadriv.h", - MAME_DIR .. "src/mame/includes/md_cons.h", MAME_DIR .. "src/mame/drivers/saturn.cpp", MAME_DIR .. "src/mame/drivers/segapico.cpp", MAME_DIR .. "src/mame/drivers/sega_sawatte.cpp", @@ -2585,8 +2594,8 @@ createMESSProjects(_target, _subtarget, "special") files { MAME_DIR .. "src/mame/drivers/special.cpp", MAME_DIR .. "src/mame/includes/special.h", - MAME_DIR .. "src/mame/audio/specimx_snd.cpp", - MAME_DIR .. "src/mame/audio/specimx_snd.h", + MAME_DIR .. "src/mame/audio/special.cpp", + MAME_DIR .. "src/mame/audio/special.h", MAME_DIR .. "src/mame/machine/special.cpp", MAME_DIR .. "src/mame/video/special.cpp", } @@ -2602,8 +2611,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") @@ -2880,7 +2887,7 @@ files { createMESSProjects(_target, _subtarget, "usp") files { - MAME_DIR .. "src/mame/drivers/patinho_feio.cpp", + MAME_DIR .. "src/mame/drivers/patinho_feio.cpp", } createMESSProjects(_target, _subtarget, "veb") @@ -2915,8 +2922,8 @@ files { createMESSProjects(_target, _subtarget, "videoton") files { MAME_DIR .. "src/mame/drivers/tvc.cpp", - MAME_DIR .. "src/mame/audio/tvc_snd.cpp", - MAME_DIR .. "src/mame/audio/tvc_snd.h", + MAME_DIR .. "src/mame/audio/tvc.cpp", + MAME_DIR .. "src/mame/audio/tvc.h", } createMESSProjects(_target, _subtarget, "visual") @@ -2993,9 +3000,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") @@ -3113,8 +3117,8 @@ files { MAME_DIR .. "src/mame/drivers/lft.cpp", MAME_DIR .. "src/mame/drivers/lg-dvd.cpp", MAME_DIR .. "src/mame/drivers/lola8a.cpp", - MAME_DIR .. "src/mame/drivers/m79152pc.cpp", - MAME_DIR .. "src/mame/drivers/marywu.cpp", + MAME_DIR .. "src/mame/drivers/m79152pc.cpp", + MAME_DIR .. "src/mame/drivers/marywu.cpp", MAME_DIR .. "src/mame/drivers/mccpm.cpp", MAME_DIR .. "src/mame/drivers/mes.cpp", MAME_DIR .. "src/mame/drivers/mice.cpp", @@ -3148,6 +3152,7 @@ files { MAME_DIR .. "src/mame/drivers/pipbug.cpp", MAME_DIR .. "src/mame/drivers/plan80.cpp", MAME_DIR .. "src/mame/drivers/pm68k.cpp", + MAME_DIR .. "src/mame/drivers/pockchal.cpp", MAME_DIR .. "src/mame/drivers/poly.cpp", MAME_DIR .. "src/mame/drivers/proteus3.cpp", MAME_DIR .. "src/mame/drivers/pt68k4.cpp", @@ -3167,6 +3172,7 @@ files { MAME_DIR .. "src/mame/drivers/squale.cpp", MAME_DIR .. "src/mame/drivers/swtpc.cpp", MAME_DIR .. "src/mame/drivers/swyft.cpp", + MAME_DIR .. "src/mame/drivers/symbolics.cpp", MAME_DIR .. "src/mame/drivers/sys2900.cpp", MAME_DIR .. "src/mame/drivers/systec.cpp", MAME_DIR .. "src/mame/drivers/tavernie.cpp", diff --git a/docs/release/scripts/target/mame/nl.lua b/docs/release/scripts/target/mame/nl.lua index 3f06f495cd6..6abf50dcd1e 100644 --- a/docs/release/scripts/target/mame/nl.lua +++ b/docs/release/scripts/target/mame/nl.lua @@ -17,7 +17,9 @@ -------------------------------------------------- CPUS["Z80"] = true ---CPUS["M6502"] = true +CPUS["M6800"] = true +CPUS["M6803"] = true +CPUS["M6809"] = true --CPUS["MCS48"] = true --CPUS["MCS51"] = true --CPUS["M6800"] = true @@ -33,9 +35,9 @@ CPUS["Z80"] = true --SOUNDS["SAMPLES"] = true SOUNDS["DAC"] = true ---SOUNDS["DISCRETE"] = true +SOUNDS["DISCRETE"] = true SOUNDS["AY8910"] = true ---SOUNDS["YM2151"] = true +SOUNDS["MSM5205"] = true --SOUNDS["ASTROCADE"] = true --SOUNDS["TMS5220"] = true --SOUNDS["OKIM6295"] = true @@ -84,7 +86,9 @@ function createProjects_mame_nl(_target, _subtarget) targetsubdir(_target .."_" .. _subtarget) kind (LIBTYPE) uuid (os.uuid("drv-mame-nl")) - + addprojectflags() + precompiledheaders() + includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", @@ -109,6 +113,13 @@ files{ MAME_DIR .. "src/mame/drivers/popeye.cpp", MAME_DIR .. "src/mame/includes/popeye.h", MAME_DIR .. "src/mame/video/popeye.cpp", + + MAME_DIR .. "src/mame/drivers/m62.cpp", + MAME_DIR .. "src/mame/includes/m62.h", + MAME_DIR .. "src/mame/video/m62.cpp", + MAME_DIR .. "src/mame/audio/irem.cpp", + MAME_DIR .. "src/mame/audio/nl_kidniki.cpp", + MAME_DIR .. "src/mame/audio/irem.h", } end diff --git a/docs/release/scripts/target/mame/tiny.lua b/docs/release/scripts/target/mame/tiny.lua index 75d0cd955df..36b4032a525 100644 --- a/docs/release/scripts/target/mame/tiny.lua +++ b/docs/release/scripts/target/mame/tiny.lua @@ -82,7 +82,7 @@ function createProjects_mame_tiny(_target, _subtarget) uuid (os.uuid("drv-mame-tiny")) addprojectflags() precompiledheaders() - + includedirs { MAME_DIR .. "src/osd", MAME_DIR .. "src/emu", diff --git a/docs/release/scripts/toolchain.lua b/docs/release/scripts/toolchain.lua index 137a873ae09..2a5490fab06 100644 --- a/docs/release/scripts/toolchain.lua +++ b/docs/release/scripts/toolchain.lua @@ -16,8 +16,11 @@ newoption { description = "Choose GCC flavor", allowed = { { "android-arm", "Android - ARM" }, + { "android-arm64", "Android - ARM64" }, { "android-mips", "Android - MIPS" }, + { "android-mips64","Android - MIPS64" }, { "android-x86", "Android - x86" }, + { "android-x64", "Android - x64" }, { "asmjs", "Emscripten/asm.js" }, { "freebsd", "FreeBSD" }, { "linux-gcc", "Linux (GCC compiler)" }, @@ -27,17 +30,14 @@ newoption { { "mingw32-gcc", "MinGW32" }, { "mingw64-gcc", "MinGW64" }, { "mingw-clang", "MinGW (clang compiler)" }, - { "nacl", "Native Client" }, - { "nacl-arm", "Native Client - ARM" }, { "netbsd", "NetBSD" }, - { "os2", "OS/2" }, { "osx", "OSX (GCC compiler)" }, { "osx-clang", "OSX (Clang compiler)" }, { "pnacl", "Native Client - PNaCl" }, - { "qnx-arm", "QNX/Blackberry - ARM" }, { "rpi", "RaspberryPi" }, - { "solaris", "Solaris" }, - { "steamlink", "Steam Link" }, + { "solaris", "Solaris" }, + { "steamlink", "Steam Link" }, + { "ci20", "Creator-Ci20" }, }, } @@ -46,12 +46,12 @@ newoption { value = "toolset", description = "Choose VS toolset", allowed = { - { "intel-14", "Intel C++ Compiler XE 14.0" }, - { "intel-15", "Intel C++ Compiler XE 15.0" }, + { "intel-14", "Intel C++ Compiler XE 14.0" }, + { "intel-15", "Intel C++ Compiler XE 15.0" }, { "vs2013-clang", "Clang 3.6" }, { "vs2015-clang", "Clang 3.6" }, - { "vs2013-xp", "Visual Studio 2013 targeting XP" }, - { "vs2015-xp", "Visual Studio 2015 targeting XP" }, + { "vs2013-xp", "Visual Studio 2013 targeting XP" }, + { "vs2015-xp", "Visual Studio 2015 targeting XP" }, { "winphone8", "Windows Phone 8.0" }, { "winphone81", "Windows Phone 8.1" }, { "winstore81", "Windows Store 8.1" }, @@ -81,6 +81,12 @@ newoption { description = "Set iOS target version (default: 8.0).", } +newoption { + trigger = "with-windows", + value = "#", + description = "Set the Windows target platform version (default: 10.0.10240.0).", +} + function toolchain(_buildDir, _subDir) location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION) @@ -95,6 +101,11 @@ function toolchain(_buildDir, _subDir) iosPlatform = _OPTIONS["with-ios"] end + local windowsPlatform = "10.0.10240.0" + if _OPTIONS["with-windows"] then + windowsPlatform = _OPTIONS["with-windows"] + end + if _ACTION == "gmake" then if nil == _OPTIONS["gcc"] or nil == _OPTIONS["gcc_version"] then @@ -108,36 +119,77 @@ function toolchain(_buildDir, _subDir) print("Set ANDROID_NDK_ARM and ANDROID_NDK_ROOT envrionment variables.") end - premake.gcc.cc = "$(ANDROID_NDK_ARM)/bin/arm-linux-androideabi-gcc" - premake.gcc.cxx = "$(ANDROID_NDK_ARM)/bin/arm-linux-androideabi-g++" + premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe" + premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe" premake.gcc.ar = "$(ANDROID_NDK_ARM)/bin/arm-linux-androideabi-ar" + premake.gcc.llvm = true location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-arm") end + if "android-arm64" == _OPTIONS["gcc"] then + + if not os.getenv("ANDROID_NDK_ARM64") or not os.getenv("ANDROID_NDK_ROOT") then + print("Set ANDROID_NDK_ARM64 and ANDROID_NDK_ROOT envrionment variables.") + end + + premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe" + premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe" + premake.gcc.ar = "$(ANDROID_NDK_ARM64)/bin/aarch64-linux-android-ar.exe" + premake.gcc.llvm = true + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-arm64") + end + if "android-mips" == _OPTIONS["gcc"] then if not os.getenv("ANDROID_NDK_MIPS") or not os.getenv("ANDROID_NDK_ROOT") then print("Set ANDROID_NDK_MIPS and ANDROID_NDK_ROOT envrionment variables.") end - premake.gcc.cc = "$(ANDROID_NDK_MIPS)/bin/mipsel-linux-android-gcc" - premake.gcc.cxx = "$(ANDROID_NDK_MIPS)/bin/mipsel-linux-android-g++" + premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe" + premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe" premake.gcc.ar = "$(ANDROID_NDK_MIPS)/bin/mipsel-linux-android-ar" + premake.gcc.llvm = true location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-mips") end + if "android-mips64" == _OPTIONS["gcc"] then + + if not os.getenv("ANDROID_NDK_MIPS64") or not os.getenv("ANDROID_NDK_ROOT") then + print("Set ANDROID_NDK_MIPS64 and ANDROID_NDK_ROOT envrionment variables.") + end + + premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe" + premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe" + premake.gcc.ar = "$(ANDROID_NDK_MIPS64)/bin/mips64el-linux-android-ar.exe" + premake.gcc.llvm = true + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-mips64") + end + if "android-x86" == _OPTIONS["gcc"] then if not os.getenv("ANDROID_NDK_X86") or not os.getenv("ANDROID_NDK_ROOT") then print("Set ANDROID_NDK_X86 and ANDROID_NDK_ROOT envrionment variables.") end - premake.gcc.cc = "$(ANDROID_NDK_X86)/bin/i686-linux-android-gcc" - premake.gcc.cxx = "$(ANDROID_NDK_X86)/bin/i686-linux-android-g++" + premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe" + premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe" premake.gcc.ar = "$(ANDROID_NDK_X86)/bin/i686-linux-android-ar" + premake.gcc.llvm = true location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-x86") end + if "android-x64" == _OPTIONS["gcc"] then + + if not os.getenv("ANDROID_NDK_X64") or not os.getenv("ANDROID_NDK_ROOT") then + print("Set ANDROID_NDK_X64 and ANDROID_NDK_ROOT envrionment variables.") + end + + premake.gcc.cc = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang.exe" + premake.gcc.cxx = "$(ANDROID_NDK_ROOT)/toolchains/llvm/prebuilt/windows-x86_64/bin/clang++.exe" + premake.gcc.ar = "$(ANDROID_NDK_X64)/bin/x86_64-linux-android-ar.exe" + premake.gcc.llvm = true + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-android-x64") + end if "asmjs" == _OPTIONS["gcc"] then if not os.getenv("EMSCRIPTEN") then @@ -205,6 +257,26 @@ function toolchain(_buildDir, _subDir) location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-steamlink") end + if "rpi" == _OPTIONS["gcc"] then + if not os.getenv("RASPBERRY_SDK_PATH") then + print("Set RASPBERRY_SDK_PATH envrionment variable.") + end + premake.gcc.cc = "$(RASPBERRY_SDK_PATH)/bin/arm-linux-gnueabihf-gcc" + premake.gcc.cxx = "$(RASPBERRY_SDK_PATH)/bin/arm-linux-gnueabihf-g++" + premake.gcc.ar = "$(RASPBERRY_SDK_PATH)/bin/arm-linux-gnueabihf-ar" + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-rpi") + end + + if "ci20" == _OPTIONS["gcc"] then + if not os.getenv("MIPS_LINUXGNU_ROOT") then + print("Set MIPS_LINUXGNU_ROOT envrionment variable.") + end + premake.gcc.cc = "$(MIPS_LINUXGNU_ROOT)/bin/mips-mti-linux-gnu-gcc" + premake.gcc.cxx = "$(MIPS_LINUXGNU_ROOT)/bin/mips-mti-linux-gnu-g++" + premake.gcc.ar = "$(MIPS_LINUXGNU_ROOT)/bin/mips-mti-linux-gnu-ar" + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-ci20") + end + if "mingw32-gcc" == _OPTIONS["gcc"] then if not os.getenv("MINGW32") then print("Set MINGW32 envrionment variable.") @@ -253,44 +325,6 @@ function toolchain(_buildDir, _subDir) location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-mingw-clang") end - if "nacl" == _OPTIONS["gcc"] then - - if not os.getenv("NACL_SDK_ROOT") then - print("Set NACL_SDK_ROOT enviroment variables.") - end - - naclToolchain = "$(NACL_SDK_ROOT)/toolchain/win_x86_newlib/bin/x86_64-nacl-" - if os.is("macosx") then - naclToolchain = "$(NACL_SDK_ROOT)/toolchain/mac_x86_newlib/bin/x86_64-nacl-" - elseif os.is("linux") then - naclToolchain = "$(NACL_SDK_ROOT)/toolchain/linux_x86_newlib/bin/x86_64-nacl-" - end - - premake.gcc.cc = naclToolchain .. "gcc" - premake.gcc.cxx = naclToolchain .. "g++" - premake.gcc.ar = naclToolchain .. "ar" - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-nacl") - end - - if "nacl-arm" == _OPTIONS["gcc"] then - - if not os.getenv("NACL_SDK_ROOT") then - print("Set NACL_SDK_ROOT enviroment variables.") - end - - naclToolchain = "$(NACL_SDK_ROOT)/toolchain/win_arm_newlib/bin/arm-nacl-" - if os.is("macosx") then - naclToolchain = "$(NACL_SDK_ROOT)/toolchain/mac_arm_newlib/bin/arm-nacl-" - elseif os.is("linux") then - naclToolchain = "$(NACL_SDK_ROOT)/toolchain/linux_arm_newlib/bin/arm-nacl-" - end - - premake.gcc.cc = naclToolchain .. "gcc" - premake.gcc.cxx = naclToolchain .. "g++" - premake.gcc.ar = naclToolchain .. "ar" - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-nacl-arm") - end - if "osx" == _OPTIONS["gcc"] then if os.is("linux") then premake.gcc.cc = toolchainPrefix .. "clang" @@ -326,25 +360,14 @@ function toolchain(_buildDir, _subDir) location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-pnacl") end - if "qnx-arm" == _OPTIONS["gcc"] then - - if not os.getenv("QNX_HOST") then - print("Set QNX_HOST enviroment variables.") - end - - premake.gcc.cc = "$(QNX_HOST)/usr/bin/arm-unknown-nto-qnx8.0.0eabi-gcc" - premake.gcc.cxx = "$(QNX_HOST)/usr/bin/arm-unknown-nto-qnx8.0.0eabi-g++" - premake.gcc.ar = "$(QNX_HOST)/usr/bin/arm-unknown-nto-qnx8.0.0eabi-ar" - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-qnx-arm") - end - if "rpi" == _OPTIONS["gcc"] then location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-rpi") end - if "os2" == _OPTIONS["gcc"] then - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-os2") + if "ci20" == _OPTIONS["gcc"] then + location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-ci20") end + elseif _ACTION == "vs2013" or _ACTION == "vs2015" then if (_ACTION .. "-clang") == _OPTIONS["vs"] then @@ -373,6 +396,15 @@ function toolchain(_buildDir, _subDir) if "winstore82" == _OPTIONS["vs"] then premake.vstudio.toolset = "v140" premake.vstudio.storeapp = "8.2" + + -- If needed, depending on GENie version, enable file-level configuration + if enablefilelevelconfig ~= nil then + enablefilelevelconfig() + end + + local action = premake.action.current() + action.vstudio.windowsTargetPlatformVersion = windowsPlatform + platforms { "ARM" } location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-winstore82") end @@ -391,7 +423,7 @@ function toolchain(_buildDir, _subDir) premake.vstudio.toolset = ("v120_xp") location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-xp") end - + if ("vs2015-xp") == _OPTIONS["vs"] then premake.vstudio.toolset = ("v140_xp") location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-xp") @@ -477,7 +509,6 @@ function toolchain(_buildDir, _subDir) removeflags { "StaticRuntime", "NoExceptions", - "EnableMinimalRebuild", } configuration { "mingw*" } @@ -525,6 +556,93 @@ function toolchain(_buildDir, _subDir) configuration { "steamlink", "Debug" } targetdir (_buildDir .. "steamlink/bin/Debug") + configuration { "rpi" } + objdir ( _buildDir .. "rpi/obj") + libdirs { + "$(RASPBERRY_SYSROOT)/opt/vc/lib", + } + includedirs { + "$(RASPBERRY_SYSROOT)/opt/vc/include", + "$(RASPBERRY_SYSROOT)/opt/vc/include/interface/vcos/pthreads", + "$(RASPBERRY_SYSROOT)/opt/vc/include/interface/vmcs_host/linux", + } + defines { + "__VCCOREVER__=0x04000000", -- There is no special prefedined compiler symbol to detect RaspberryPi, faking it. + } + linkoptions { + "-Wl,--gc-sections", + } + buildoptions { + "--sysroot=$(RASPBERRY_SYSROOT)", + } + linkoptions { + "-static-libgcc", + "-static-libstdc++", + "--sysroot=$(RASPBERRY_SYSROOT)", + } + + configuration { "rpi", "Release" } + targetdir (_buildDir .. "rpi/bin/Release") + + configuration { "rpi", "Debug" } + targetdir (_buildDir .. "rpi/bin/Debug") + + configuration { "ci20" } + objdir ( _buildDir .. "ci20/obj") + includedirs { + "$(CI20_SYSROOT)/mipsel-r2-hard/usr/include/c++/4.9", + "$(CI20_SYSROOT)/mipsel-r2-hard/usr/include/mipsel-linux-gnu/c++/4.9", + "$(CI20_SYSROOT)/mipsel-r2-hard/usr/include/c++/4.9/backward", + "$(CI20_SYSROOT)/mipsel-r2-hard/usr/lib/gcc/mipsel-linux-gnu/4.9/include", + "$(CI20_SYSROOT)/mipsel-r2-hard/usr/local/include", + "$(CI20_SYSROOT)/mipsel-r2-hard/usr/lib/gcc/mipsel-linux-gnu/4.9/include-fixed", + "$(CI20_SYSROOT)/mipsel-r2-hard/usr/include/mipsel-linux-gnu", + "$(CI20_SYSROOT)/mipsel-r2-hard/usr/include", + } + links { + "c", + "dl", + "m", + "gcc", + "stdc++", + "gcc_s", + } + + buildoptions { + "--sysroot=$(CI20_SYSROOT)", + "-Wno-pragmas", + "-Wno-undef", + "-EL", + "-mel", + "-march=mips32r2", + "-mllsc", + "-mabi=32", + } + linkoptions { + "--sysroot=$(CI20_SYSROOT)", + "-Wl,-rpath=$(CI20_SYSROOT)/mipsel-r2-hard/usr/lib/mipsel-linux-gnu/", + "-Wl,-rpath=$(CI20_SYSROOT)/mipsel-r2-hard/lib/mipsel-linux-gnu/", + "-nostdlib", + "-EL", + "-mel", + "-march=mips32r2", + "-mllsc", + "-mabi=32", + "$(MIPS_LINUXGNU_ROOT)/lib/gcc/mips-mti-linux-gnu/4.9.2/mipsel-r2-hard/lib/crtbegin.o", + "$(MIPS_LINUXGNU_ROOT)/lib/gcc/mips-mti-linux-gnu/4.9.2/mipsel-r2-hard/lib/crtend.o", + "-L$(CI20_SYSROOT)/mipsel-r2-hard/usr/lib/gcc/mipsel-linux-gnu/4.9", + "-L$(CI20_SYSROOT)/mipsel-r2-hard/usr/lib/mipsel-linux-gnu", + "-L$(CI20_SYSROOT)/mipsel-r2-hard/usr/lib", + "-L$(CI20_SYSROOT)/mipsel-r2-hard/lib/mipsel-linux-gnu", + "-L$(CI20_SYSROOT)/mipsel-r2-hard/lib", + } + + configuration { "ci20", "Release" } + targetdir (_buildDir .. "ci20/bin/Release") + + configuration { "ci20", "Debug" } + targetdir (_buildDir .. "ci20/bin/Debug") + configuration { "mingw-clang" } linkoptions { "-Wl,--allow-multiple-definition", @@ -669,12 +787,13 @@ function toolchain(_buildDir, _subDir) configuration { "android-*" } includedirs { - "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/include", + MAME_DIR .. "3rdparty/bgfx/3rdparty/khronos", + "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libcxx/include", + "$(ANDROID_NDK_ROOT)/sources/android/support/include", "$(ANDROID_NDK_ROOT)/sources/android/native_app_glue", } linkoptions { "-nostdlib", - "-static-libgcc", } flags { "NoImportLib", @@ -685,19 +804,21 @@ function toolchain(_buildDir, _subDir) "m", "android", "log", - "gnustl_static", + "c++_static", "gcc", } buildoptions { - "-fPIC", - "-no-canonical-prefixes", - "-Wa,--noexecstack", - "-fstack-protector", + "-fpic", "-ffunction-sections", - "-Wno-cast-align", - "-Wno-psabi", -- note: the mangling of 'va_list' has changed in GCC 4.4.0 + "-funwind-tables", + "-fstack-protector-strong", + "-no-canonical-prefixes", + "-fno-integrated-as", "-Wunused-value", "-Wundef", + "-Wno-cast-align", + "-Wno-unknown-attributes", + "-Wno-macro-redefined", } linkoptions { "-no-canonical-prefixes", @@ -712,73 +833,144 @@ function toolchain(_buildDir, _subDir) targetdir (_buildDir .. "android-arm" .. "/bin") objdir (_buildDir .. "android-arm" .. "/obj") libdirs { - "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a", + "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/armeabi-v7a", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm/usr/lib", } includedirs { - "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/armeabi-v7a/include", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm/usr/include", } buildoptions { - "-mthumb", + "-gcc-toolchain $(ANDROID_NDK_ARM)", + "-target armv7-none-linux-androideabi", "-march=armv7-a", "-mfloat-abi=softfp", - "-mfpu=neon", - "-Wunused-value", - "-Wundef", + "-mfpu=vfpv3-d16", + "-mthumb", } linkoptions { + "-gcc-toolchain $(ANDROID_NDK_ARM)", + "--sysroot=$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm/usr/lib/crtbegin_so.o", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm/usr/lib/crtend_so.o", + "-target armv7-none-linux-androideabi", "-march=armv7-a", - "-Wl,--fix-cortex-a8", + "-mthumb", + } + + configuration { "android-arm64" } + androidPlatform = "android-21" -- supported from API 21 + targetdir (_buildDir .. "android-arm64" .. "/bin") + objdir (_buildDir .. "android-arm64" .. "/obj") + libdirs { + "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/arm64-v8a", + "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm64/usr/lib64", + } + includedirs { + "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm64/usr/include", + } + buildoptions { + "-gcc-toolchain $(ANDROID_NDK_ARM64)", + "-target aarch64-none-linux-android", + } + linkoptions { + "-gcc-toolchain $(ANDROID_NDK_ARM64)", + "--sysroot=$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm64", + "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm64/usr/lib/crtbegin_so.o", + "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-arm64/usr/lib/crtend_so.o", + "-target aarch64-none-linux-android", } configuration { "android-mips" } targetdir (_buildDir .. "android-mips" .. "/bin") objdir (_buildDir .. "android-mips" .. "/obj") libdirs { - "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/mips", + "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/mips", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips/usr/lib/", } includedirs { - "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/mips/include", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips/usr/include", } buildoptions { - "-Wunused-value", - "-Wundef", + "-gcc-toolchain $(ANDROID_NDK_MIPS)", + "-target mipsel-none-linux-android", } linkoptions { + "-gcc-toolchain $(ANDROID_NDK_MIPS)", + "-target mipsel-none-linux-android", + "--sysroot=$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips/usr/lib/crtbegin_so.o", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips/usr/lib/crtend_so.o", } + configuration { "android-mips64" } + androidPlatform = "android-21" -- supported from API 21 + targetdir (_buildDir .. "android-mips64" .. "/bin") + objdir (_buildDir .. "android-mips64" .. "/obj") + libdirs { + "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/mips64", + "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips64/usr/lib64/", + } + includedirs { + "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips64/usr/include", + } + buildoptions { + "-gcc-toolchain $(ANDROID_NDK_MIPS64)", + "-target mips64el-none-linux-android", + } + linkoptions { + "-gcc-toolchain $(ANDROID_NDK_MIPS64)", + "-target mips64el-none-linux-android", + "--sysroot=$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips64", + "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips64/usr/lib64/crtbegin_so.o", + "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-mips64/usr/lib64/crtend_so.o", + } + configuration { "android-x86" } targetdir (_buildDir .. "android-x86" .. "/bin") objdir (_buildDir .. "android-x86" .. "/obj") libdirs { - "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/x86", + "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/x86", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86/usr/lib", } includedirs { - "$(ANDROID_NDK_ROOT)/sources/cxx-stl/gnu-libstdc++/4.8/libs/x86/include", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86/usr/include", } buildoptions { - "-march=i686", - "-mtune=atom", - "-mstackrealign", - "-msse3", - "-mfpmath=sse", - "-Wunused-value", - "-Wundef", + "-gcc-toolchain $(ANDROID_NDK_X86)", + "-target i686-none-linux-android", + "-mssse3" } linkoptions { + "-gcc-toolchain $(ANDROID_NDK_X86)", + "-target i686-none-linux-android", + "-mssse3", + "--sysroot=$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86/usr/lib/crtbegin_so.o", "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86/usr/lib/crtend_so.o", } + configuration { "android-x64" } + androidPlatform = "android-21" -- supported from API 21 + targetdir (_buildDir .. "android-x64" .. "/bin") + objdir (_buildDir .. "android-x64" .. "/obj") + libdirs { + "$(ANDROID_NDK_ROOT)/sources/cxx-stl/llvm-libc++/libs/x86_64", + "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86_64/usr/lib64", + } + includedirs { + "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86_64/usr/include", + } + buildoptions { + "-gcc-toolchain $(ANDROID_NDK_X64)", + "-target x86_64-none-linux-android", + } + linkoptions { + "-gcc-toolchain $(ANDROID_NDK_X64)", + "-target x86_64-none-linux-android", + "--sysroot=$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86_64", + "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86_64/usr/lib64/crtbegin_so.o", + "$(ANDROID_NDK_ROOT)/platforms/" .. androidPlatform .. "/arch-x86_64/usr/lib64/crtend_so.o", + } configuration { "asmjs" } targetdir (_buildDir .. "asmjs" .. "/bin") @@ -801,7 +993,7 @@ function toolchain(_buildDir, _subDir) "-Wno-extern-c-compat", } - configuration { "nacl or nacl-arm or pnacl" } + configuration { "pnacl" } buildoptions { "-U__STRICT_ANSI__", -- strcasecmp, setenv, unsetenv,... "-fno-stack-protector", @@ -810,11 +1002,6 @@ function toolchain(_buildDir, _subDir) "-ffunction-sections", "-Wunused-value", } - configuration { "nacl or nacl-arm" } - includedirs { - "$(NACL_SDK_ROOT)/include", - "$(NACL_SDK_ROOT)/include/newlib", - } configuration { "pnacl" } buildoptions { @@ -826,36 +1013,6 @@ function toolchain(_buildDir, _subDir) "$(NACL_SDK_ROOT)/include/pnacl", } - configuration { "x32", "nacl" } - targetdir (_buildDir .. "nacl-x86" .. "/bin/x32") - objdir (_buildDir .. "nacl-x86" .. "/obj") - - configuration { "x32", "nacl", "Debug" } - libdirs { "$(NACL_SDK_ROOT)/lib/newlib_x86_32/Debug" } - - configuration { "x32", "nacl", "Release" } - libdirs { "$(NACL_SDK_ROOT)/lib/newlib_x86_32/Release" } - - configuration { "x64", "nacl" } - targetdir (_buildDir .. "nacl-x64" .. "/bin/x64") - objdir (_buildDir .. "nacl-x64" .. "/obj") - - configuration { "x64", "nacl", "Debug" } - libdirs { "$(NACL_SDK_ROOT)/lib/newlib_x86_64/Debug" } - - configuration { "x64", "nacl", "Release" } - libdirs { "$(NACL_SDK_ROOT)/lib/newlib_x86_64/Release" } - - configuration { "nacl-arm" } - targetdir (_buildDir .. "nacl-arm" .. "/bin") - objdir (_buildDir .. "nacl-arm" .. "/obj") - - configuration { "nacl-arm", "Debug" } - libdirs { "$(NACL_SDK_ROOT)/lib/newlib_arm/Debug" } - - configuration { "nacl-arm", "Release" } - libdirs { "$(NACL_SDK_ROOT)/lib/newlib_arm/Release" } - configuration { "pnacl" } targetdir (_buildDir .. "pnacl" .. "/bin") objdir (_buildDir .. "pnacl" .. "/obj") @@ -897,23 +1054,10 @@ function toolchain(_buildDir, _subDir) targetdir (_buildDir .. "ios-simulator" .. "/bin") objdir (_buildDir .. "ios-simulator" .. "/obj") - configuration { "qnx-arm" } - targetdir (_buildDir .. "qnx-arm" .. "/bin") - objdir (_buildDir .. "qnx-arm" .. "/obj") - configuration { "rpi" } targetdir (_buildDir .. "rpi" .. "/bin") objdir (_buildDir .. "rpi" .. "/obj") - configuration { "os2" } - objdir (_buildDir .. "os2" .. "/obj") - - configuration { "os2", "Release" } - targetdir (_buildDir .. "os2" .. "/bin/Release") - - configuration { "os2", "Debug" } - targetdir (_buildDir .. "os2" .. "/bin/Debug") - configuration {} -- reset configuration return true @@ -971,12 +1115,6 @@ function strip() "$(SILENT) " .. naclToolchain .. "finalize \"$(TARGET)\"" } - configuration { "*nacl*", "Release" } - postbuildcommands { - "$(SILENT) echo Stripping symbols.", - "$(SILENT) " .. naclToolchain .. "strip -s \"$(TARGET)\"" - } - configuration { "asmjs" } postbuildcommands { "$(SILENT) echo Running asmjs finalize.", @@ -984,12 +1122,6 @@ function strip() -- ALLOW_MEMORY_GROWTH } - configuration { "os2", "Release" } - postbuildcommands { - "$(SILENT) echo Stripping symbols.", - "$(SILENT) lxlite /B- /L- /CS \"$(TARGET)\"" - } - configuration {} -- reset configuration end |