diff --git a/makefile b/makefile index 9907204149a..465dc2f56de 100644 --- a/makefile +++ b/makefile @@ -1464,14 +1464,6 @@ macosx_x86_clang: generate $(PROJECTDIR)/$(MAKETYPE)-osx-clang/Makefile $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-osx-clang config=$(CONFIG)32 precompile $(SILENT) $(MAKE) $(MAKEPARAMS) -C $(PROJECTDIR)/$(MAKETYPE)-osx-clang config=$(CONFIG)32 -.PHONY: xcode4 -xcode4: generate - $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --targetos=macosx --xcode=osx xcode4 - -.PHONY: xcode4-ios -xcode4-ios: generate - $(SILENT) $(GENIE) $(PARAMS) $(TARGET_PARAMS) --targetos=macosx --xcode=ios xcode4 - #------------------------------------------------- # gmake-solaris #------------------------------------------------- diff --git a/scripts/genie.lua b/scripts/genie.lua index d1d7cebb883..607789ee82e 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -14,8 +14,6 @@ newoption { premake.check_paths = true premake.make.override = { "TARGET" } -premake.xcode.parameters = { 'CLANG_CXX_LANGUAGE_STANDARD = "c++17"', 'CLANG_CXX_LIBRARY = "libc++"' } - MAME_DIR = (path.getabsolute("..") .. "/") --MAME_DIR = string.gsub(MAME_DIR, "(%s)", "\\%1") local MAME_BUILD_DIR = (MAME_DIR .. _OPTIONS["build-dir"] .. "/") @@ -74,8 +72,7 @@ end function precompiledheaders() if _OPTIONS["precompile"]==nil or (_OPTIONS["precompile"]~=nil and _OPTIONS["precompile"]=="1") then - configuration { "not xcode4" } - pchheader("emu.h") + pchheader("emu.h") configuration { } end end @@ -145,7 +142,6 @@ newoption { { "netbsd", "NetBSD" }, { "openbsd", "OpenBSD" }, { "linux", "Linux" }, - { "ios", "iOS" }, { "macosx", "OSX" }, { "windows", "Windows" }, { "haiku", "Haiku" }, @@ -470,17 +466,11 @@ configurations { "Release", } -if _ACTION == "xcode4" then - platforms { - "x64", - } -else - platforms { - "x32", - "x64", - "Native", -- for targets where bitness is not specified - } -end +platforms { + "x32", + "x64", + "Native", -- for targets where bitness is not specified +} language "C++" @@ -1236,7 +1226,7 @@ configuration { "linux-*"} -configuration { "osx* or xcode4" } +configuration { "osx*" } links { "pthread", } diff --git a/scripts/src/3rdparty.lua b/scripts/src/3rdparty.lua index b8555883e54..a44db5ba54a 100644 --- a/scripts/src/3rdparty.lua +++ b/scripts/src/3rdparty.lua @@ -1150,7 +1150,7 @@ project "bx" MAME_DIR .. "3rdparty/bx/include/compat/mingw", } - configuration { "osx* or xcode4" } + configuration { "osx*" } includedirs { MAME_DIR .. "3rdparty/bx/include/compat/osx", } @@ -1218,7 +1218,7 @@ project "bimg" MAME_DIR .. "3rdparty/bx/include/compat/mingw", } - configuration { "osx* or xcode4" } + configuration { "osx*" } includedirs { MAME_DIR .. "3rdparty/bx/include/compat/osx", } @@ -1328,7 +1328,7 @@ end MAME_DIR .. "3rdparty/bx/include/compat/mingw", } - configuration { "osx* or xcode4" } + configuration { "osx*" } includedirs { MAME_DIR .. "3rdparty/bx/include/compat/osx", } diff --git a/scripts/toolchain.lua b/scripts/toolchain.lua index 758862c96f0..4aba7c8963c 100644 --- a/scripts/toolchain.lua +++ b/scripts/toolchain.lua @@ -24,8 +24,6 @@ newoption { { "freebsd-clang", "FreeBSD (clang compiler)"}, { "linux-gcc", "Linux (GCC compiler)" }, { "linux-clang", "Linux (Clang compiler)" }, - { "ios-arm", "iOS - ARM" }, - { "ios-simulator", "iOS - Simulator" }, { "mingw32-gcc", "MinGW32" }, { "mingw64-gcc", "MinGW64" }, { "mingw-clang", "MinGW (clang compiler)" }, @@ -57,28 +55,12 @@ newoption { }, } -newoption { - trigger = "xcode", - value = "xcode_target", - description = "Choose XCode target", - allowed = { - { "osx", "OSX" }, - { "ios", "iOS" }, - } -} - newoption { trigger = "with-android", value = "#", description = "Set Android platform version (default: android-21).", } -newoption { - trigger = "with-ios", - value = "#", - description = "Set iOS target version (default: 8.0).", -} - newoption { trigger = "with-windows", value = "#", @@ -96,11 +78,6 @@ function toolchain(_buildDir, _subDir) androidPlatform = "android-24" end - local iosPlatform = "" - if _OPTIONS["with-ios"] then - iosPlatform = _OPTIONS["with-ios"] - end - local windowsPlatform = "10.0.10240.0" if _OPTIONS["with-windows"] then windowsPlatform = _OPTIONS["with-windows"] @@ -179,20 +156,6 @@ function toolchain(_buildDir, _subDir) location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-openbsd") end - if "ios-arm" == _OPTIONS["gcc"] then - premake.gcc.cc = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang" - premake.gcc.cxx = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++" - premake.gcc.ar = "ar" - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-ios-arm") - end - - if "ios-simulator" == _OPTIONS["gcc"] then - premake.gcc.cc = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang" - premake.gcc.cxx = "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++" - premake.gcc.ar = "ar" - location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-ios-simulator") - end - if "linux-gcc" == _OPTIONS["gcc"] then -- Force gcc-4.2 on ubuntu-intrepid if _OPTIONS["distro"]=="ubuntu-intrepid" then @@ -401,17 +364,6 @@ function toolchain(_buildDir, _subDir) premake.vstudio.toolset = "Intel C++ Compiler XE 15.0" location (_buildDir .. "projects/" .. _subDir .. "/".. _ACTION .. "-intel") end - elseif _ACTION == "xcode4" then - - - if "osx" == _OPTIONS["xcode"] then - premake.xcode.toolset = "macosx" - location (path.join(_buildDir, "projects", _ACTION .. "-osx")) - - elseif "ios" == _OPTIONS["xcode"] then - premake.xcode.toolset = "iphoneos" - location (path.join(_buildDir, "projects", _ACTION .. "-ios")) - end end if (_OPTIONS["CC"] ~= nil) then @@ -882,14 +834,6 @@ function toolchain(_buildDir, _subDir) configuration { "osx*", "arm64", "Debug" } targetdir (_buildDir .. "osx_clang" .. "/bin/x64/Debug") - configuration { "ios-arm" } - targetdir (_buildDir .. "ios-arm" .. "/bin") - objdir (_buildDir .. "ios-arm" .. "/obj") - - configuration { "ios-simulator" } - targetdir (_buildDir .. "ios-simulator" .. "/bin") - objdir (_buildDir .. "ios-simulator" .. "/obj") - configuration {} -- reset configuration return true