Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-04-21 07:52:35 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

rolled back, not worth of it (nw)

Browse Source
This commit is contained in:
Miodrag Milanovic 2015-04-05 14:22:46 +02:00
parent be6d03e9c6
commit 2c38dd1f34
2 changed files with 19 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
scripts/src/main.lua
View File

@ -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",

18
scripts/src/osd/windows.lua
View File

@ -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