Skip to content
Snippets Groups Projects
Commit 8b5fd052 authored by Kateryna Kostiuk's avatar Kateryna Kostiuk
Browse files

build: support iOS arm64 simulator

- disable vpx for arm64 simulator

jami-client-ios#422
Change-Id: I5369dc6ce8e666dc03a5993a05f38d7a74556d4b
parent 86d3bb66
No related branches found
No related tags found
No related merge requests found
...@@ -352,6 +352,13 @@ FFMPEGCONF += \ ...@@ -352,6 +352,13 @@ FFMPEGCONF += \
--target-os=darwin \ --target-os=darwin \
--enable-cross-compile \ --enable-cross-compile \
--enable-pic --enable-pic
# vpx not supported on iPhoneSimulator on arm64
ifeq ($(IOS_TARGET_PLATFORM),iPhoneSimulator)
ifeq ($(ARCH),arm64)
DEPS_ffmpeg := $(filter-out vpx, $(DEPS_ffmpeg))
FFMPEGCONF += --disable-libvpx
endif
endif
endif endif
ifndef HAVE_IOS ifndef HAVE_IOS
......
...@@ -55,7 +55,8 @@ endif ...@@ -55,7 +55,8 @@ endif
.pjproject: pjproject .pjproject: pjproject
ifdef HAVE_IOS ifdef HAVE_IOS
cd $< && ARCH="-arch $(ARCH)" IPHONESDK=$(IOS_SDK) $(HOSTVARS) EXCLUDE_APP=1 ./configure-iphone $(HOSTCONF) $(PJPROJECT_OPTIONS) # provide DEVPATH and MIN_IOS to build arm64 simulator
cd $< && ARCH="-arch $(ARCH)" IPHONESDK=$(IOS_SDK) $(HOSTVARS) EXCLUDE_APP=1 DEVPATH="$(DEVPATH)" MIN_IOS="$(MIN_IOS)" ./configure-iphone $(HOSTCONF) $(PJPROJECT_OPTIONS)
else ifdef HAVE_MACOSX else ifdef HAVE_MACOSX
cd $< && ARCH="-arch $(ARCH)" $(HOSTVARS) EXCLUDE_APP=1 ./aconfigure $(HOSTCONF) $(PJPROJECT_OPTIONS) cd $< && ARCH="-arch $(ARCH)" $(HOSTVARS) EXCLUDE_APP=1 ./aconfigure $(HOSTCONF) $(PJPROJECT_OPTIONS)
else else
......
...@@ -37,6 +37,12 @@ X264CONF += --disable-asm ...@@ -37,6 +37,12 @@ X264CONF += --disable-asm
endif endif
endif endif
ifdef HAVE_IOS
ifeq ($(ARCH),x86_64)
X264CONF += --disable-asm
endif
endif
$(TARBALLS)/x264-$(X264_HASH).tar.bz2: $(TARBALLS)/x264-$(X264_HASH).tar.bz2:
$(call download,$(X264_URL),master,$(X264_HASH)) $(call download,$(X264_URL),master,$(X264_HASH))
...@@ -55,7 +61,7 @@ x264: x264-$(X264_HASH).tar.bz2 .sum-x264 ...@@ -55,7 +61,7 @@ x264: x264-$(X264_HASH).tar.bz2 .sum-x264
ifdef HAVE_ANDROID ifdef HAVE_ANDROID
cd $< && $(HOSTVARS) AS="$(CC)" ./configure $(X264CONF) cd $< && $(HOSTVARS) AS="$(CC)" ./configure $(X264CONF)
else else
ifeq ($(IOS_TARGET_PLATFORM),iPhoneOS) ifdef HAVE_IOS
cd $< && $(HOSTVARS) ASFLAGS="$(CFLAGS)" ./configure $(X264CONF) cd $< && $(HOSTVARS) ASFLAGS="$(CFLAGS)" ./configure $(X264CONF)
else else
cd $< && $(HOSTVARS) ./configure $(X264CONF) cd $< && $(HOSTVARS) ./configure $(X264CONF)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment