summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
-rw-r--r--scripts/src/main.lua27
-rw-r--r--scripts/src/osd/windows.lua18
2 files changed, 19 insertions, 26 deletions
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index cee99799e6d..8a3959442e3 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -66,8 +66,6 @@ function mainProject(_target, _subtarget)
"ocore_" .. _OPTIONS["osd"],
}
- local override_resources = false;
-
maintargetosdoptions(_target)
includedirs {
@@ -82,7 +80,7 @@ function mainProject(_target, _subtarget)
GEN_DIR .. "resource",
}
- if _OPTIONS["targetos"]=="macosx" and (not override_resources) then
+ if _OPTIONS["targetos"]=="macosx" then
linkoptions {
"-sectcreate __TEXT __info_plist " .. GEN_DIR .. "/resource/" .. _target .. "-Info.plist"
}
@@ -95,29 +93,6 @@ 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 470e621bbc1..b5faf8722c6 100644
--- a/scripts/src/osd/windows.lua
+++ b/scripts/src/osd/windows.lua
@@ -32,6 +32,24 @@ 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