From be6d03e9c6fb7b673f26c5a75cf35a6bbf0f5f7c Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sun, 5 Apr 2015 13:07:44 +0200 Subject: enable override of resources by osd (nw) --- scripts/src/main.lua | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'scripts/src') diff --git a/scripts/src/main.lua b/scripts/src/main.lua index d4d523499f6..cee99799e6d 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -65,6 +65,9 @@ function mainProject(_target, _subtarget) links{ "ocore_" .. _OPTIONS["osd"], } + + local override_resources = false; + maintargetosdoptions(_target) includedirs { @@ -79,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" } @@ -92,7 +95,7 @@ function mainProject(_target, _subtarget) end - if _OPTIONS["targetos"]=="windows" then + 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" -- cgit v1.2.3-70-g09d2