summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src/main.lua
diff options
context:
space:
mode:
author Vas Crabb <vas@vastheman.com>2022-06-13 16:53:23 +1000
committer Vas Crabb <vas@vastheman.com>2022-06-13 16:53:23 +1000
commit74fe6e9d5ca562915fcb70614d36d1b5101e695b (patch)
treeeb19bd028a70ece6c79f17a9a8c14bd348b42c14 /scripts/src/main.lua
parent30ef2dd86b11eb1f3d80412f0819b42a5af16966 (diff)
-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.
Diffstat (limited to 'scripts/src/main.lua')
-rw-r--r--scripts/src/main.lua138
1 files changed, 90 insertions, 48 deletions
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index c76fa1da227..da2ba71b61f 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -10,20 +10,18 @@
---------------------------------------------------------------------------
function mainProject(_target, _subtarget)
+local projname
if (_OPTIONS["SOURCES"] == nil) then
if (_target == _subtarget) then
- project (_target)
+ projname = _target
else
- if (_subtarget=="mess") then
- project (_subtarget)
- else
- project (_target .. _subtarget)
- end
+ projname = _target .. _subtarget
end
else
- project (_subtarget)
+ projname = _subtarget
end
- uuid (os.uuid(_target .."_" .. _subtarget))
+ project (projname)
+ uuid (os.uuid(_target .. "_" .. _subtarget))
kind "ConsoleApp"
configuration { "android*" }
@@ -196,7 +194,8 @@ end
override_resources = false;
- maintargetosdoptions(_target,_subtarget)
+ maintargetosdoptions(_target, _subtarget)
+ local exename = projname -- FIXME: should include the OSD prefix if any
includedirs {
MAME_DIR .. "src/osd",
@@ -207,11 +206,15 @@ end
MAME_DIR .. "src/lib/util",
MAME_DIR .. "3rdparty",
GEN_DIR .. _target .. "/layout",
- GEN_DIR .. "resource",
ext_includedir("zlib"),
ext_includedir("flac"),
}
+ resincludedirs {
+ MAME_DIR .. "scripts/resources/windows/" .. _target,
+ GEN_DIR .. "resource",
+ }
+
if (STANDALONE==true) then
standalone();
@@ -219,71 +222,96 @@ end
if (STANDALONE~=true) then
if _OPTIONS["targetos"]=="macosx" and (not override_resources) then
+ local plistname = _target .. "_" .. _subtarget .. "-Info.plist"
linkoptions {
- "-sectcreate __TEXT __info_plist " .. _MAKE.esc(GEN_DIR) .. "resource/" .. _subtarget .. "-Info.plist"
+ "-sectcreate __TEXT __info_plist " .. _MAKE.esc(GEN_DIR) .. "resource/" .. plistname
}
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 {
- { "$(TARGET)" , GEN_DIR .. "resource/" .. _subtarget .. "-Info.plist", true },
+ { "$(TARGET)" , GEN_DIR .. "resource/" .. plistname, true },
}
end
- local rctarget = _subtarget
+ local rcversfile = GEN_DIR .. "resource/" .. _target .. "_" .. _subtarget .. "_vers.rc"
if _OPTIONS["targetos"]=="windows" and (not override_resources) then
- rcfile = MAME_DIR .. "scripts/resources/windows/" .. _subtarget .. "/" .. rctarget ..".rc"
- if os.isfile(rcfile) then
- 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
+ files {
+ rcversfile
+ }
+ end
+
+ 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"
+ local mainfile = MAME_DIR .. "src/" .. _target .. "/" .. _subtarget .. ".cpp"
if not os.isfile(mainfile) then
- mainfile = MAME_DIR .. "src/".._target .."/" .. _target ..".cpp"
+ mainfile = MAME_DIR .. "src/" .. _target .. "/" .. _target .. ".cpp"
end
files {
mainfile,
GEN_DIR .. "version.cpp",
- GEN_DIR .. _target .. "/" .. _subtarget .."/drivlist.cpp",
+ GEN_DIR .. _target .. "/" .. _subtarget .. "/drivlist.cpp",
}
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 {
- {
- 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 {
- { 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
- if os.isfile(MAME_DIR .. "src/".._target .."/" .. _subtarget ..".lst") then
+ 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/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
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 {
- { 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
@@ -292,7 +320,7 @@ if (STANDALONE~=true) then
if (_OPTIONS["SOURCES"] ~= nil) then
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 {
{ 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
configuration { "mingw*" }
+ dependency {
+ { "$(OBJDIR)/" .. _target .. "_" .. _subtarget .. "_vers.res", rcincfile, true },
+ }
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*" }
+ dependency {
+ { "$(OBJDIR)/" .. _target .. "_" .. _subtarget .. "_vers.res", rcincfile, true },
+ }
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(GEN_DIR .. "version.cpp","\\") .. "\" > \"" .. path.translate(GEN_DIR .. "resource/" .. rctarget .. "vers.rc", "\\") .. "\"" ,
+ "mkdir \"" .. path.translate(GEN_DIR .. _target .. "/" .. _subtarget .. "/", "\\") .. "\" 2>NUL",
+ "@echo Emitting " .. _target .. "_" .. _subtarget .. "_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