diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/genie.lua | 8 | ||||
-rw-r--r-- | scripts/src/3rdparty.lua | 20 |
2 files changed, 15 insertions, 13 deletions
diff --git a/scripts/genie.lua b/scripts/genie.lua index 984196e2af7..e327b988abd 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() @@ -672,7 +674,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 +1069,7 @@ configuration { "steamlink" } "EGL_API_FB", } -configuration { "osx*" } +configuration { "osx* or xcode4" } links { "pthread", } diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index 04038127dfb..8ef18689e66 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -60,7 +60,7 @@ project "zlib" local version = str_to_version(_OPTIONS["gcc_version"]) if _OPTIONS["gcc"]~=nil and (string.find(_OPTIONS["gcc"], "clang") or string.find(_OPTIONS["gcc"], "asmjs")) then - configuration { "gmake" } + configuration { "gmake or xcode4" } if (version >= 30700) then buildoptions { "-Wno-shift-negative-value", @@ -85,7 +85,7 @@ end "verbose=-1", } - configuration { "gmake" } + configuration { "gmake or xcode4" } buildoptions_c { "-Wno-strict-prototypes", } @@ -271,7 +271,7 @@ end "HAVE_CONFIG_H=1", } - configuration { "gmake"} + configuration { "gmake or xcode4"} buildoptions_c { "-Wno-unused-function", "-O0", @@ -384,7 +384,7 @@ project "lua" -- "ForceCPP", --} - configuration { "gmake" } + configuration { "gmake or xcode4" } buildoptions_c { "-Wno-bad-function-cast" } @@ -523,7 +523,7 @@ project "luv" "/wd4244", -- warning C4244: 'argument' : conversion from 'xxx' to 'xxx', possible loss of data } - configuration { "gmake" } + configuration { "gmake or xcode4" } buildoptions_c { "-Wno-unused-function", "-Wno-strict-prototypes", @@ -588,7 +588,7 @@ end } - configuration { "gmake" } + configuration { "gmake or xcode4" } buildoptions_c { "-Wno-bad-function-cast", "-Wno-undef", @@ -746,7 +746,7 @@ end MAME_DIR .. "3rdparty/bx/include/compat/mingw", } - configuration { "osx*" } + configuration { "osx* or xcode4" } includedirs { MAME_DIR .. "3rdparty/bx/include/compat/osx", } @@ -761,7 +761,7 @@ end MAME_DIR .. "3rdparty/bx/include/compat/freebsd", } - configuration { "gmake" } + configuration { "gmake or xcode4" } buildoptions { "-Wno-uninitialized", "-Wno-unused-function", @@ -864,7 +864,7 @@ end "/wd4456", -- warning C4456: declaration of 'xxx' hides previous local declaration } - configuration { "gmake" } + configuration { "gmake or xcode4" } buildoptions_c { "-Wno-strict-prototypes", "-Wno-bad-function-cast", @@ -999,7 +999,7 @@ project "uv" MAME_DIR .. "3rdparty/libuv/src/win", } - configuration { "gmake" } + configuration { "gmake or xcode4" } buildoptions_c { "-Wno-strict-prototypes", "-Wno-bad-function-cast", |