diff options
author | 2016-02-22 18:29:53 +0100 | |
---|---|---|
committer | 2016-02-22 18:29:53 +0100 | |
commit | d44f8f4c2bdf19fdd55a45c779b746160d90d4fa (patch) | |
tree | 16d68eab6a3734ac0aaad0a6bc35e764a5a6fde9 /scripts/genie.lua | |
parent | 3be56e3cef6e7778c0ad5b7aac253e6da2876cd2 (diff) | |
parent | 72dd79838fc7b942cedc9099a9cffb01b3bb8637 (diff) |
Merge pull request #13 from mamedev/master
Sync to base master
Diffstat (limited to 'scripts/genie.lua')
-rw-r--r-- | scripts/genie.lua | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua index 984196e2af7..02259293cbe 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -54,7 +54,9 @@ function layoutbuildtask(_folder, _name) end function precompiledheaders() - pchheader("emu.h") + configuration { "not xcode4" } + pchheader("emu.h") + configuration { } end function addprojectflags() @@ -442,11 +444,17 @@ configurations { "Release", } -platforms { - "x32", - "x64", - "Native", -- for targets where bitness is not specified -} +if _ACTION == "xcode4" then + platforms { + "Universal", + } +else + platforms { + "x32", + "x64", + "Native", -- for targets where bitness is not specified + } +end language "C++" @@ -672,7 +680,7 @@ end "LUA_COMPAT_5_2", } - if _ACTION == "gmake" then + if _ACTION == "gmake" or _ACTION == "xcode4" then --we compile C-only to C99 standard with GNU extensions @@ -1067,7 +1075,7 @@ configuration { "steamlink" } "EGL_API_FB", } -configuration { "osx*" } +configuration { "osx* or xcode4" } links { "pthread", } |