diff options
| author | Moonchild <mcwerewolf@gmail.com> | 2018-04-27 19:15:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-04-27 19:15:26 +0200 |
| commit | c75dae3ed21bfa5a8ae46cd83d18329af5bea05a (patch) | |
| tree | ef657c38feb2368a3c86765778d1f068aa5eb614 /media/ffvpx/ffvpxcommon.mozbuild | |
| parent | c82c6d960a7f19d6595171f9705c43514f20c1ec (diff) | |
| parent | 6ada4b14e4cfc91f5f1b2556623cab691f3ab813 (diff) | |
| download | UXP-c75dae3ed21bfa5a8ae46cd83d18329af5bea05a.tar UXP-c75dae3ed21bfa5a8ae46cd83d18329af5bea05a.tar.gz UXP-c75dae3ed21bfa5a8ae46cd83d18329af5bea05a.tar.lz UXP-c75dae3ed21bfa5a8ae46cd83d18329af5bea05a.tar.xz UXP-c75dae3ed21bfa5a8ae46cd83d18329af5bea05a.zip | |
Merge pull request #275 from trav90/ffvpx-resync
Resync ffvpx code with 3.4.2-release from upstream
Diffstat (limited to 'media/ffvpx/ffvpxcommon.mozbuild')
| -rw-r--r-- | media/ffvpx/ffvpxcommon.mozbuild | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/media/ffvpx/ffvpxcommon.mozbuild b/media/ffvpx/ffvpxcommon.mozbuild index 6d17e8807..620158694 100644 --- a/media/ffvpx/ffvpxcommon.mozbuild +++ b/media/ffvpx/ffvpxcommon.mozbuild @@ -29,6 +29,8 @@ if CONFIG['FFVPX_ASFLAGS']: else: # Default to unix, similar to how ASFLAGS setup works in configure.in ASFLAGS += ['-Pconfig_unix64.asm'] + # default disabled components + ASFLAGS += ['-Pdefaults_disabled.asm'] LOCAL_INCLUDES += ['/media/ffvpx'] @@ -51,6 +53,8 @@ if CONFIG['GNU_CC']: '-Wno-incompatible-pointer-types-discards-qualifiers', '-Wno-string-conversion', '-Wno-visibility', + # Workaround for https://bugs.llvm.org/show_bug.cgi?id=26828#c4 : + '-ffreestanding', ] else: CFLAGS += [ @@ -87,6 +91,7 @@ elif CONFIG['_MSC_VER']: '-wd4057', '-wd4204', '-wd4706', '-wd4305', '-wd4152', '-wd4324', '-we4013', '-wd4100', '-wd4214', '-wd4307', '-wd4273', '-wd4554', ] + LOCAL_INCLUDES += ['/media/ffvpx/compat/atomics/win32'] DEFINES['HAVE_AV_CONFIG_H'] = True |