diff options
author | 2015-04-05 12:48:28 +0200 | |
---|---|---|
committer | 2015-04-05 12:48:28 +0200 | |
commit | 6e0007b83d2d4c98b52f4999ce40133c1e10b6fa (patch) | |
tree | e8be7e3a74a4acce9a478d631da3ba0a2e670338 | |
parent | c8b9fc1efb62cc4daa4a91bdc621db94422d0e92 (diff) |
Made all windows build use icons (nw)
-rw-r--r-- | scripts/src/main.lua | 20 | ||||
-rw-r--r-- | scripts/src/osd/windows.lua | 18 |
2 files changed, 20 insertions, 18 deletions
diff --git a/scripts/src/main.lua b/scripts/src/main.lua index f4c4e4a01c7..d4d523499f6 100644 --- a/scripts/src/main.lua +++ b/scripts/src/main.lua @@ -93,6 +93,26 @@ function mainProject(_target, _subtarget) end if _OPTIONS["targetos"]=="windows" 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 { 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 |