mirror of
https://github.com/holub/mame
synced 2025-04-16 21:44:32 +03:00
-Got rid of some legacy MESS support glue.
* Got rid of the special-casing for the "mess" subtarget name. * Got rid of the MESS-specific Windows resources, emuator info source and man page. * Added subtarget name to the internal name and original name in Windows resources. -ui: Put the system-specific items on the input settings menu together, and fixed the crosshair visibility settings.
This commit is contained in:
Vas Crabb
parent
30ef2dd86b
commit
74fe6e9d5c
1332
docs/man/mess.6
1332
docs/man/mess.6
File diff suppressed because it is too large
Load Diff
@ -165,10 +165,6 @@ from the :ref:`main menu <menus-main>`. The items shown on this menu depend on
|
|||||||
available emulated inputs for the running system. Available emulated inputs may
|
available emulated inputs for the running system. Available emulated inputs may
|
||||||
depend on slot options, machine configuration settings and DIP switch settings.
|
depend on slot options, machine configuration settings and DIP switch settings.
|
||||||
|
|
||||||
Input Assignments (general)
|
|
||||||
Lets you select assign user interface controls, or assign default controls
|
|
||||||
for all emulated systems. See the section on :ref:`configuring inputs
|
|
||||||
<ui-inptcfg>` for more details.
|
|
||||||
Input Assignments (this system)
|
Input Assignments (this system)
|
||||||
Lets you select assign controls to emulated inputs for the running system.
|
Lets you select assign controls to emulated inputs for the running system.
|
||||||
See the section on :ref:`configuring inputs <ui-inptcfg>` for more details.
|
See the section on :ref:`configuring inputs <ui-inptcfg>` for more details.
|
||||||
@ -190,6 +186,10 @@ Toggle Inputs
|
|||||||
Shows the :ref:`Toggle Inputs menu <menus-inputtoggle>`, where you can view
|
Shows the :ref:`Toggle Inputs menu <menus-inputtoggle>`, where you can view
|
||||||
and adjust the state of multi-position or toggle inputs. This item is not
|
and adjust the state of multi-position or toggle inputs. This item is not
|
||||||
shown if the running system has no enabled toggle inputs.
|
shown if the running system has no enabled toggle inputs.
|
||||||
|
Input Assignments (general)
|
||||||
|
Lets you select assign user interface controls, or assign default controls
|
||||||
|
for all emulated systems. See the section on :ref:`configuring inputs
|
||||||
|
<ui-inptcfg>` for more details.
|
||||||
Input Devices
|
Input Devices
|
||||||
Shows the :ref:`Input Devices menu <menus-inputdevices>`, which lists the
|
Shows the :ref:`Input Devices menu <menus-inputdevices>`, which lists the
|
||||||
input devices recognised by MAME.
|
input devices recognised by MAME.
|
||||||
|
|||||||
@ -1,171 +1,137 @@
|
|||||||
#!/usr/bin/python3
|
#!/usr/bin/python3
|
||||||
##
|
##
|
||||||
## license:BSD-3-Clause
|
## license:BSD-3-Clause
|
||||||
## copyright-holders:Aaron Giles, Andrew Gardner
|
## copyright-holders:Vas Crabb
|
||||||
|
|
||||||
|
import argparse
|
||||||
import io
|
import io
|
||||||
import re
|
import re
|
||||||
|
import string
|
||||||
import sys
|
import sys
|
||||||
|
|
||||||
|
|
||||||
def parse_args():
|
def parse_args():
|
||||||
def usage():
|
parser = argparse.ArgumentParser()
|
||||||
sys.stderr.write('Usage: verinfo.py [-b mame|mess|ume] [-r|-p] [-o <outfile>] <srcfile>\n')
|
parser.add_argument('--target', '-t', metavar='<target>', default='mame', help='target name')
|
||||||
sys.exit(1)
|
parser.add_argument('--subtarget', '-s', metavar='<subtarget>', default='mame', help='subtarget name')
|
||||||
|
parser.add_argument('--executable', '-e', metavar='<executable>', default='mame', help='base executable name')
|
||||||
flags = True
|
parser.add_argument('--format', '-f', choices=('rc', 'plist'), metavar='<format>', default='rc', help='output format')
|
||||||
target = 'mame'
|
parser.add_argument('--resources', '-r', metavar='<resfile>', help='resource file to include')
|
||||||
format = 'rc'
|
parser.add_argument('-o', metavar='<outfile>', help='output file name')
|
||||||
input = None
|
parser.add_argument('input', metavar='<srcfile>', help='version info source file')
|
||||||
output = None
|
return parser.parse_args()
|
||||||
i = 1
|
|
||||||
while i < len(sys.argv):
|
|
||||||
if flags and (sys.argv[i] == '-r'):
|
|
||||||
format = 'rc'
|
|
||||||
elif flags and (sys.argv[i] == '-p'):
|
|
||||||
format = 'plist'
|
|
||||||
elif flags and (sys.argv[i] == '-b'):
|
|
||||||
i += 1
|
|
||||||
if i >= len(sys.argv):
|
|
||||||
usage()
|
|
||||||
else:
|
|
||||||
target = sys.argv[i]
|
|
||||||
elif flags and (sys.argv[i] == '-o'):
|
|
||||||
i += 1
|
|
||||||
if (i >= len(sys.argv)) or (output is not None):
|
|
||||||
usage()
|
|
||||||
else:
|
|
||||||
output = sys.argv[i]
|
|
||||||
elif flags and (sys.argv[i] == '--'):
|
|
||||||
flags = False
|
|
||||||
elif flags and sys.argv[i].startswith('-'):
|
|
||||||
usage()
|
|
||||||
elif input is not None:
|
|
||||||
usage()
|
|
||||||
else:
|
|
||||||
input = sys.argv[i]
|
|
||||||
i += 1
|
|
||||||
if input is None:
|
|
||||||
usage()
|
|
||||||
return target, format, input, output
|
|
||||||
|
|
||||||
|
|
||||||
def extract_version(input):
|
def extract_version(verinfo):
|
||||||
pattern = re.compile('\s+BARE_BUILD_VERSION\s+"(([^."]+)\.([^."]+))"')
|
pattern = re.compile('\s+BARE_BUILD_VERSION\s+"(([^."]+)\.([^."]+))"')
|
||||||
for line in input.readlines():
|
for line in verinfo:
|
||||||
match = pattern.search(line)
|
match = pattern.search(line)
|
||||||
if match:
|
if match:
|
||||||
return match.group(1), match.group(2), match.group(3)
|
return match.group(1), match.group(2), match.group(3)
|
||||||
return None, None, None
|
return None, None, None
|
||||||
|
|
||||||
|
|
||||||
build, outfmt, srcfile, dstfile = parse_args()
|
if __name__ == '__main__':
|
||||||
|
options = parse_args()
|
||||||
|
|
||||||
try:
|
|
||||||
fp = io.open(srcfile, 'r')
|
|
||||||
except IOError:
|
|
||||||
sys.stderr.write("Unable to open source file '%s'\n" % srcfile)
|
|
||||||
sys.exit(1)
|
|
||||||
|
|
||||||
version_string, version_major, version_minor = extract_version(fp)
|
|
||||||
version_build = "0"
|
|
||||||
version_subbuild = "0"
|
|
||||||
if not version_string:
|
|
||||||
sys.stderr.write("Unable to extract version from source file '%s'\n" % srcfile)
|
|
||||||
sys.exit(1)
|
|
||||||
fp.close()
|
|
||||||
|
|
||||||
if dstfile is not None:
|
|
||||||
try:
|
try:
|
||||||
fp = open(dstfile, 'w')
|
with io.open(options.input, 'r') as verinfo:
|
||||||
except IOError:
|
verfull, vermajor, verminor = extract_version(verinfo)
|
||||||
sys.stderr.write("Unable to open output file '%s'\n" % dstfile)
|
verbuild = '0'
|
||||||
|
except IOError as e:
|
||||||
|
sys.stderr.write("Error reading source file '%s': %s\n" % (options.input, e))
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
else:
|
|
||||||
fp = sys.stdout
|
|
||||||
|
|
||||||
if build == "mess":
|
if verfull is None:
|
||||||
# MESS
|
sys.stderr.write("Unable to extract version from source file '%s'\n" % (options.input, ))
|
||||||
author = "MESS Team"
|
sys.exit(1)
|
||||||
comments = "Multi Emulation Super System"
|
|
||||||
company_name = "MESS Team"
|
|
||||||
file_description = "MESS"
|
|
||||||
internal_name = "MESS"
|
|
||||||
original_filename = "MESS"
|
|
||||||
product_name = "MESS"
|
|
||||||
bundle_identifier = "org.mamedev.mess"
|
|
||||||
else:
|
|
||||||
# MAME
|
|
||||||
author = "Nicola Salmoria and the MAME Team"
|
|
||||||
comments = "Multi-purpose emulation framework"
|
|
||||||
company_name = "MAME Team"
|
|
||||||
file_description = "MAME"
|
|
||||||
internal_name = "MAME" if build == "mame" else build
|
|
||||||
original_filename = "MAME" if build == "mame" else build
|
|
||||||
product_name = "MAME" if build == "mame" else build
|
|
||||||
bundle_identifier = "org.mamedev." + build
|
|
||||||
|
|
||||||
legal_copyright = "Copyright Nicola Salmoria and the MAME team"
|
if options.format == 'plist':
|
||||||
|
template = string.Template(
|
||||||
if outfmt == 'rc':
|
'<?xml version="1.0" encoding="UTF-8"?>\n' \
|
||||||
fp.write('VS_VERSION_INFO VERSIONINFO\n')
|
'<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n' \
|
||||||
fp.write('\tFILEVERSION %s,%s,%s,%s\n' % (version_major, version_minor, version_build, version_subbuild))
|
'<plist version="1.0">\n' \
|
||||||
fp.write('\tPRODUCTVERSION %s,%s,%s,%s\n' % (version_major, version_minor, version_build, version_subbuild))
|
'<dict>\n' \
|
||||||
fp.write('\tFILEFLAGSMASK 0x3fL\n')
|
'\t<key>CFBundleDisplayName</key>\n' \
|
||||||
if version_build == 0:
|
'\t<string>${product}</string>\n' \
|
||||||
fp.write('\tFILEFLAGS 0x0L\n')
|
'\t<key>CFBundleIdentifier</key>\n' \
|
||||||
|
'\t<string>${rdns}</string>\n' \
|
||||||
|
'\t<key>CFBundleInfoDictionaryVersion</key>\n' \
|
||||||
|
'\t<string>6.0</string>\n' \
|
||||||
|
'\t<key>CFBundleName</key>\n' \
|
||||||
|
'\t<string>${product}</string>\n' \
|
||||||
|
'\t<key>CFBundleShortVersionString</key>\n' \
|
||||||
|
'\t<string>${major}.${minor}.${build}</string>\n' \
|
||||||
|
'\t<key>NSPrincipalClass</key>\n' \
|
||||||
|
'\t<string>NSApplication</string>\n' \
|
||||||
|
'</dict>\n' \
|
||||||
|
'</plist>\n')
|
||||||
else:
|
else:
|
||||||
fp.write('\tFILEFLAGS VS_FF_PRERELEASE\n')
|
template = string.Template(
|
||||||
fp.write('\tFILEOS VOS_NT_WINDOWS32\n')
|
'#include <windows.h>\n' \
|
||||||
fp.write('\tFILETYPE VFT_APP\n')
|
'#pragma code_page(65001)\n' \
|
||||||
fp.write('\tFILESUBTYPE VFT2_UNKNOWN\n')
|
'VS_VERSION_INFO VERSIONINFO\n' \
|
||||||
fp.write('BEGIN\n')
|
'\tFILEVERSION ${major},${minor},${build},${subbuild}\n' \
|
||||||
fp.write('\tBLOCK "StringFileInfo"\n')
|
'\tPRODUCTVERSION ${major},${minor},${build},${subbuild}\n' \
|
||||||
fp.write('\tBEGIN\n')
|
'\tFILEFLAGSMASK 0x3fL\n' \
|
||||||
fp.write('#ifdef UNICODE\n')
|
'\tFILEFLAGS ${winfileflags}\n' \
|
||||||
fp.write('\t\tBLOCK "040904b0"\n')
|
'\tFILEOS VOS_NT_WINDOWS32\n' \
|
||||||
fp.write('#else\n')
|
'\tFILETYPE VFT_APP\n' \
|
||||||
fp.write('\t\tBLOCK "040904E4"\n')
|
'\tFILESUBTYPE VFT2_UNKNOWN\n' \
|
||||||
fp.write('#endif\n')
|
'BEGIN\n' \
|
||||||
fp.write('\t\tBEGIN\n')
|
'\tBLOCK "StringFileInfo"\n' \
|
||||||
fp.write('\t\t\tVALUE "Author", "%s\\0"\n' % author)
|
'\tBEGIN\n' \
|
||||||
fp.write('\t\t\tVALUE "Comments", "%s\\0"\n' % comments)
|
'#ifdef UNICODE\n' \
|
||||||
fp.write('\t\t\tVALUE "CompanyName", "%s\\0"\n' % company_name)
|
'\t\tBLOCK "040904b0"\n' \
|
||||||
fp.write('\t\t\tVALUE "FileDescription", "%s\\0"\n' % file_description)
|
'#else\n' \
|
||||||
fp.write('\t\t\tVALUE "FileVersion", "%s, %s, %s, %s\\0"\n' % (version_major, version_minor, version_build, version_subbuild))
|
'\t\tBLOCK "040904E4"\n' \
|
||||||
fp.write('\t\t\tVALUE "InternalName", "%s\\0"\n' % internal_name)
|
'#endif\n' \
|
||||||
fp.write('\t\t\tVALUE "LegalCopyright", "%s\\0"\n' % legal_copyright)
|
'\t\tBEGIN\n' \
|
||||||
fp.write('\t\t\tVALUE "OriginalFilename", "%s\\0"\n' % original_filename)
|
'\t\t\tVALUE "Author", "${author}\\0"\n' \
|
||||||
fp.write('\t\t\tVALUE "ProductName", "%s\\0"\n' % product_name)
|
'\t\t\tVALUE "Comments", "${comments}\\0"\n' \
|
||||||
fp.write('\t\t\tVALUE "ProductVersion", "%s\\0"\n' % version_string)
|
'\t\t\tVALUE "CompanyName", "${company}\\0"\n' \
|
||||||
fp.write('\t\tEND\n')
|
'\t\t\tVALUE "FileDescription", "${filedesc}\\0"\n' \
|
||||||
fp.write('\tEND\n')
|
'\t\t\tVALUE "FileVersion", "${major}, ${minor}, ${build}, ${subbuild}\\0"\n' \
|
||||||
fp.write('\tBLOCK "VarFileInfo"\n')
|
'\t\t\tVALUE "InternalName", "${internal}\\0"\n' \
|
||||||
fp.write('\tBEGIN\n')
|
'\t\t\tVALUE "LegalCopyright", "${copyright}\\0"\n' \
|
||||||
fp.write('#ifdef UNICODE\n')
|
'\t\t\tVALUE "OriginalFilename", "${original}\\0"\n' \
|
||||||
fp.write('\t\tVALUE "Translation", 0x409, 1200\n')
|
'\t\t\tVALUE "ProductName", "${product}\\0"\n' \
|
||||||
fp.write('#else\n')
|
'\t\t\tVALUE "ProductVersion", "${version}\\0"\n' \
|
||||||
fp.write('\t\tVALUE "Translation", 0x409, 1252\n')
|
'\t\tEND\n' \
|
||||||
fp.write('#endif\n')
|
'\tEND\n' \
|
||||||
fp.write('\tEND\n')
|
'\tBLOCK "VarFileInfo"\n' \
|
||||||
fp.write('END\n')
|
'\tBEGIN\n' \
|
||||||
elif outfmt == 'plist':
|
'#ifdef UNICODE\n' \
|
||||||
fp.write('<?xml version="1.0" encoding="UTF-8"?>\n')
|
'\t\tVALUE "Translation", 0x409, 1200\n' \
|
||||||
fp.write('<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">\n')
|
'#else\n' \
|
||||||
fp.write('<plist version="1.0">\n')
|
'\t\tVALUE "Translation", 0x409, 1252\n' \
|
||||||
fp.write('<dict>\n')
|
'#endif\n' \
|
||||||
fp.write('\t<key>CFBundleDisplayName</key>\n')
|
'\tEND\n' \
|
||||||
fp.write('\t<string>%s</string>\n' % product_name)
|
'END\n' \
|
||||||
fp.write('\t<key>CFBundleIdentifier</key>\n')
|
'#include "${resources}"\n')
|
||||||
fp.write('\t<string>%s</string>\n' % bundle_identifier)
|
|
||||||
fp.write('\t<key>CFBundleInfoDictionaryVersion</key>\n')
|
internal = options.target + '_' + options.subtarget if options.target != options.subtarget else options.target
|
||||||
fp.write('\t<string>6.0</string>\n')
|
text = template.substitute(
|
||||||
fp.write('\t<key>CFBundleName</key>\n')
|
version=verfull,
|
||||||
fp.write('\t<string>%s</string>\n' % product_name)
|
major=vermajor, minor=verminor, build='0', subbuild='0',
|
||||||
fp.write('\t<key>CFBundleShortVersionString</key>\n')
|
author='MAMEdev and contributors',
|
||||||
fp.write('\t<string>%s.%s.%s</string>\n' % (version_major, version_minor, version_build))
|
comments='Multi-purpose emulation framework',
|
||||||
fp.write('\t<key>NSPrincipalClass</key>\n')
|
company='MAMEdev',
|
||||||
fp.write('\t<string>NSApplication</string>\n')
|
filedesc='MAME',
|
||||||
fp.write('</dict>\n')
|
internal=internal,
|
||||||
fp.write('</plist>\n')
|
original=options.executable,
|
||||||
fp.flush()
|
product=('MAME' if options.target == 'mame' else options.target),
|
||||||
|
rdns=('org.mamedev.' + internal),
|
||||||
|
copyright='\u00a9 1997-2022 MAMEdev and contributors',
|
||||||
|
winfileflags=('0x0L' if verbuild == '0' else 'VS_FF_PRERELEASE'),
|
||||||
|
resources=(options.resources or 'mame.rc'))
|
||||||
|
|
||||||
|
if options.o is not None:
|
||||||
|
try:
|
||||||
|
with io.open(options.o, 'w', encoding='utf-8') as out:
|
||||||
|
out.write(text)
|
||||||
|
except IOError as e:
|
||||||
|
sys.stderr.write("Error writing output file '%s': %s\n" % (options.o, e))
|
||||||
|
sys.exit(1)
|
||||||
|
else:
|
||||||
|
sys.stdout.write(text)
|
||||||
|
|||||||
@ -6,9 +6,6 @@
|
|||||||
//
|
//
|
||||||
//============================================================
|
//============================================================
|
||||||
|
|
||||||
#include <windows.h>
|
|
||||||
#include "mamevers.rc"
|
|
||||||
|
|
||||||
1 24 MOVEABLE PURE "mame.man"
|
1 24 MOVEABLE PURE "mame.man"
|
||||||
|
|
||||||
2 ICON DISCARDABLE "mame.ico"
|
2 ICON DISCARDABLE "mame.ico"
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 364 KiB |
@ -1,16 +0,0 @@
|
|||||||
<?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>MESS</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>
|
|
||||||
<dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
|
|
||||||
<longPathAware xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">true</longPathAware>
|
|
||||||
</asmv3:windowsSettings>
|
|
||||||
</asmv3:application>
|
|
||||||
</assembly>
|
|
||||||
@ -1,14 +0,0 @@
|
|||||||
// 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"
|
|
||||||
@ -10,20 +10,18 @@
|
|||||||
---------------------------------------------------------------------------
|
---------------------------------------------------------------------------
|
||||||
|
|
||||||
function mainProject(_target, _subtarget)
|
function mainProject(_target, _subtarget)
|
||||||
|
local projname
|
||||||
if (_OPTIONS["SOURCES"] == nil) then
|
if (_OPTIONS["SOURCES"] == nil) then
|
||||||
if (_target == _subtarget) then
|
if (_target == _subtarget) then
|
||||||
project (_target)
|
projname = _target
|
||||||
else
|
else
|
||||||
if (_subtarget=="mess") then
|
projname = _target .. _subtarget
|
||||||
project (_subtarget)
|
|
||||||
else
|
|
||||||
project (_target .. _subtarget)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
project (_subtarget)
|
projname = _subtarget
|
||||||
end
|
end
|
||||||
uuid (os.uuid(_target .."_" .. _subtarget))
|
project (projname)
|
||||||
|
uuid (os.uuid(_target .. "_" .. _subtarget))
|
||||||
kind "ConsoleApp"
|
kind "ConsoleApp"
|
||||||
|
|
||||||
configuration { "android*" }
|
configuration { "android*" }
|
||||||
@ -196,7 +194,8 @@ end
|
|||||||
|
|
||||||
override_resources = false;
|
override_resources = false;
|
||||||
|
|
||||||
maintargetosdoptions(_target,_subtarget)
|
maintargetosdoptions(_target, _subtarget)
|
||||||
|
local exename = projname -- FIXME: should include the OSD prefix if any
|
||||||
|
|
||||||
includedirs {
|
includedirs {
|
||||||
MAME_DIR .. "src/osd",
|
MAME_DIR .. "src/osd",
|
||||||
@ -207,11 +206,15 @@ end
|
|||||||
MAME_DIR .. "src/lib/util",
|
MAME_DIR .. "src/lib/util",
|
||||||
MAME_DIR .. "3rdparty",
|
MAME_DIR .. "3rdparty",
|
||||||
GEN_DIR .. _target .. "/layout",
|
GEN_DIR .. _target .. "/layout",
|
||||||
GEN_DIR .. "resource",
|
|
||||||
ext_includedir("zlib"),
|
ext_includedir("zlib"),
|
||||||
ext_includedir("flac"),
|
ext_includedir("flac"),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
resincludedirs {
|
||||||
|
MAME_DIR .. "scripts/resources/windows/" .. _target,
|
||||||
|
GEN_DIR .. "resource",
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
if (STANDALONE==true) then
|
if (STANDALONE==true) then
|
||||||
standalone();
|
standalone();
|
||||||
@ -219,71 +222,96 @@ end
|
|||||||
|
|
||||||
if (STANDALONE~=true) then
|
if (STANDALONE~=true) then
|
||||||
if _OPTIONS["targetos"]=="macosx" and (not override_resources) then
|
if _OPTIONS["targetos"]=="macosx" and (not override_resources) then
|
||||||
|
local plistname = _target .. "_" .. _subtarget .. "-Info.plist"
|
||||||
linkoptions {
|
linkoptions {
|
||||||
"-sectcreate __TEXT __info_plist " .. _MAKE.esc(GEN_DIR) .. "resource/" .. _subtarget .. "-Info.plist"
|
"-sectcreate __TEXT __info_plist " .. _MAKE.esc(GEN_DIR) .. "resource/" .. plistname
|
||||||
}
|
}
|
||||||
custombuildtask {
|
custombuildtask {
|
||||||
{ GEN_DIR .. "version.cpp" , GEN_DIR .. "resource/" .. _subtarget .. "-Info.plist", { MAME_DIR .. "scripts/build/verinfo.py" }, {"@echo Emitting " .. _subtarget .. "-Info.plist" .. "...", PYTHON .. " $(1) -p -b " .. _subtarget .. " $(<) > $(@)" }},
|
{
|
||||||
|
GEN_DIR .. "version.cpp",
|
||||||
|
GEN_DIR .. "resource/" .. plistname,
|
||||||
|
{ MAME_DIR .. "scripts/build/verinfo.py" },
|
||||||
|
{
|
||||||
|
"@echo Emitting " .. plistname .. "...",
|
||||||
|
PYTHON .. " $(1) -f plist -t " .. _target .. " -s " .. _subtarget .. " -e " .. exename .. " -o $(@) $(<)"
|
||||||
|
}
|
||||||
|
},
|
||||||
}
|
}
|
||||||
dependency {
|
dependency {
|
||||||
{ "$(TARGET)" , GEN_DIR .. "resource/" .. _subtarget .. "-Info.plist", true },
|
{ "$(TARGET)" , GEN_DIR .. "resource/" .. plistname, true },
|
||||||
}
|
}
|
||||||
|
|
||||||
end
|
end
|
||||||
local rctarget = _subtarget
|
|
||||||
|
|
||||||
|
local rcversfile = GEN_DIR .. "resource/" .. _target .. "_" .. _subtarget .. "_vers.rc"
|
||||||
if _OPTIONS["targetos"]=="windows" and (not override_resources) then
|
if _OPTIONS["targetos"]=="windows" and (not override_resources) then
|
||||||
rcfile = MAME_DIR .. "scripts/resources/windows/" .. _subtarget .. "/" .. rctarget ..".rc"
|
files {
|
||||||
if os.isfile(rcfile) then
|
rcversfile
|
||||||
files {
|
}
|
||||||
rcfile,
|
|
||||||
}
|
|
||||||
dependency {
|
|
||||||
{ "$(OBJDIR)/".._subtarget ..".res" , GEN_DIR .. "resource/" .. rctarget .. "vers.rc", true },
|
|
||||||
}
|
|
||||||
else
|
|
||||||
rctarget = "mame"
|
|
||||||
files {
|
|
||||||
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"
|
local rcincfile = MAME_DIR .. "scripts/resources/windows/" .. _target .. "/" .. _subtarget ..".rc"
|
||||||
|
if not os.isfile(rcincfile) then
|
||||||
|
rcincfile = MAME_DIR .. "scripts/resources/windows/mame/mame.rc"
|
||||||
|
resincludedirs {
|
||||||
|
MAME_DIR .. "scripts/resources/windows/mame",
|
||||||
|
}
|
||||||
|
end
|
||||||
|
|
||||||
|
local mainfile = MAME_DIR .. "src/" .. _target .. "/" .. _subtarget .. ".cpp"
|
||||||
if not os.isfile(mainfile) then
|
if not os.isfile(mainfile) then
|
||||||
mainfile = MAME_DIR .. "src/".._target .."/" .. _target ..".cpp"
|
mainfile = MAME_DIR .. "src/" .. _target .. "/" .. _target .. ".cpp"
|
||||||
end
|
end
|
||||||
files {
|
files {
|
||||||
mainfile,
|
mainfile,
|
||||||
GEN_DIR .. "version.cpp",
|
GEN_DIR .. "version.cpp",
|
||||||
GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp",
|
GEN_DIR .. _target .. "/" .. _subtarget .. "/drivlist.cpp",
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_OPTIONS["SOURCES"] == nil) then
|
if (_OPTIONS["SOURCES"] == nil) then
|
||||||
|
|
||||||
if os.isfile(MAME_DIR .. "src/".._target .."/" .. _subtarget ..".flt") then
|
if os.isfile(MAME_DIR .. "src/" .. _target .."/" .. _subtarget ..".flt") then
|
||||||
dependency {
|
dependency {
|
||||||
{
|
{ GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true },
|
||||||
GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true },
|
|
||||||
}
|
}
|
||||||
custombuildtask {
|
custombuildtask {
|
||||||
{ MAME_DIR .. "src/".._target .."/" .. _subtarget ..".flt" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makedep.py", MAME_DIR .. "src/".._target .."/" .. _target ..".lst" }, {"@echo Building driver list...", PYTHON .. " $(1) driverlist $(2) -f $(<) > $(@)" }},
|
{
|
||||||
|
MAME_DIR .. "src/" .. _target .. "/" .. _subtarget .. ".flt",
|
||||||
|
GEN_DIR .. _target .. "/" .. _subtarget .. "/drivlist.cpp",
|
||||||
|
{ MAME_DIR .. "scripts/build/makedep.py", MAME_DIR .. "src/" .. _target .."/" .. _target .. ".lst" },
|
||||||
|
{
|
||||||
|
"@echo Building driver list...",
|
||||||
|
PYTHON .. " $(1) driverlist $(2) -f $(<) > $(@)"
|
||||||
|
}
|
||||||
|
},
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
if os.isfile(MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst") then
|
if os.isfile(MAME_DIR .. "src/" .._target .. "/" .. _subtarget ..".lst") then
|
||||||
custombuildtask {
|
custombuildtask {
|
||||||
{ MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makedep.py" }, {"@echo Building driver list...", PYTHON .. " $(1) driverlist $(<) > $(@)" }},
|
{
|
||||||
|
MAME_DIR .. "src/" .. _target .. "/" .. _subtarget .. ".lst",
|
||||||
|
GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp",
|
||||||
|
{ MAME_DIR .. "scripts/build/makedep.py" },
|
||||||
|
{
|
||||||
|
"@echo Building driver list...",
|
||||||
|
PYTHON .. " $(1) driverlist $(<) > $(@)"
|
||||||
|
}
|
||||||
|
},
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
dependency {
|
dependency {
|
||||||
{
|
{ GEN_DIR .. _target .. "/" .. _target .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true },
|
||||||
GEN_DIR .. _target .. "/" .. _target .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true },
|
|
||||||
}
|
}
|
||||||
custombuildtask {
|
custombuildtask {
|
||||||
{ MAME_DIR .. "src/".._target .."/" .. _target ..".lst" , GEN_DIR .. _target .. "/" .. _target .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makedep.py" }, {"@echo Building driver list...", PYTHON .. " $(1) driverlist $(<) > $(@)" }},
|
{
|
||||||
|
MAME_DIR .. "src/" .. _target .. "/" .. _target .. ".lst",
|
||||||
|
GEN_DIR .. _target .. "/" .. _target .. "/drivlist.cpp",
|
||||||
|
{ MAME_DIR .. "scripts/build/makedep.py" },
|
||||||
|
{
|
||||||
|
"@echo Building driver list...",
|
||||||
|
PYTHON .. " $(1) driverlist $(<) > $(@)"
|
||||||
|
}
|
||||||
|
},
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -292,7 +320,7 @@ if (STANDALONE~=true) then
|
|||||||
if (_OPTIONS["SOURCES"] ~= nil) then
|
if (_OPTIONS["SOURCES"] ~= nil) then
|
||||||
dependency {
|
dependency {
|
||||||
{
|
{
|
||||||
GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true },
|
GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", MAME_DIR .. "src/".._target .."/" .. _target ..".lst", true },
|
||||||
}
|
}
|
||||||
custombuildtask {
|
custombuildtask {
|
||||||
{ GEN_DIR .. _target .."/" .. _subtarget ..".flt" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makedep.py", MAME_DIR .. "src/".._target .."/" .. _target ..".lst" }, {"@echo Building driver list...", PYTHON .. " $(1) driverlist $(2) -f $(<) > $(@)" }},
|
{ GEN_DIR .. _target .."/" .. _subtarget ..".flt" , GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp", { MAME_DIR .. "scripts/build/makedep.py", MAME_DIR .. "src/".._target .."/" .. _target ..".lst" }, {"@echo Building driver list...", PYTHON .. " $(1) driverlist $(2) -f $(<) > $(@)" }},
|
||||||
@ -300,15 +328,29 @@ if (STANDALONE~=true) then
|
|||||||
end
|
end
|
||||||
|
|
||||||
configuration { "mingw*" }
|
configuration { "mingw*" }
|
||||||
|
dependency {
|
||||||
|
{ "$(OBJDIR)/" .. _target .. "_" .. _subtarget .. "_vers.res", rcincfile, true },
|
||||||
|
}
|
||||||
custombuildtask {
|
custombuildtask {
|
||||||
{ GEN_DIR .. "version.cpp" , GEN_DIR .. "resource/" .. rctarget .. "vers.rc", { MAME_DIR .. "scripts/build/verinfo.py" }, {"@echo Emitting " .. rctarget .. "vers.rc" .. "...", PYTHON .. " $(1) -r -b " .. rctarget .. " $(<) > $(@)" }},
|
{
|
||||||
|
GEN_DIR .. "version.cpp" ,
|
||||||
|
rcversfile,
|
||||||
|
{ MAME_DIR .. "scripts/build/verinfo.py" },
|
||||||
|
{
|
||||||
|
"@echo Emitting " .. _target .. "_" .. _subtarget .. "_vers.rc" .. "...",
|
||||||
|
PYTHON .. " $(1) -f rc -t " .. _target .. " -s " .. _subtarget .. " -e " .. exename .. " -r " .. rcincfile .. " -o $(@) $(<)"
|
||||||
|
}
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
configuration { "vs20*" }
|
configuration { "vs20*" }
|
||||||
|
dependency {
|
||||||
|
{ "$(OBJDIR)/" .. _target .. "_" .. _subtarget .. "_vers.res", rcincfile, true },
|
||||||
|
}
|
||||||
prebuildcommands {
|
prebuildcommands {
|
||||||
"mkdir \"" .. path.translate(GEN_DIR .. "resource/","\\") .. "\" 2>NUL",
|
"mkdir \"" .. path.translate(GEN_DIR .. _target .. "/" .. _subtarget .. "/", "\\") .. "\" 2>NUL",
|
||||||
"@echo Emitting ".. rctarget .. "vers.rc...",
|
"@echo Emitting " .. _target .. "_" .. _subtarget .. "_vers.rc" .. "...",
|
||||||
PYTHON .. " \"" .. path.translate(MAME_DIR .. "scripts/build/verinfo.py","\\") .. "\" -r -b " .. rctarget .. " \"" .. path.translate(GEN_DIR .. "version.cpp","\\") .. "\" > \"" .. path.translate(GEN_DIR .. "resource/" .. rctarget .. "vers.rc", "\\") .. "\"" ,
|
PYTHON .. " \"" .. path.translate(MAME_DIR .. "scripts/build/verinfo.py", "\\") .. "\" -f rc -t " .. _target .. " -s " .. _subtarget .. " -e " .. exename .. " -o \"" .. path.translate(rcversfile) .. "\" -r \"" .. path.translate(rcincfile, "\\") .. "\" \"" .. path.translate(GEN_DIR .. "version.cpp", "\\") .. "\"",
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@ -92,7 +92,7 @@ void menu_input_options::populate(float &customtop, float &custombottom)
|
|||||||
bool inputmap, analog, toggle;
|
bool inputmap, analog, toggle;
|
||||||
scan_inputs(machine(), inputmap, analog, toggle);
|
scan_inputs(machine(), inputmap, analog, toggle);
|
||||||
|
|
||||||
item_append(_("menu-inputopts", "Input Assignments (general)"), 0, (void *)INPUTMAP_GENERAL);
|
// system-specific stuff
|
||||||
if (inputmap)
|
if (inputmap)
|
||||||
item_append(_("menu-inputopts", "Input Assignments (this system)"), 0, (void *)INPUTMAP_MACHINE);
|
item_append(_("menu-inputopts", "Input Assignments (this system)"), 0, (void *)INPUTMAP_MACHINE);
|
||||||
if (analog)
|
if (analog)
|
||||||
@ -101,11 +101,12 @@ void menu_input_options::populate(float &customtop, float &custombottom)
|
|||||||
item_append(_("menu-inputopts", "Keyboard Selection"), 0, (void *)KEYBOARD);
|
item_append(_("menu-inputopts", "Keyboard Selection"), 0, (void *)KEYBOARD);
|
||||||
if (toggle)
|
if (toggle)
|
||||||
item_append(_("menu-inputopts", "Toggle Inputs"), 0, (void *)TOGGLES);
|
item_append(_("menu-inputopts", "Toggle Inputs"), 0, (void *)TOGGLES);
|
||||||
|
if (inputmap || analog || machine().natkeyboard().keyboard_count() || toggle)
|
||||||
|
item_append(menu_item_type::SEPARATOR);
|
||||||
|
|
||||||
item_append(menu_item_type::SEPARATOR);
|
// general stuff
|
||||||
|
item_append(_("menu-inputopts", "Input Assignments (general)"), 0, (void *)INPUTMAP_GENERAL);
|
||||||
item_append(_("menu-inputopts", "Input Devices"), 0, (void *)INPUTDEV);
|
item_append(_("menu-inputopts", "Input Devices"), 0, (void *)INPUTDEV);
|
||||||
|
|
||||||
item_append(menu_item_type::SEPARATOR);
|
item_append(menu_item_type::SEPARATOR);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -453,8 +453,8 @@ void menu_crosshair::populate(float &customtop, float &custombottom)
|
|||||||
|
|
||||||
// Make sure to keep these matched to the CROSSHAIR_VISIBILITY_xxx types
|
// Make sure to keep these matched to the CROSSHAIR_VISIBILITY_xxx types
|
||||||
static char const *const vis_text[] = {
|
static char const *const vis_text[] = {
|
||||||
N_p("menu-crosshair", "Always"),
|
|
||||||
N_p("menu-crosshair", "Never"),
|
N_p("menu-crosshair", "Never"),
|
||||||
|
N_p("menu-crosshair", "Always"),
|
||||||
N_p("menu-crosshair", "When moved") };
|
N_p("menu-crosshair", "When moved") };
|
||||||
|
|
||||||
bool use_auto = false;
|
bool use_auto = false;
|
||||||
|
|||||||
@ -13,8 +13,8 @@
|
|||||||
#define APPNAME "MAME"
|
#define APPNAME "MAME"
|
||||||
#define APPNAME_LOWER "mame"
|
#define APPNAME_LOWER "mame"
|
||||||
#define CONFIGNAME "mame"
|
#define CONFIGNAME "mame"
|
||||||
#define COPYRIGHT "Copyright Nicola Salmoria\nand the MAME team\nhttps://mamedev.org"
|
#define COPYRIGHT "Copyright MAMEdev and contributors\nhttps://mamedev.org"
|
||||||
#define COPYRIGHT_INFO "Copyright Nicola Salmoria and the MAME team"
|
#define COPYRIGHT_INFO "Copyright MAMEdev and contributors"
|
||||||
|
|
||||||
const char * emulator_info::get_appname() { return APPNAME;}
|
const char * emulator_info::get_appname() { return APPNAME;}
|
||||||
const char * emulator_info::get_appname_lower() { return APPNAME_LOWER;}
|
const char * emulator_info::get_appname_lower() { return APPNAME_LOWER;}
|
||||||
|
|||||||
@ -1,23 +0,0 @@
|
|||||||
// license:BSD-3-Clause
|
|
||||||
// copyright-holders:Aaron Giles
|
|
||||||
/***************************************************************************
|
|
||||||
|
|
||||||
mess.cpp
|
|
||||||
|
|
||||||
Specific (per target) constants
|
|
||||||
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#include "emu.h"
|
|
||||||
|
|
||||||
#define APPNAME "MESS"
|
|
||||||
#define APPNAME_LOWER "mess"
|
|
||||||
#define CONFIGNAME "mess"
|
|
||||||
#define COPYRIGHT "Copyright Nicola Salmoria\nand the MAME team\nhttps://mamedev.org"
|
|
||||||
#define COPYRIGHT_INFO "Copyright Nicola Salmoria and the MAME team"
|
|
||||||
|
|
||||||
const char * emulator_info::get_appname() { return APPNAME;}
|
|
||||||
const char * emulator_info::get_appname_lower() { return APPNAME_LOWER;}
|
|
||||||
const char * emulator_info::get_configname() { return CONFIGNAME;}
|
|
||||||
const char * emulator_info::get_copyright() { return COPYRIGHT;}
|
|
||||||
const char * emulator_info::get_copyright_info() { return COPYRIGHT_INFO;}
|
|
||||||
Loading…
Reference in New Issue
Block a user