diff --git a/submodules/build/Makefile b/submodules/build/Makefile index 9c1e1499c..96df5837d 100644 --- a/submodules/build/Makefile +++ b/submodules/build/Makefile @@ -96,6 +96,12 @@ simu-%: arm64: make -f builder-iphone-os.mk host=aarch64-apple-darwin $(LINPHONE_OPTIONS) V=1 VERBOSE=1 +x64: + make -f builder-iphone-os.mk host=x86_64-apple-darwin $(LINPHONE_OPTIONS) + +x64-%: + make -f builder-iphone-os.mk host=x86_64-apple-darwin $(LINPHONE_OPTIONS) $* V=1 VERBOSE=1 + # sends the target after 'broadcast_' to all sub-architectures (armv7, simu, arm64) broadcast_%: diff --git a/submodules/build/builder-iphone-os.mk b/submodules/build/builder-iphone-os.mk index f5a092f6f..e53426af9 100644 --- a/submodules/build/builder-iphone-os.mk +++ b/submodules/build/builder-iphone-os.mk @@ -38,7 +38,8 @@ linphone_configure_controls = \ --disable-x11 \ --disable-tutorials \ --disable-tools \ - --enable-msg-storage=yes + --enable-msg-storage=yes \ + --enable-ios #path diff --git a/submodules/build/builders.d/belle-sip.mk b/submodules/build/builders.d/belle-sip.mk index 085472d54..d7d1363f4 100644 --- a/submodules/build/builders.d/belle-sip.mk +++ b/submodules/build/builders.d/belle-sip.mk @@ -27,7 +27,7 @@ $(BUILDER_BUILD_DIR)/$(belle-sip_dir)/Makefile: $(BUILDER_SRC_DIR)/$(belle-sip_d mkdir -p $(BUILDER_BUILD_DIR)/$(belle-sip_dir) cd $(BUILDER_BUILD_DIR)/$(belle-sip_dir)/ \ && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) \ - $(BUILDER_SRC_DIR)/$(belle-sip_dir)/configure --prefix=$(prefix) --host=$(host) ${library_mode} --enable-tls --enable-tunnel --with-polarssl=$(prefix) + $(BUILDER_SRC_DIR)/$(belle-sip_dir)/configure --prefix=$(prefix) --host=$(host) ${library_mode} --enable-tls --enable-tunnel --with-polarssl=$(prefix) --enable-ios build-belle-sip: $(BUILDER_BUILD_DIR)/$(belle-sip_dir)/Makefile cd $(BUILDER_BUILD_DIR)/$(belle-sip_dir) && PKG_CONFIG_LIBDIR=$(prefix)/lib/pkgconfig CONFIG_SITE=$(BUILDER_SRC_DIR)/build/$(config_site) make && make install diff --git a/submodules/build/iphone-config.site b/submodules/build/iphone-config.site index 033e2bd0d..a8d100f1b 100644 --- a/submodules/build/iphone-config.site +++ b/submodules/build/iphone-config.site @@ -19,6 +19,11 @@ elif test "${host_alias}" = "aarch64-apple-darwin" ; then ARCH=arm64 PLATFORM=OS CMAKE_OPTS="-DCMAKE_SYSTEM_PROCESSOR=aarch64" +elif test "${host_alias}" = "x86_64-apple-darwin" ; then + ARCH=x86_64 + PLATFORM=Simulator + CMAKE_OPTS="-DCMAKE_SYSTEM_PROCESSOR=x86_64" + CLANG_TARGET_SPECIFIER=mios-simulator-version-min else echo "bad host ${host_alias} must be either i386-apple-darwin or arm[v7,64]-apple-darwin" exit