From 2f35d6fc26cf513c280ae320aa0d5a81e3cc75a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Damstedt=20Rasmussen?= Date: Sat, 7 Dec 2024 21:42:39 +0100 Subject: [PATCH] Remove support for armv7 and i386 on iOS iOS SDK 18.1 is unable to build ACE (clang crashes). Max iOS deployment target for armv7 is iOS 10 which is already quite old. --- Build/Makefile | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/Build/Makefile b/Build/Makefile index 54c9e8e9b..8e4adcf20 100644 --- a/Build/Makefile +++ b/Build/Makefile @@ -116,23 +116,15 @@ ios-build: IOS_INSTALL_DIR?=$(PWD)/ios-install -ios-armv7: - $(MAKE) CMAKE_EXTRA+="-DCMAKE_OSX_ARCHITECTURES=armv7 -DCMAKE_OSX_SYSROOT=iphoneos -DTOOLCHAIN_INSTALL_PREFIX=$(INSTALLDIR)/armv7" BUILDDIR=build-$@ ios-build - $(MAKE) ARCH=armv7 lipo-arch - ios-arm64: $(MAKE) CMAKE_EXTRA+="-DCMAKE_OSX_ARCHITECTURES=arm64 -DCMAKE_OSX_SYSROOT=iphoneos -DTOOLCHAIN_INSTALL_PREFIX=$(INSTALLDIR)/arm64" BUILDDIR=build-$@ ios-build $(MAKE) ARCH=arm64 lipo-arch -ios-i386: - $(MAKE) CMAKE_EXTRA+="-DCMAKE_OSX_ARCHITECTURES=i386 -DCMAKE_OSX_SYSROOT=iphonesimulator -DTOOLCHAIN_INSTALL_PREFIX=$(INSTALLDIR)/i386" BUILDDIR=build-$@ ios-build - $(MAKE) ARCH=i386 lipo-arch - ios-x64: $(MAKE) CMAKE_EXTRA+="-DCMAKE_OSX_ARCHITECTURES=x86_64 -DCMAKE_OSX_SYSROOT=iphonesimulator -DTOOLCHAIN_INSTALL_PREFIX=$(INSTALLDIR)/x86_64" BUILDDIR=build-$@ ios-build $(MAKE) ARCH=x86_64 lipo-arch -ios-all: ios-armv7 ios-arm64 ios-i386 ios-x64 lipo +ios-all: ios-arm64 ios-x64 lipo lipo-arch: teamtalk-env test -d "$(INSTALLDIR)" @@ -165,15 +157,11 @@ lipo-arch: teamtalk-env $(TEAMTALK_ROOT)/Library/TeamTalk_DLL/$(ARCH)/libTeamTalk5Pro.a lipo: teamtalk-env - lipo $(TEAMTALK_ROOT)/Library/TeamTalk_DLL/libTeamTalk5-i386.a \ - $(TEAMTALK_ROOT)/Library/TeamTalk_DLL/libTeamTalk5-x86_64.a \ - $(TEAMTALK_ROOT)/Library/TeamTalk_DLL/libTeamTalk5-armv7.a \ + lipo $(TEAMTALK_ROOT)/Library/TeamTalk_DLL/libTeamTalk5-x86_64.a \ $(TEAMTALK_ROOT)/Library/TeamTalk_DLL/libTeamTalk5-arm64.a \ -create -output $(TEAMTALK_ROOT)/Library/TeamTalk_DLL/libTeamTalk5.a - lipo $(TEAMTALK_ROOT)/Library/TeamTalk_DLL/libTeamTalk5Pro-i386.a \ - $(TEAMTALK_ROOT)/Library/TeamTalk_DLL/libTeamTalk5Pro-x86_64.a \ - $(TEAMTALK_ROOT)/Library/TeamTalk_DLL/libTeamTalk5Pro-armv7.a \ + lipo $(TEAMTALK_ROOT)/Library/TeamTalk_DLL/libTeamTalk5Pro-x86_64.a \ $(TEAMTALK_ROOT)/Library/TeamTalk_DLL/libTeamTalk5Pro-arm64.a \ -create -output $(TEAMTALK_ROOT)/Library/TeamTalk_DLL/libTeamTalk5Pro.a