diff --git a/scripts/src/main.lua b/scripts/src/main.lua index 8a3959442e3..ca3ac2d4507 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -66,6 +66,8 @@ function mainProject(_target, _subtarget) "ocore_" .. _OPTIONS["osd"], } + override_resources = false; + maintargetosdoptions(_target) includedirs { @@ -80,7 +82,7 @@ function mainProject(_target, _subtarget) GEN_DIR .. "resource", } - if _OPTIONS["targetos"]=="macosx" then + if _OPTIONS["targetos"]=="macosx" and (not override_resources) then linkoptions { "-sectcreate __TEXT __info_plist " .. GEN_DIR .. "/resource/" .. _target .. "-Info.plist" } @@ -93,6 +95,29 @@ function mainProject(_target, _subtarget) end + if _OPTIONS["targetos"]=="windows" and (not override_resources) then + local rcfile = MAME_DIR .. "src/" .. _target .. "/osd/".._OPTIONS["osd"].."/" .. _target ..".rc" + if not os.isfile(rcfile) then + rcfile = MAME_DIR .. "src/" .. _target .. "/osd/windows/" .. _target ..".rc" + end + + if os.isfile(rcfile) then + files { + rcfile, + } + dependency { + { "$(OBJDIR)/".._target ..".res" , GEN_DIR .. "/resource/" .. _target .. "vers.rc", true }, + } + else + files { + MAME_DIR .. "src/osd/windows/mame.rc", + } + dependency { + { "$(OBJDIR)/mame.res" , GEN_DIR .. "/resource/" .. _target .. "vers.rc", true }, + } + end + end + files { MAME_DIR .. "src/".._target .."/" .. _target ..".c", MAME_DIR .. "src/version.c", diff --git a/scripts/src/osd/windows.lua b/scripts/src/osd/windows.lua index b5faf8722c6..470e621bbc1 100644 --- a/scripts/src/osd/windows.lua +++ b/scripts/src/osd/windows.lua @@ -32,24 +32,6 @@ function maintargetosdoptions(_target) "comctl32", "comdlg32", } - - local rcfile = MAME_DIR .. "src/" .. _target .. "/osd/windows/" .. _target ..".rc" - - if os.isfile(rcfile) then - files { - rcfile, - } - dependency { - { "$(OBJDIR)/".._target ..".res" , GEN_DIR .. "/resource/" .. _target .. "vers.rc", true }, - } - else - files { - MAME_DIR .. "src/osd/windows/mame.rc", - } - dependency { - { "$(OBJDIR)/mame.res" , GEN_DIR .. "/resource/" .. _target .. "vers.rc", true }, - } - end end