summaryrefslogtreecommitdiffstatshomepage
path: root/scripts/src
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/src')
-rw-r--r--scripts/src/main.lua15
-rw-r--r--scripts/src/tools.lua4
2 files changed, 9 insertions, 10 deletions
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index 80e3d1bf09a..4c4b811edae 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -2,7 +2,11 @@ function mainProject(_target, _subtarget)
if (_target == _subtarget) then
project (_target)
else
- project (_target .. _subtarget)
+ if (_subtarget=="mess") then
+ project (_subtarget)
+ else
+ project (_target .. _subtarget)
+ end
end
uuid (os.uuid(_target .."_" .. _subtarget))
kind "ConsoleApp"
@@ -141,21 +145,20 @@ 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"
+ local rcfile = MAME_DIR .. "src/" .. _target .. "/osd/".._OPTIONS["osd"].."/" .. _subtarget .. "/" .. _subtarget ..".rc"
if not os.isfile(rcfile) then
- rcfile = MAME_DIR .. "src/" .. _target .. "/osd/windows/" .. _target ..".rc"
+ rcfile = MAME_DIR .. "src/" .. _target .. "/osd/windows/" .. _subtarget .. "/" .. _subtarget ..".rc"
end
-
if os.isfile(rcfile) then
files {
rcfile,
}
dependency {
- { "$(OBJDIR)/".._target ..".res" , GEN_DIR .. "/resource/" .. _target .. "vers.rc", true },
+ { "$(OBJDIR)/".._subtarget ..".res" , GEN_DIR .. "/resource/" .. _target .. "vers.rc", true },
}
else
files {
- MAME_DIR .. "src/osd/windows/mame.rc",
+ MAME_DIR .. "src/mame/osd/windows/mame/mame.rc",
}
dependency {
{ "$(OBJDIR)/mame.res" , GEN_DIR .. "/resource/" .. _target .. "vers.rc", true },
diff --git a/scripts/src/tools.lua b/scripts/src/tools.lua
index 8c371f3b19a..b3cba16b310 100644
--- a/scripts/src/tools.lua
+++ b/scripts/src/tools.lua
@@ -454,8 +454,6 @@ files {
dofile("netlist.lua")
-
-if (_OPTIONS["target"]~="mame") then
--------------------------------------------------
-- castool
--------------------------------------------------
@@ -610,5 +608,3 @@ files {
MAME_DIR .. "src/mess/tools/imgtool/modules/bml3.c",
MAME_DIR .. "src/mess/tools/imgtool/modules/hp48.c",
}
-
-end \ No newline at end of file