mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 930256 - Consolidate theora build files. r=derf,ted
Less recursion is faster and easier to edit, despite having to prefix filenames. Stop exporting theora.h. We prefer new code use the 1.0 api.
This commit is contained in:
Ralph Giles
parent
005f71fd1e
commit
29db6e50a6
@ -16,11 +16,11 @@ armloop-gnu.$(ASM_SUFFIX): armopts-gnu.S
|
||||
|
||||
# armopts needs a specific rule, because arm2gnu.pl will always add the .S
|
||||
# suffix when translating the files that include it.
|
||||
armopts-gnu.S: arm/armopts.s
|
||||
$(PERL) $(srcdir)/arm/arm2gnu.pl < $< > $@
|
||||
armopts-gnu.S: lib/arm/armopts.s
|
||||
$(PERL) $(srcdir)/lib/arm/arm2gnu.pl < $< > $@
|
||||
# For all others, we can use an implicit rule with the configured $(ASM_SUFFIX).
|
||||
%-gnu.$(ASM_SUFFIX): arm/%.s
|
||||
$(PERL) $(srcdir)/arm/arm2gnu.pl < $< > $@
|
||||
%-gnu.$(ASM_SUFFIX): lib/arm/%.s
|
||||
$(PERL) $(srcdir)/lib/arm/arm2gnu.pl < $< > $@
|
||||
|
||||
endif
|
||||
endif
|
||||
@ -1,8 +0,0 @@
|
||||
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
DIRS += ['theora']
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
EXPORTS.theora += [
|
||||
'codec.h',
|
||||
'theora.h',
|
||||
'theoradec.h',
|
||||
'theoraenc.h',
|
||||
]
|
||||
|
||||
@ -1,84 +0,0 @@
|
||||
# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
|
||||
# vim: set filetype=python:
|
||||
# This Source Code Form is subject to the terms of the Mozilla Public
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
UNIFIED_SOURCES += [
|
||||
'apiwrapper.c',
|
||||
'bitpack.c',
|
||||
'decapiwrapper.c',
|
||||
'decinfo.c',
|
||||
'decode.c',
|
||||
'dequant.c',
|
||||
'fragment.c',
|
||||
'huffdec.c',
|
||||
'idct.c',
|
||||
'info.c',
|
||||
'internal.c',
|
||||
'quant.c',
|
||||
'state.c',
|
||||
]
|
||||
|
||||
if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_AS']:
|
||||
GENERATED_SOURCES += [ '%s.%s' % (f, CONFIG['ASM_SUFFIX']) for f in [
|
||||
'armbits-gnu',
|
||||
'armfrag-gnu',
|
||||
'armidct-gnu',
|
||||
'armloop-gnu',
|
||||
]]
|
||||
|
||||
if '86' in CONFIG['OS_TEST']:
|
||||
if CONFIG['OS_ARCH'] != 'SunOS':
|
||||
if CONFIG['OS_ARCH'] != 'WINNT' or CONFIG['OS_TEST'] != 'x86_64':
|
||||
DEFINES['OC_X86_ASM'] = True
|
||||
if '64' in CONFIG['OS_TEST']:
|
||||
DEFINES['OC_X86_64_ASM'] = True
|
||||
if CONFIG['_MSC_VER']:
|
||||
if '64' not in CONFIG['OS_TEST']:
|
||||
SOURCES += [
|
||||
'x86_vc/mmxfrag.c',
|
||||
'x86_vc/mmxidct.c',
|
||||
'x86_vc/mmxstate.c',
|
||||
'x86_vc/x86cpu.c',
|
||||
'x86_vc/x86state.c',
|
||||
]
|
||||
else:
|
||||
SOURCES += [
|
||||
'x86/mmxfrag.c',
|
||||
'x86/mmxidct.c',
|
||||
'x86/mmxstate.c',
|
||||
'x86/sse2idct.c',
|
||||
'x86/x86cpu.c',
|
||||
'x86/x86state.c',
|
||||
]
|
||||
|
||||
if CONFIG['GNU_AS']:
|
||||
if 'arm' in CONFIG['OS_TEST']:
|
||||
SOURCES += [
|
||||
'arm/armcpu.c',
|
||||
'arm/armstate.c',
|
||||
]
|
||||
for var in ('OC_ARM_ASM', 'OC_ARM_ASM_EDSP', 'OC_ARM_ASM_MEDIA',
|
||||
'OC_ARM_ASM_NEON'):
|
||||
DEFINES[var] = True
|
||||
# The Android NDK doesn't pre-define anything to indicate the OS it's
|
||||
# on, so do it for them.
|
||||
if CONFIG['OS_TARGET'] == 'Android':
|
||||
DEFINES['__linux__'] = True
|
||||
|
||||
MSVC_ENABLE_PGO = True
|
||||
|
||||
if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
|
||||
NO_VISIBILITY_FLAGS = True
|
||||
|
||||
FINAL_LIBRARY = 'gkmedias'
|
||||
|
||||
# The encoder is currently not included.
|
||||
DEFINES['THEORA_DISABLE_ENCODE'] = True
|
||||
|
||||
# Suppress warnings in third-party code.
|
||||
if CONFIG['GNU_CC']:
|
||||
CFLAGS += ['-Wno-type-limits']
|
||||
if CONFIG['CLANG_CXX']:
|
||||
CFLAGS += ['-Wno-tautological-compare']
|
||||
@ -4,5 +4,92 @@
|
||||
# License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
||||
|
||||
DIRS += ['include', 'lib']
|
||||
EXPORTS.theora += [
|
||||
'include/theora/codec.h',
|
||||
'include/theora/theoradec.h',
|
||||
'include/theora/theoraenc.h',
|
||||
]
|
||||
|
||||
MSVC_ENABLE_PGO = True
|
||||
|
||||
FINAL_LIBRARY = 'gkmedias'
|
||||
|
||||
if CONFIG['GKMEDIAS_SHARED_LIBRARY']:
|
||||
NO_VISIBILITY_FLAGS = True
|
||||
|
||||
# The encoder is currently not included.
|
||||
DEFINES['THEORA_DISABLE_ENCODE'] = True
|
||||
|
||||
# Suppress warnings in third-party code.
|
||||
if CONFIG['GNU_CC']:
|
||||
CFLAGS += ['-Wno-type-limits']
|
||||
if CONFIG['CLANG_CXX']:
|
||||
CFLAGS += ['-Wno-tautological-compare']
|
||||
|
||||
UNIFIED_SOURCES += [
|
||||
'lib/apiwrapper.c',
|
||||
'lib/bitpack.c',
|
||||
'lib/decapiwrapper.c',
|
||||
'lib/decinfo.c',
|
||||
'lib/decode.c',
|
||||
'lib/dequant.c',
|
||||
'lib/fragment.c',
|
||||
'lib/huffdec.c',
|
||||
'lib/idct.c',
|
||||
'lib/info.c',
|
||||
'lib/internal.c',
|
||||
'lib/quant.c',
|
||||
'lib/state.c',
|
||||
]
|
||||
|
||||
LOCAL_INCLUDES += ['include']
|
||||
|
||||
if CONFIG['CPU_ARCH'] == 'arm' and CONFIG['GNU_AS']:
|
||||
GENERATED_SOURCES += [ '%s.%s' % (f, CONFIG['ASM_SUFFIX']) for f in [
|
||||
'armbits-gnu',
|
||||
'armfrag-gnu',
|
||||
'armidct-gnu',
|
||||
'armloop-gnu',
|
||||
]]
|
||||
|
||||
if '86' in CONFIG['OS_TEST']:
|
||||
if CONFIG['OS_ARCH'] != 'SunOS':
|
||||
if CONFIG['OS_ARCH'] != 'WINNT' or CONFIG['OS_TEST'] != 'x86_64':
|
||||
DEFINES['OC_X86_ASM'] = True
|
||||
if '64' in CONFIG['OS_TEST']:
|
||||
DEFINES['OC_X86_64_ASM'] = True
|
||||
if CONFIG['_MSC_VER']:
|
||||
if '64' not in CONFIG['OS_TEST']:
|
||||
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',
|
||||
'lib/x86/mmxidct.c',
|
||||
'lib/x86/mmxstate.c',
|
||||
'lib/x86/sse2idct.c',
|
||||
'lib/x86/x86cpu.c',
|
||||
'lib/x86/x86state.c',
|
||||
]
|
||||
|
||||
if CONFIG['GNU_AS']:
|
||||
if 'arm' in CONFIG['OS_TEST']:
|
||||
SOURCES += [
|
||||
'lib/arm/armcpu.c',
|
||||
'lib/arm/armstate.c',
|
||||
]
|
||||
for var in ('OC_ARM_ASM',
|
||||
'OC_ARM_ASM_EDSP',
|
||||
'OC_ARM_ASM_MEDIA',
|
||||
'OC_ARM_ASM_NEON'):
|
||||
DEFINES[var] = True
|
||||
# The Android NDK doesn't pre-define anything to indicate the OS it's
|
||||
# on, so do it for them.
|
||||
if CONFIG['OS_TARGET'] == 'Android':
|
||||
DEFINES['__linux__'] = True
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user