Previous 199869 Revisions Next

r36677 Thursday 26th March, 2015 at 13:01:38 UTC by Miodrag Milanović
Merge branch 'master' of https://github.com/mamedev/mame
[scripts]genie.lua
[scripts/src]main.lua osd.lua
[src/build]verinfo.py

trunk/scripts/genie.lua
r245188r245189
518518
519519
520520configuration { "osx*" }
521
522521      links {
523522         "Cocoa.framework",
524523         "OpenGL.framework",
trunk/scripts/src/main.lua
r245188r245189
1414      "NoManifest",
1515   }
1616
17   configuration { "osx*" }
18      linkoptions {
19         "-sectcreate __TEXT __info_plist " .. GEN_DIR .. "/osd/sdl/" .. _OPTIONS["target"] .. "-Info.plist"
20      }
21
1722   configuration { "mingw*" }
1823      if _OPTIONS["osd"]=="sdl" then
1924         targetprefix "sdl"
r245188r245189
7378      MAME_DIR .. "3rdparty/zlib",
7479      GEN_DIR  .. "mame/layout",
7580      GEN_DIR  .. "ldplayer/layout",
76      GEN_DIR .. "osd/windows",
81      GEN_DIR .. "osd/windows",
7782   }
7883
7984   includeosd()
trunk/scripts/src/osd.lua
r245188r245189
193193         --else
194194         MAME_DIR .. "src/osd/modules/sync/work_osd.*",
195195      }
196      if _OPTIONS["targetos"]=="macosx" then
197         files {
198            MAME_DIR .. "src/osd/sdl/osxutils.m",
199         }
200      end
196201   end
197202   if _OPTIONS["osd"]=="windows" then
198203      includedirs {
trunk/src/build/verinfo.py
r245188r245189
108108    comments = "Multiple Arcade Machine Emulator"
109109    company_name = "MAME Team"
110110    file_description = "Multiple Arcade Machine Emulator"
111    internal_name = "MAME"
112    original_filename = "MAME"
113    product_name = "MAME"
114    bundle_identifier = "org.mamedev.mame"
111    internal_name = "MAME" if build == "mame" else build
112    original_filename = "MAME" if build == "mame" else build
113    product_name = "MAME" if build == "mame" else build
114    bundle_identifier = "org.mamedev." + build
115115
116116legal_copyright = "Copyright Nicola Salmoria and the MAME team"
117117

https://github.com/mamedev/mame/commit/c21bf6fd5d350ae0a53238cae2178949d5c78e8e

Previous 199869 Revisions Next

© 1997-2024 The MAME Team