Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-07-04 17:38:08 +03:00
Code Issues Actions 36 Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/mamedev/mame

Browse Source
This commit is contained in:
Miodrag Milanovic 2015-03-26 14:01:38 +01:00
commit c21bf6fd5d
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
scripts/genie.lua
View File

@ -518,7 +518,6 @@ configuration { "linux-*" }
configuration { "osx*" } configuration { "osx*" }
links { links {
"Cocoa.framework", "Cocoa.framework",
"OpenGL.framework", "OpenGL.framework",

7
scripts/src/main.lua
View File

@ -14,6 +14,11 @@ function mainProject(_target, _subtarget)
"NoManifest", "NoManifest",
} }
configuration { "osx*" }
linkoptions {
"-sectcreate __TEXT __info_plist " .. GEN_DIR .. "/osd/sdl/" .. _OPTIONS["target"] .. "-Info.plist"
}
configuration { "mingw*" } configuration { "mingw*" }
if _OPTIONS["osd"]=="sdl" then if _OPTIONS["osd"]=="sdl" then
targetprefix "sdl" targetprefix "sdl"
@ -73,7 +78,7 @@ function mainProject(_target, _subtarget)
MAME_DIR .. "3rdparty/zlib", MAME_DIR .. "3rdparty/zlib",
GEN_DIR .. "mame/layout", GEN_DIR .. "mame/layout",
GEN_DIR .. "ldplayer/layout", GEN_DIR .. "ldplayer/layout",
GEN_DIR .. "osd/windows", GEN_DIR .. "osd/windows",
} }
includeosd() includeosd()

5
scripts/src/osd.lua
View File

@ -193,6 +193,11 @@ project ("ocore_" .. _OPTIONS["osd"])
--else --else
MAME_DIR .. "src/osd/modules/sync/work_osd.*", MAME_DIR .. "src/osd/modules/sync/work_osd.*",
} }
if _OPTIONS["targetos"]=="macosx" then
files {
MAME_DIR .. "src/osd/sdl/osxutils.m",
}
end
end end
if _OPTIONS["osd"]=="windows" then if _OPTIONS["osd"]=="windows" then
includedirs { includedirs {

8
src/build/verinfo.py
View File

@ -108,10 +108,10 @@ else:
comments = "Multiple Arcade Machine Emulator" comments = "Multiple Arcade Machine Emulator"
company_name = "MAME Team" company_name = "MAME Team"
file_description = "Multiple Arcade Machine Emulator" file_description = "Multiple Arcade Machine Emulator"
internal_name = "MAME" internal_name = "MAME" if build == "mame" else build
original_filename = "MAME" original_filename = "MAME" if build == "mame" else build
product_name = "MAME" product_name = "MAME" if build == "mame" else build
bundle_identifier = "org.mamedev.mame" bundle_identifier = "org.mamedev." + build
legal_copyright = "Copyright Nicola Salmoria and the MAME team" legal_copyright = "Copyright Nicola Salmoria and the MAME team"