wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 875013 - Remove VPATH in media/libvpx; r=joey

Browse Source
This commit is contained in:
Mike Shal 2014-01-09 14:43:29 -05:00
parent b835ce2f8a
commit 4502a19cf7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
media/libvpx/Makefile.in
View File

@ -15,11 +15,6 @@ ifdef VPX_ARM_ASM
ifeq ($(OS_TARGET),Android)
# For cpu-features.h
LOCAL_INCLUDES += -I$(ANDROID_NDK)/sources/android/cpufeatures
ifndef MOZ_WEBRTC
# For cpu-features.c
VPATH += $(ANDROID_NDK)/sources/android/cpufeatures
CSRCS += cpu-features.c
endif
endif
ASM_OFFSETS = vpx_scale_asm_offsets.asm vp8_asm_enc_offsets.asm

5
media/libvpx/moz.build
View File

@ -82,3 +82,8 @@ if CONFIG['OS_TARGET'] == 'Android':
# Older versions of the Android NDK don't pre-define anything to indicate
# the OS they're on, so do it for them.
DEFINES['__linux__'] = True
if not CONFIG['MOZ_WEBRTC']:
SOURCES += [
'%s/sources/android/cpufeatures/cpu-features.c' % CONFIG['ANDROID_NDK'],
]