summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-05-17 16:46:37 +0200
committer Miodrag Milanovic <mmicko@gmail.com>2015-05-17 16:46:37 +0200
commit64987c86ec3488a9f0359956f9fc8392b64bbbce (patch)
tree8265dd94630f848a72f326ff526f117f8d261140
parent242e55a0ec317ca35fe2c74ebcc689fa10dc1369 (diff)
fixed determining RC file and rules and removed not needed files (nw)
-rw-r--r--scripts/src/main.lua16
-rw-r--r--src/mame/osd/windows/arcade/arcade.icobin372526 -> 0 bytes
-rw-r--r--src/mame/osd/windows/arcade/arcade.man10
-rw-r--r--src/mame/osd/windows/arcade/arcade.rc14
4 files changed, 9 insertions, 31 deletions
diff --git a/scripts/src/main.lua b/scripts/src/main.lua
index 870c9dfed88..aaa606c91f5 100644
--- a/scripts/src/main.lua
+++ b/scripts/src/main.lua
@@ -146,25 +146,27 @@ function mainProject(_target, _subtarget)
}
end
+ local rctarget = _subtarget
if _OPTIONS["targetos"]=="windows" and (not override_resources) then
- local rcfile = MAME_DIR .. "src/" .. _target .. "/osd/".._OPTIONS["osd"].."/" .. _subtarget .. "/" .. _subtarget ..".rc"
+ 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 .. "/" .. _subtarget ..".rc"
+ rcfile = MAME_DIR .. "src/" .. _target .. "/osd/windows/" .. _subtarget .. "/" .. rctarget ..".rc"
end
if os.isfile(rcfile) then
files {
rcfile,
}
dependency {
- { "$(OBJDIR)/".._subtarget ..".res" , GEN_DIR .. "/resource/" .. _subtarget .. "vers.rc", true },
+ { "$(OBJDIR)/".._subtarget ..".res" , GEN_DIR .. "/resource/" .. rctarget .. "vers.rc", true },
}
else
+ rctarget = "mame"
files {
MAME_DIR .. "src/mame/osd/windows/mame/mame.rc",
}
dependency {
- { "$(OBJDIR)/mame.res" , GEN_DIR .. "/resource/" .. _subtarget .. "vers.rc", true },
+ { "$(OBJDIR)/mame.res" , GEN_DIR .. "/resource/" .. rctarget .. "vers.rc", true },
}
end
end
@@ -185,14 +187,14 @@ function mainProject(_target, _subtarget)
configuration { "mingw*" }
custombuildtask {
- { MAME_DIR .. "src/version.c" , GEN_DIR .. "/resource/" .. _subtarget .. "vers.rc", { MAME_DIR .. "src/build/verinfo.py" }, {"@echo Emitting " .. _subtarget .. "vers.rc" .. "...", PYTHON .. " $(1) -r -b " .. _subtarget .. " $(<) > $(@)" }},
+ { MAME_DIR .. "src/version.c" , GEN_DIR .. "/resource/" .. rctarget .. "vers.rc", { MAME_DIR .. "src/build/verinfo.py" }, {"@echo Emitting " .. rctarget .. "vers.rc" .. "...", PYTHON .. " $(1) -r -b " .. rctarget .. " $(<) > $(@)" }},
}
configuration { "vs*" }
prebuildcommands {
"mkdir " .. path.translate(GEN_DIR .. "/resource/","\\") .. " 2>NUL",
- "@echo Emitting ".. _subtarget .. "vers.rc...",
- PYTHON .. " " .. path.translate(MAME_DIR .. "src/build/verinfo.py","\\") .. " -r -b " .. _subtarget .. " " .. path.translate(MAME_DIR .. "src/version.c","\\") .. " > " .. path.translate(GEN_DIR .. "/resource/" .. _subtarget .. "vers.rc", "\\") ,
+ "@echo Emitting ".. rctarget .. "vers.rc...",
+ PYTHON .. " " .. path.translate(MAME_DIR .. "src/build/verinfo.py","\\") .. " -r -b " .. rctarget .. " " .. path.translate(MAME_DIR .. "src/version.c","\\") .. " > " .. path.translate(GEN_DIR .. "/resource/" .. rctarget .. "vers.rc", "\\") ,
}
diff --git a/src/mame/osd/windows/arcade/arcade.ico b/src/mame/osd/windows/arcade/arcade.ico
deleted file mode 100644
index 62761447fc2..00000000000
--- a/src/mame/osd/windows/arcade/arcade.ico
+++ /dev/null
Binary files differ
diff --git a/src/mame/osd/windows/arcade/arcade.man b/src/mame/osd/windows/arcade/arcade.man
deleted file mode 100644
index 2ea6a6b2e5a..00000000000
--- a/src/mame/osd/windows/arcade/arcade.man
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
- <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
- <assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="MAME" type="win32" />
- <description>Multiple Arcade Machine Emulator</description>
- <dependency>
- <dependentAssembly>
- <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" publicKeyToken="6595b64144ccf1df" language="*" processorArchitecture="*"/>
- </dependentAssembly>
- </dependency>
-</assembly>
diff --git a/src/mame/osd/windows/arcade/arcade.rc b/src/mame/osd/windows/arcade/arcade.rc
deleted file mode 100644
index 955a08c1b2a..00000000000
--- a/src/mame/osd/windows/arcade/arcade.rc
+++ /dev/null
@@ -1,14 +0,0 @@
-// license:BSD-3-Clause
-// copyright-holders:Aaron Giles
-//============================================================
-//
-// arcade.rc - Minimal resource file for Win32 MAME
-//
-//============================================================
-
-#include <windows.h>
-#include "arcadevers.rc"
-
-1 24 MOVEABLE PURE "arcade.man"
-
-2 ICON DISCARDABLE "arcade.ico"