diff options
author | 2015-03-26 23:44:12 +1100 | |
---|---|---|
committer | 2015-03-26 23:45:14 +1100 | |
commit | 2605b330353e9d2201970097f2827dfdd993f8c7 (patch) | |
tree | 92c4d335bed86a6940d30fd178378f5d81a63561 | |
parent | eb8bd38fa8b1b9ed3dff55b794c3146f19efed7d (diff) |
Fix tools link on OSX, only embed plist in main target
-rw-r--r-- | scripts/genie.lua | 3 | ||||
-rw-r--r-- | scripts/src/main.lua | 7 | ||||
-rw-r--r-- | scripts/src/osd.lua | 5 |
3 files changed, 11 insertions, 4 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua index 8f1c1a81a57..7203e059a57 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -501,9 +501,6 @@ configuration { "osx*" } "SDL2.framework", "pthread", } - linkoptions { - "-sectcreate __TEXT __info_plist " .. GEN_DIR .. "/osd/sdl/" .. _OPTIONS["target"] .. "-Info.plist" - } configuration { "mingw*" } diff --git a/scripts/src/main.lua b/scripts/src/main.lua index aa939c1f115..360749f3a80 100644 --- a/scripts/src/main.lua +++ b/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() diff --git a/scripts/src/osd.lua b/scripts/src/osd.lua index 20cfccc28c6..ed2c0bd7046 100644 --- a/scripts/src/osd.lua +++ b/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 { |