From bab5d21cef6692d117bc3182b0ff2f347aa68381 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sun, 3 Apr 2016 17:13:07 +0200 Subject: [PATCH] moved windows resources (nw) --- .../osd => scripts/resources}/windows/mame/mame.ico | Bin .../osd => scripts/resources}/windows/mame/mame.man | 0 .../osd => scripts/resources}/windows/mame/mame.rc | 0 .../osd => scripts/resources}/windows/mess/mess.ico | Bin .../osd => scripts/resources}/windows/mess/mess.man | 0 .../osd => scripts/resources}/windows/mess/mess.rc | 0 scripts/src/main.lua | 7 ++----- 7 files changed, 2 insertions(+), 5 deletions(-) rename {src/mame/osd => scripts/resources}/windows/mame/mame.ico (100%) rename {src/mame/osd => scripts/resources}/windows/mame/mame.man (100%) rename {src/mame/osd => scripts/resources}/windows/mame/mame.rc (100%) rename {src/mame/osd => scripts/resources}/windows/mess/mess.ico (100%) rename {src/mame/osd => scripts/resources}/windows/mess/mess.man (100%) rename {src/mame/osd => scripts/resources}/windows/mess/mess.rc (100%) diff --git a/src/mame/osd/windows/mame/mame.ico b/scripts/resources/windows/mame/mame.ico similarity index 100% rename from src/mame/osd/windows/mame/mame.ico rename to scripts/resources/windows/mame/mame.ico diff --git a/src/mame/osd/windows/mame/mame.man b/scripts/resources/windows/mame/mame.man similarity index 100% rename from src/mame/osd/windows/mame/mame.man rename to scripts/resources/windows/mame/mame.man diff --git a/src/mame/osd/windows/mame/mame.rc b/scripts/resources/windows/mame/mame.rc similarity index 100% rename from src/mame/osd/windows/mame/mame.rc rename to scripts/resources/windows/mame/mame.rc diff --git a/src/mame/osd/windows/mess/mess.ico b/scripts/resources/windows/mess/mess.ico similarity index 100% rename from src/mame/osd/windows/mess/mess.ico rename to scripts/resources/windows/mess/mess.ico diff --git a/src/mame/osd/windows/mess/mess.man b/scripts/resources/windows/mess/mess.man similarity index 100% rename from src/mame/osd/windows/mess/mess.man rename to scripts/resources/windows/mess/mess.man diff --git a/src/mame/osd/windows/mess/mess.rc b/scripts/resources/windows/mess/mess.rc similarity index 100% rename from src/mame/osd/windows/mess/mess.rc rename to scripts/resources/windows/mess/mess.rc diff --git a/scripts/src/main.lua b/scripts/src/main.lua index f65786074b7..7d97eae1c1c 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -255,10 +255,7 @@ end local rctarget = _subtarget if _OPTIONS["targetos"]=="windows" and (not override_resources) then - 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 .. "/" .. rctarget ..".rc" - end + rcfile = MAME_DIR .. "scripts/resources/windows/" .. _subtarget .. "/" .. rctarget ..".rc" if os.isfile(rcfile) then files { rcfile, @@ -269,7 +266,7 @@ end else rctarget = "mame" files { - MAME_DIR .. "src/mame/osd/windows/mame/mame.rc", + MAME_DIR .. "scripts/resources/windows/mame/mame.rc", } dependency { { "$(OBJDIR)/mame.res" , GEN_DIR .. "resource/" .. rctarget .. "vers.rc", true },