summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src/main.lua
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-05-09 16:29:15 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2015-05-09 16:32:49 +0200
commit7513fb00a0e3bc41649789b7d3a02a8113054bbe (patch)
treea0dc2151ab1823d4ba15e40f6acfdf840c9866c8 /scripts/src/main.lua
parentab3a1886b183d6efe2571138927c36f61fe3768d (diff)
Fix resources and updated verinfo to give default for mame in any subtarget case except mess (nw)
Diffstat (limited to 'scripts/src/main.lua')
-rw-r--r--scripts/src/main.lua16
1 files changed, 8 insertions, 8 deletions
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index 375c24ae0a2..9b696de9f70 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -136,13 +136,13 @@ function mainProject(_target, _subtarget)
if _OPTIONS["targetos"]=="macosx" and (not override_resources) then
linkoptions {
- "-sectcreate __TEXT __info_plist " .. GEN_DIR .. "/resource/" .. _target .. "-Info.plist"
+ "-sectcreate __TEXT __info_plist " .. GEN_DIR .. "/resource/" .. _subtarget .. "-Info.plist"
}
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 {
- { "$(TARGET)" , GEN_DIR .. "/resource/" .. _target .. "-Info.plist", true },
+ { "$(TARGET)" , GEN_DIR .. "/resource/" .. _subtarget .. "-Info.plist", true },
}
end
@@ -157,14 +157,14 @@ function mainProject(_target, _subtarget)
rcfile,
}
dependency {
- { "$(OBJDIR)/".._subtarget ..".res" , GEN_DIR .. "/resource/" .. _target .. "vers.rc", true },
+ { "$(OBJDIR)/".._subtarget ..".res" , GEN_DIR .. "/resource/" .. _subtarget .. "vers.rc", true },
}
else
files {
MAME_DIR .. "src/mame/osd/windows/mame/mame.rc",
}
dependency {
- { "$(OBJDIR)/mame.res" , GEN_DIR .. "/resource/" .. _target .. "vers.rc", true },
+ { "$(OBJDIR)/mame.res" , GEN_DIR .. "/resource/" .. _subtarget .. "vers.rc", true },
}
end
end
@@ -181,14 +181,14 @@ function mainProject(_target, _subtarget)
configuration { "mingw*" }
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*" }
prebuildcommands {
"mkdir " .. path.translate(GEN_DIR .. "/resource/","\\") .. " 2>NUL",
- "@echo Emitting ".. _target .. "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", "\\") ,
+ "@echo Emitting ".. _subtarget .. "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", "\\") ,
}