diff --git a/submodules/build/Makefile b/submodules/build/Makefile index 82e8e5356..0f9a94cb0 100644 --- a/submodules/build/Makefile +++ b/submodules/build/Makefile @@ -119,10 +119,10 @@ 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) + make -f builder-iphone-os.mk host=x86_64-apple-darwin.ios $(LINPHONE_OPTIONS) x64-%: - make -f builder-iphone-os.mk host=x86_64-apple-darwin $(LINPHONE_OPTIONS) $* V=1 VERBOSE=1 + make -f builder-iphone-os.mk host=x86_64-apple-darwin.ios $(LINPHONE_OPTIONS) $* V=1 VERBOSE=1 # sends the target after 'broadcast_' to all sub-architectures (armv7, simu, arm64) diff --git a/submodules/build/builders.d/libvpx.mk b/submodules/build/builders.d/libvpx.mk index 98e398061..800844397 100644 --- a/submodules/build/builders.d/libvpx.mk +++ b/submodules/build/builders.d/libvpx.mk @@ -35,6 +35,9 @@ else ifneq (,$(findstring armv7,$(host))) else ifneq (,$(findstring aarch64,$(host))) libvpx_configure_options+= --target=arm64-darwin-gcc take_binary = arm64 +else ifneq (,$(findstring x86_64,$(host))) + libvpx_configure_options+= --target=x86_64-iphonesimulator-gcc + take_binary = x86_64 else libvpx_configure_options+= --target=x86-darwin10-gcc take_binary = i386 diff --git a/submodules/build/builders.d/openh264.mk b/submodules/build/builders.d/openh264.mk index 63210cdde..84cfd5e35 100644 --- a/submodules/build/builders.d/openh264.mk +++ b/submodules/build/builders.d/openh264.mk @@ -29,6 +29,13 @@ endif ifneq (,$(findstring aarch64-,$(host))) ARCH=arm64 endif +ifneq (,$(findstring x86_64-,$(host))) + ARCH=x86_64 +endif + +ifeq (,$(ARCH)) +$(error Undefined arch for openh264) +endif openh264_dir?=externals/openh264 diff --git a/submodules/build/iphone-config.site b/submodules/build/iphone-config.site index a8d100f1b..88c3a2b97 100644 --- a/submodules/build/iphone-config.site +++ b/submodules/build/iphone-config.site @@ -19,7 +19,7 @@ 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 +elif test "${host_alias}" = "x86_64-apple-darwin.ios" ; then ARCH=x86_64 PLATFORM=Simulator CMAKE_OPTS="-DCMAKE_SYSTEM_PROCESSOR=x86_64"