diff options
| author | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-04-28 07:38:20 +0200 |
|---|---|---|
| committer | janekptacijarabaci <janekptacijarabaci@seznam.cz> | 2018-04-28 07:38:20 +0200 |
| commit | 6b2bba06b433fb75979ab6daf7bbe8bc76c53875 (patch) | |
| tree | 75803b4683889e6e0d2a3faef30415db3ff7b3ba /media/ffvpx/ffvpxcommon.mozbuild | |
| parent | 72def35cd0cf3649b6d7ab72b66117df3e1c33fc (diff) | |
| parent | c75dae3ed21bfa5a8ae46cd83d18329af5bea05a (diff) | |
| download | UXP-6b2bba06b433fb75979ab6daf7bbe8bc76c53875.tar UXP-6b2bba06b433fb75979ab6daf7bbe8bc76c53875.tar.gz UXP-6b2bba06b433fb75979ab6daf7bbe8bc76c53875.tar.lz UXP-6b2bba06b433fb75979ab6daf7bbe8bc76c53875.tar.xz UXP-6b2bba06b433fb75979ab6daf7bbe8bc76c53875.zip | |
Merge branch 'master' of https://github.com/MoonchildProductions/UXP into pm_url_1
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 |