From 64987c86ec3488a9f0359956f9fc8392b64bbbce Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sun, 17 May 2015 16:46:37 +0200 Subject: fixed determining RC file and rules and removed not needed files (nw) --- scripts/src/main.lua | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) (limited to 'scripts/src/main.lua') diff --git a/scripts/src/main.lua b/scripts/src/main.lua index 870c9dfed88..aaa606c91f5 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -146,25 +146,27 @@ function mainProject(_target, _subtarget) } end + local rctarget = _subtarget if _OPTIONS["targetos"]=="windows" and (not override_resources) then - local rcfile = MAME_DIR .. "src/" .. _target .. "/osd/".._OPTIONS["osd"].."/" .. _subtarget .. "/" .. _subtarget ..".rc" + 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 .. "/" .. _subtarget ..".rc" + rcfile = MAME_DIR .. "src/" .. _target .. "/osd/windows/" .. _subtarget .. "/" .. rctarget ..".rc" end if os.isfile(rcfile) then files { rcfile, } dependency { - { "$(OBJDIR)/".._subtarget ..".res" , GEN_DIR .. "/resource/" .. _subtarget .. "vers.rc", true }, + { "$(OBJDIR)/".._subtarget ..".res" , GEN_DIR .. "/resource/" .. rctarget .. "vers.rc", true }, } else + rctarget = "mame" files { MAME_DIR .. "src/mame/osd/windows/mame/mame.rc", } dependency { - { "$(OBJDIR)/mame.res" , GEN_DIR .. "/resource/" .. _subtarget .. "vers.rc", true }, + { "$(OBJDIR)/mame.res" , GEN_DIR .. "/resource/" .. rctarget .. "vers.rc", true }, } end end @@ -185,14 +187,14 @@ function mainProject(_target, _subtarget) configuration { "mingw*" } custombuildtask { - { 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 .. " $(<) > $(@)" }}, + { MAME_DIR .. "src/version.c" , GEN_DIR .. "/resource/" .. rctarget .. "vers.rc", { MAME_DIR .. "src/build/verinfo.py" }, {"@echo Emitting " .. rctarget .. "vers.rc" .. "...", PYTHON .. " $(1) -r -b " .. rctarget .. " $(<) > $(@)" }}, } configuration { "vs*" } prebuildcommands { "mkdir " .. path.translate(GEN_DIR .. "/resource/","\\") .. " 2>NUL", - "@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", "\\") , + "@echo Emitting ".. rctarget .. "vers.rc...", + PYTHON .. " " .. path.translate(MAME_DIR .. "src/build/verinfo.py","\\") .. " -r -b " .. rctarget .. " " .. path.translate(MAME_DIR .. "src/version.c","\\") .. " > " .. path.translate(GEN_DIR .. "/resource/" .. rctarget .. "vers.rc", "\\") , } -- cgit v1.2.3-70-g09d2