videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

contrib: add meson support for iOS, macOS and tvOS

This commit is contained in:
Felix Paul Kühne 2019-01-18 21:44:13 +01:00
parent 10e87f0a45
commit b458069b11
2 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
contrib/bootstrap
View File

@ -282,9 +282,23 @@ case "${OS}" in
add_make_enabled "HAVE_IOS" "HAVE_DARWIN_OS" "HAVE_BSD" "HAVE_FPU"
case "${HOST}" in
*arm*)
add_make_enabled "HAVE_NEON" "HAVE_ARMV7A"
;;
*armv7s*)
add_make "PLATFORM_SHORT_ARCH := armv7s"
add_make_enabled "HAVE_NEON" "HAVE_ARMV7A"
;;
*arm*)
add_make "PLATFORM_SHORT_ARCH := armv7"
add_make_enabled "HAVE_NEON" "HAVE_ARMV7A"
;;
*arm64*|*aarch64*)
add_make "PLATFORM_SHORT_ARCH := arm64"
;;
*x86_64*)
add_make "PLATFORM_SHORT_ARCH := x86_64"
;;
*86*)
add_make "PLATFORM_SHORT_ARCH := i386"
;;
esac;
fi
if test "$BUILDFORTVOS"

22
contrib/src/main.mak
View File

@ -553,15 +553,31 @@ crossfile.meson:
echo "[properties]" >> $@
echo "needs_exe_wrapper = true" >> $@
ifdef HAVE_CROSS_COMPILE
echo "c_args = [ '-I$(PREFIX)/include' ]" >> $@
echo "cpp_args = [ '-I$(PREFIX)/include' ]" >> $@
echo "c_link_args = [ '-L$(PREFIX)/lib' ]" >> $@
echo "cpp_link_args = [ '-L$(PREFIX)/lib' ]" >> $@
ifdef HAVE_DARWIN_OS
ifdef HAVE_IOS
ifdef HAVE_TVOS
echo "c_args = ['-I$(PREFIX)/include', '-isysroot', '$(IOS_SDK)', '-mtvos-version-min=10.2', '-arch', '$(PLATFORM_SHORT_ARCH)', '-fembed-bitcode']" >> $@
echo "c_link_args = ['-L$(PREFIX)/lib', '-isysroot', '$(IOS_SDK)', '-arch', '$(PLATFORM_SHORT_ARCH)', '-fembed-bitcode']" >> $@
else
echo "c_args = ['-I$(PREFIX)/include', '-isysroot', '$(IOS_SDK)', '-miphoneos-version-min=8.4', '-arch', '$(PLATFORM_SHORT_ARCH)']" >> $@
echo "c_link_args = ['-L$(PREFIX)/lib', '-isysroot', '$(IOS_SDK)', '-arch', '$(PLATFORM_SHORT_ARCH)']" >> $@
endif
endif
ifdef HAVE_MACOSX
echo "c_args = ['-I$(PREFIX)/include', '-isysroot', '$(MACOSX_SDK)', '-mmacosx-version-min=10.10', '-arch', '$(ARCH)']" >> $@
echo "c_link_args = ['-L$(PREFIX)/lib', '-isysroot', '$(MACOSX_SDK)', '-arch', '$(ARCH)']" >> $@
endif
else
echo "c_args = [ '-I$(PREFIX)/include' ]" >> $@
echo "c_link_args = [ '-L$(PREFIX)/lib' ]" >> $@
endif
echo "[host_machine]" >> $@
ifdef HAVE_WIN32
echo "system = 'windows'" >> $@
else
ifdef HAVE_IOS
ifdef HAVE_DARWIN_OS
echo "system = 'darwin'" >> $@
else
ifdef HAVE_LINUX