Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-05 00:38:58 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix resources and updated verinfo to give default for mame in any subtarget case except mess (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2015-05-09 16:29:15 +02:00
parent ab3a1886b1
commit 7513fb00a0
2 changed files with 9 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/src/main.lua
View File

@ -136,13 +136,13 @@ function mainProject(_target, _subtarget)
if _OPTIONS["targetos"]=="macosx" and (not override_resources) then if _OPTIONS["targetos"]=="macosx" and (not override_resources) then
linkoptions { linkoptions {
"-sectcreate __TEXT __info_plist " .. GEN_DIR .. "/resource/" .. _target .. "-Info.plist" "-sectcreate __TEXT __info_plist " .. GEN_DIR .. "/resource/" .. _subtarget .. "-Info.plist"
} }
custombuildtask { custombuildtask {
{ MAME_DIR .. "src/version.c" , GEN_DIR .. "/resource/" .. _target .. "-Info.plist", { MAME_DIR .. "src/build/verinfo.py" }, {"@echo Emitting " .. _target .. "-Info.plist" .. "...", PYTHON .. " $(1) -p -b " .. _target .. " $(<) > $(@)" }}, { MAME_DIR .. "src/version.c" , GEN_DIR .. "/resource/" .. _subtarget .. "-Info.plist", { MAME_DIR .. "src/build/verinfo.py" }, {"@echo Emitting " .. _subtarget .. "-Info.plist" .. "...", PYTHON .. " $(1) -p -b " .. _subtarget .. " $(<) > $(@)" }},
} }
dependency { dependency {
{ "$(TARGET)" , GEN_DIR .. "/resource/" .. _target .. "-Info.plist", true }, { "$(TARGET)" , GEN_DIR .. "/resource/" .. _subtarget .. "-Info.plist", true },
} }
end end
@ -157,14 +157,14 @@ function mainProject(_target, _subtarget)
rcfile, rcfile,
} }
dependency { dependency {
{ "$(OBJDIR)/".._subtarget ..".res" , GEN_DIR .. "/resource/" .. _target .. "vers.rc", true }, { "$(OBJDIR)/".._subtarget ..".res" , GEN_DIR .. "/resource/" .. _subtarget .. "vers.rc", true },
} }
else else
files { files {
MAME_DIR .. "src/mame/osd/windows/mame/mame.rc", MAME_DIR .. "src/mame/osd/windows/mame/mame.rc",
} }
dependency { dependency {
{ "$(OBJDIR)/mame.res" , GEN_DIR .. "/resource/" .. _target .. "vers.rc", true }, { "$(OBJDIR)/mame.res" , GEN_DIR .. "/resource/" .. _subtarget .. "vers.rc", true },
} }
end end
end end
@ -181,14 +181,14 @@ function mainProject(_target, _subtarget)
configuration { "mingw*" } configuration { "mingw*" }
custombuildtask { custombuildtask {
{ MAME_DIR .. "src/version.c" , GEN_DIR .. "/resource/" .. _target .. "vers.rc", { MAME_DIR .. "src/build/verinfo.py" }, {"@echo Emitting " .. _target .. "vers.rc" .. "...", PYTHON .. " $(1) -r -b " .. _target .. " $(<) > $(@)" }}, { MAME_DIR .. "src/version.c" , GEN_DIR .. "/resource/" .. _subtarget .. "vers.rc", { MAME_DIR .. "src/build/verinfo.py" }, {"@echo Emitting " .. _subtarget .. "vers.rc" .. "...", PYTHON .. " $(1) -r -b " .. _subtarget .. " $(<) > $(@)" }},
} }
configuration { "vs*" } configuration { "vs*" }
prebuildcommands { prebuildcommands {
"mkdir " .. path.translate(GEN_DIR .. "/resource/","\\") .. " 2>NUL", "mkdir " .. path.translate(GEN_DIR .. "/resource/","\\") .. " 2>NUL",
"@echo Emitting ".. _target .. "vers.rc...", "@echo Emitting ".. _subtarget .. "vers.rc...",
PYTHON .. " " .. path.translate(MAME_DIR .. "src/build/verinfo.py","\\") .. " -r -b " .. _target .. " " .. path.translate(MAME_DIR .. "src/version.c","\\") .. " > " .. path.translate(GEN_DIR .. "/resource/" .. _target .. "vers.rc", "\\") , PYTHON .. " " .. path.translate(MAME_DIR .. "src/build/verinfo.py","\\") .. " -r -b " .. _subtarget .. " " .. path.translate(MAME_DIR .. "src/version.c","\\") .. " > " .. path.translate(GEN_DIR .. "/resource/" .. _subtarget .. "vers.rc", "\\") ,
} }

12
src/build/verinfo.py
View File

@ -27,7 +27,7 @@ def parse_args():
format = 'plist' format = 'plist'
elif flags and (sys.argv[i] == '-b'): elif flags and (sys.argv[i] == '-b'):
i += 1 i += 1
if (i >= len(sys.argv)) or (sys.argv[i] not in ('mame', 'mess', 'ume', 'ldplayer')): if (i >= len(sys.argv)):
usage() usage()
else: else:
target = sys.argv[i] target = sys.argv[i]
@ -95,16 +95,6 @@ if build == "mess":
original_filename = "MESS" original_filename = "MESS"
product_name = "MESS" product_name = "MESS"
bundle_identifier = "org.mamedev.mess" bundle_identifier = "org.mamedev.mess"
elif build == "ume":
# UME
author = "MAME and MESS Team"
comments = "Universal Machine Emulator"
company_name = "MAME and MESS Team"
file_description = "Universal Machine Emulator"
internal_name = "UME"
original_filename = "UME"
product_name = "UME"
bundle_identifier = "org.mamedev.ume"
else: else:
# MAME # MAME
author = "Nicola Salmoria and the MAME Team" author = "Nicola Salmoria and the MAME Team"