diff options
| author | Job Bautista <jobbautista9@protonmail.com> | 2022-07-22 23:02:22 +0800 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2022-07-22 21:23:21 +0000 |
| commit | 81f39035984b3a54bf24c9e9aeeea7d9d5d6469e (patch) | |
| tree | 83e17188defb6ca77a7c5349d56e112d0c355e23 /media/libtheora | |
| parent | 6957412ab5b3bb4905e87ce8d909c22f0024bfe4 (diff) | |
| download | uxp-81f39035984b3a54bf24c9e9aeeea7d9d5d6469e.tar.gz | |
Issue #1962 - Follow-up: Fix build issues on Windows.
Do not pass -Wno-type-limits to MSVC.
Restore MSVC check for x86_vc
Diffstat (limited to 'media/libtheora')
| -rw-r--r-- | media/libtheora/moz.build | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/media/libtheora/moz.build b/media/libtheora/moz.build index aaec4c2ad8..b7d6ba74c6 100644 --- a/media/libtheora/moz.build +++ b/media/libtheora/moz.build @@ -24,7 +24,8 @@ if CONFIG['GKMEDIAS_SHARED_LIBRARY']: DEFINES['THEORA_DISABLE_ENCODE'] = True # Suppress warnings in third-party code. -CFLAGS += ['-Wno-type-limits'] +if CONFIG['CC_TYPE'] in ('clang', 'clang-cl', 'gcc'): + CFLAGS += ['-Wno-type-limits'] if CONFIG['CC_TYPE'] in ('clang', 'clang-cl'): CFLAGS += [ '-Wno-shift-negative-value', @@ -61,16 +62,18 @@ if CONFIG['INTEL_ARCHITECTURE']: DEFINES['OC_X86_ASM'] = True if CONFIG['CPU_ARCH'] == 'x86_64': DEFINES['OC_X86_64_ASM'] = True - if CONFIG['CC_TYPE'] == 'clang-cl': - # clang-cl can't handle libtheora's inline asm. - pass - #SOURCES += [ - # 'lib/x86_vc/mmxfrag.c', - # 'lib/x86_vc/mmxidct.c', - # 'lib/x86_vc/mmxstate.c', - # 'lib/x86_vc/x86cpu.c', - # 'lib/x86_vc/x86state.c', - #] + if CONFIG['_MSC_VER']: + if CONFIG['CC_TYPE'] == 'clang-cl': + # clang-cl can't handle libtheora's inline asm. + pass + elif CONFIG['CPU_ARCH'] == 'x86_64': + SOURCES += [ + 'lib/x86_vc/mmxfrag.c', + 'lib/x86_vc/mmxidct.c', + 'lib/x86_vc/mmxstate.c', + 'lib/x86_vc/x86cpu.c', + 'lib/x86_vc/x86state.c', + ] else: SOURCES += [ 'lib/x86/mmxfrag.c', |