mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 755229 - Use YASM for libvpx on mingw builds r=khuey
This commit is contained in:
Jacek Caban
parent
b843767fc2
commit
a9bd81bda6
26
configure.in
26
configure.in
@ -5718,23 +5718,19 @@ if test -n "$MOZ_WEBM" -a -z "$MOZ_NATIVE_LIBVPX"; then
|
||||
VPX_X86_ASM=1
|
||||
;;
|
||||
WINNT:x86_64)
|
||||
if test -z "$GNU_CC"; then
|
||||
VPX_ASFLAGS="-f x64 -rnasm -pnasm"
|
||||
VPX_X86_ASM=1
|
||||
fi
|
||||
VPX_ASFLAGS="-f x64 -rnasm -pnasm"
|
||||
VPX_X86_ASM=1
|
||||
;;
|
||||
WINNT:x86)
|
||||
if test -z "$GNU_CC"; then
|
||||
dnl Check for yasm 1.1 or greater.
|
||||
if test -n "$COMPILE_ENVIRONMENT" -a -z "$YASM"; then
|
||||
AC_MSG_ERROR([yasm 1.1 or greater is required to build libvpx on Win32, but it appears not to be installed. Install it (included in MozillaBuild 1.5.1 and newer) or configure with --disable-webm (which disables the WebM video format). See https://developer.mozilla.org/en/YASM for more details.])
|
||||
elif test -n "$COMPILE_ENVIRONMENT" -a "$_YASM_MAJOR_VERSION" -lt "1" -o \( "$_YASM_MAJOR_VERSION" -eq "1" -a "$_YASM_MINOR_VERSION" -lt "1" \) ; then
|
||||
AC_MSG_ERROR([yasm 1.1 or greater is required to build libvpx on Win32, but you appear to have version $_YASM_MAJOR_VERSION.$_YASM_MINOR_VERSION. Upgrade to the newest version (included in MozillaBuild 1.5.1 and newer) or configure with --disable-webm (which disables the WebM video format). See https://developer.mozilla.org/en/YASM for more details.])
|
||||
else
|
||||
VPX_ASFLAGS="-f win32 -rnasm -pnasm -DPIC"
|
||||
VPX_X86_ASM=1
|
||||
dnl The encoder needs obj_int_extract to get asm offsets.
|
||||
fi
|
||||
dnl Check for yasm 1.1 or greater.
|
||||
if test -n "$COMPILE_ENVIRONMENT" -a -z "$YASM"; then
|
||||
AC_MSG_ERROR([yasm 1.1 or greater is required to build libvpx on Win32, but it appears not to be installed. Install it (included in MozillaBuild 1.5.1 and newer) or configure with --disable-webm (which disables the WebM video format). See https://developer.mozilla.org/en/YASM for more details.])
|
||||
elif test -n "$COMPILE_ENVIRONMENT" -a "$_YASM_MAJOR_VERSION" -lt "1" -o \( "$_YASM_MAJOR_VERSION" -eq "1" -a "$_YASM_MINOR_VERSION" -lt "1" \) ; then
|
||||
AC_MSG_ERROR([yasm 1.1 or greater is required to build libvpx on Win32, but you appear to have version $_YASM_MAJOR_VERSION.$_YASM_MINOR_VERSION. Upgrade to the newest version (included in MozillaBuild 1.5.1 and newer) or configure with --disable-webm (which disables the WebM video format). See https://developer.mozilla.org/en/YASM for more details.])
|
||||
else
|
||||
VPX_ASFLAGS="-f win32 -rnasm -pnasm -DPIC"
|
||||
VPX_X86_ASM=1
|
||||
dnl The encoder needs obj_int_extract to get asm offsets.
|
||||
fi
|
||||
;;
|
||||
*:arm*)
|
||||
|
||||
@ -1,6 +1,10 @@
|
||||
#if defined(VPX_X86_ASM)
|
||||
|
||||
#if defined(_WIN32) && !defined(__GNUC__) && defined(_M_IX86)
|
||||
#if defined(_WIN64)
|
||||
/* 64 bit Windows */
|
||||
#include "vpx_config_x86_64-win64-vs8.h"
|
||||
|
||||
#elif defined(_WIN32)
|
||||
/* 32 bit Windows, MSVC. */
|
||||
#include "vpx_config_x86-win32-vs8.h"
|
||||
|
||||
@ -28,10 +32,6 @@
|
||||
/* 64 bit Solaris. */
|
||||
#include "vpx_config_x86_64-linux-gcc.h"
|
||||
|
||||
#elif defined(_MSC_VER) && defined(_M_X64)
|
||||
/* 64 bit Windows */
|
||||
#include "vpx_config_x86_64-win64-vs8.h"
|
||||
|
||||
#else
|
||||
#error VPX_X86_ASM is defined, but assembly not supported on this platform!
|
||||
#endif
|
||||
|
||||
@ -1,6 +1,9 @@
|
||||
#if defined(VPX_X86_ASM)
|
||||
|
||||
#if defined(WIN32) && !defined(__GNUC__) && !defined(_M_X64)
|
||||
#if defined(_WIN64)
|
||||
#include "vpx_config_x86_64-win64-vs8.c"
|
||||
|
||||
#elif defined(WIN32)
|
||||
/* 32 bit Windows, MSVC. */
|
||||
#include "vpx_config_x86-win32-vs8.c"
|
||||
|
||||
@ -28,9 +31,6 @@
|
||||
/* 64 bit Solaris. */
|
||||
#include "vpx_config_x86_64-linux-gcc.h"
|
||||
|
||||
#elif defined(_MSC_VER) && defined(_M_X64)
|
||||
#include "vpx_config_x86_64-win64-vs8.c"
|
||||
|
||||
#else
|
||||
#error VPX_X86_ASM is defined, but assembly not supported on this platform!
|
||||
#endif
|
||||
|
||||
@ -27,11 +27,15 @@
|
||||
#define HAVE_SSE4_1 1
|
||||
#define HAVE_ALTIVEC 0
|
||||
#define HAVE_VPX_PORTS 1
|
||||
#ifndef HAVE_STDINT_H
|
||||
#define HAVE_STDINT_H 0
|
||||
#endif
|
||||
#define HAVE_ALT_TREE_LAYOUT 0
|
||||
#define HAVE_PTHREAD_H 0
|
||||
#define HAVE_SYS_MMAN_H 0
|
||||
#ifndef HAVE_UNISTD_H
|
||||
#define HAVE_UNISTD_H 0
|
||||
#endif
|
||||
#define CONFIG_EXTERNAL_BUILD 1
|
||||
#define CONFIG_INSTALL_DOCS 0
|
||||
#define CONFIG_INSTALL_BINS 1
|
||||
@ -41,8 +45,13 @@
|
||||
#define CONFIG_GPROF 0
|
||||
#define CONFIG_GCOV 0
|
||||
#define CONFIG_RVCT 0
|
||||
#ifdef _MSC_VER
|
||||
#define CONFIG_GCC 0
|
||||
#define CONFIG_MSVS 1
|
||||
#else
|
||||
#define CONFIG_GCC 1
|
||||
#define CONFIG_MSVS 0
|
||||
#endif
|
||||
#define CONFIG_PIC 0
|
||||
#define CONFIG_BIG_ENDIAN 0
|
||||
#define CONFIG_CODEC_SRCS 0
|
||||
|
||||
@ -27,11 +27,15 @@
|
||||
#define HAVE_SSE4_1 1
|
||||
#define HAVE_ALTIVEC 0
|
||||
#define HAVE_VPX_PORTS 1
|
||||
#ifndef HAVE_STDINT_H
|
||||
#define HAVE_STDINT_H 0
|
||||
#endif
|
||||
#define HAVE_ALT_TREE_LAYOUT 0
|
||||
#define HAVE_PTHREAD_H 0
|
||||
#define HAVE_SYS_MMAN_H 0
|
||||
#ifndef HAVE_UNISTD_H
|
||||
#define HAVE_UNISTD_H 0
|
||||
#endif
|
||||
#define CONFIG_EXTERNAL_BUILD 1
|
||||
#define CONFIG_INSTALL_DOCS 0
|
||||
#define CONFIG_INSTALL_BINS 1
|
||||
@ -41,8 +45,13 @@
|
||||
#define CONFIG_GPROF 0
|
||||
#define CONFIG_GCOV 0
|
||||
#define CONFIG_RVCT 0
|
||||
#ifdef _MSC_VER
|
||||
#define CONFIG_GCC 0
|
||||
#define CONFIG_MSVS 1
|
||||
#else
|
||||
#define CONFIG_GCC 1
|
||||
#define CONFIG_MSVS 0
|
||||
#endif
|
||||
#define CONFIG_PIC 0
|
||||
#define CONFIG_BIG_ENDIAN 0
|
||||
#define CONFIG_CODEC_SRCS 0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user