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

scripts/genie.lua

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

scripts/src/main.lua

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

scripts/src/osd.lua

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

src/build/verinfo.py

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