Move BUILD_LIBVPX evaluation before the include.
Unified · Split
| @@ -20,6 +20,13 @@ endif · 19 unmodified lines | |||
| 20 | CODEC_SRCS-yes += CHANGELOG | 20 | CODEC_SRCS-yes += CHANGELOG |
| 21 | CODEC_SRCS-yes += libs.mk | 21 | CODEC_SRCS-yes += libs.mk |
| 22 | 22 | ||
| 23 | # If this is a universal (fat) binary, then all the subarchitectures have | ||
| 24 | # already been built and our job is to stitch them together. The | ||
| 25 | # BUILD_LIBVPX variable indicates whether we should be building | ||
| 26 | # (compiling, linking) the library. The LIPO_LIBVPX variable indicates | ||
| 27 | # that we're stitching. | ||
| 28 | $(eval $(if $(filter universal%,$(TOOLCHAIN)),LIPO_LIBVPX,BUILD_LIBVPX):=yes) | ||
| 29 | |||
| 23 | include $(SRC_PATH_BARE)/vpx/vpx_codec.mk | 30 | include $(SRC_PATH_BARE)/vpx/vpx_codec.mk |
| 24 | CODEC_SRCS-yes += $(addprefix vpx/,$(call enabled,API_SRCS)) | 31 | CODEC_SRCS-yes += $(addprefix vpx/,$(call enabled,API_SRCS)) |
| 25 | 32 | ||
| @@ -29,6 +36,9 @@ CODEC_SRCS-yes += $(addprefix vpx_mem/,$(call enabled,MEM_SRCS)) · 3 unmodified lines | |||
| 29 | include $(SRC_PATH_BARE)/vpx_scale/vpx_scale.mk | 36 | include $(SRC_PATH_BARE)/vpx_scale/vpx_scale.mk |
| 30 | CODEC_SRCS-yes += $(addprefix vpx_scale/,$(call enabled,SCALE_SRCS)) | 37 | CODEC_SRCS-yes += $(addprefix vpx_scale/,$(call enabled,SCALE_SRCS)) |
| 31 | 38 | ||
| 39 | include $(SRC_PATH_BARE)/vpx_ports/vpx_ports.mk | ||
| 40 | CODEC_SRCS-yes += $(addprefix vpx_ports/,$(call enabled,PORTS_SRCS)) | ||
| 41 | |||
| 32 | 42 | ||
| 33 | ifeq ($(CONFIG_VP8_ENCODER),yes) | 43 | ifeq ($(CONFIG_VP8_ENCODER),yes) |
| 34 | VP8_PREFIX=vp8/ | 44 | VP8_PREFIX=vp8/ |
| @@ -83,29 +93,11 @@ INSTALL_MAPS += $(foreach p,$(VS_PLATFORMS),$(LIBSUBDIR)/$(p)/% $(p)/Release/%) · 48 unmodified lines | |||
| 83 | INSTALL_MAPS += $(foreach p,$(VS_PLATFORMS),$(LIBSUBDIR)/$(p)/% $(p)/Debug/%) | 93 | INSTALL_MAPS += $(foreach p,$(VS_PLATFORMS),$(LIBSUBDIR)/$(p)/% $(p)/Debug/%) |
| 84 | endif | 94 | endif |
| 85 | 95 | ||
| 86 | # If this is a universal (fat) binary, then all the subarchitectures have | ||
| 87 | # already been built and our job is to stitch them together. The | ||
| 88 | # BUILD_LIBVPX variable indicates whether we should be building | ||
| 89 | # (compiling, linking) the library. The LIPO_LIBVPX variable indicates | ||
| 90 | # that we're stitching. | ||
| 91 | $(eval $(if $(filter universal%,$(TOOLCHAIN)),LIPO_LIBVPX,BUILD_LIBVPX):=yes) | ||
| 92 | |||
| 93 | CODEC_SRCS-$(BUILD_LIBVPX) += build/make/version.sh | 96 | CODEC_SRCS-$(BUILD_LIBVPX) += build/make/version.sh |
| 94 | CODEC_SRCS-$(BUILD_LIBVPX) += build/make/rtcd.sh | 97 | CODEC_SRCS-$(BUILD_LIBVPX) += build/make/rtcd.sh |
| 95 | CODEC_SRCS-$(BUILD_LIBVPX) += vpx/vpx_integer.h | 98 | CODEC_SRCS-$(BUILD_LIBVPX) += vpx/vpx_integer.h |
| 96 | CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/asm_offsets.h | ||
| 97 | CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/vpx_timer.h | ||
| 98 | CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/mem.h | ||
| 99 | CODEC_SRCS-$(BUILD_LIBVPX) += $(BUILD_PFX)vpx_config.c | 99 | CODEC_SRCS-$(BUILD_LIBVPX) += $(BUILD_PFX)vpx_config.c |
| 100 | INSTALL-SRCS-no += $(BUILD_PFX)vpx_config.c | 100 | INSTALL-SRCS-no += $(BUILD_PFX)vpx_config.c |
| 101 | ifeq ($(ARCH_X86)$(ARCH_X86_64),yes) | ||
| 102 | CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/emms.asm | ||
| 103 | CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/x86.h | ||
| 104 | CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/x86_abi_support.asm | ||
| 105 | CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/x86_cpuid.c | ||
| 106 | endif | ||
| 107 | CODEC_SRCS-$(ARCH_ARM) += vpx_ports/arm_cpudetect.c | ||
| 108 | CODEC_SRCS-$(ARCH_ARM) += vpx_ports/arm.h | ||
| 109 | CODEC_EXPORTS-$(BUILD_LIBVPX) += vpx/exports_com | 101 | CODEC_EXPORTS-$(BUILD_LIBVPX) += vpx/exports_com |
| 110 | CODEC_EXPORTS-$(CONFIG_ENCODERS) += vpx/exports_enc | 102 | CODEC_EXPORTS-$(CONFIG_ENCODERS) += vpx/exports_enc |
| 111 | CODEC_EXPORTS-$(CONFIG_DECODERS) += vpx/exports_dec | 103 | CODEC_EXPORTS-$(CONFIG_DECODERS) += vpx/exports_dec |
| @@ -0,0 +1,26 @@ | |||
| 1 | ## | ||
| 2 | ## Copyright (c) 2012 The WebM project authors. All Rights Reserved. | ||
| 3 | ## | ||
| 4 | ## Use of this source code is governed by a BSD-style license | ||
| 5 | ## that can be found in the LICENSE file in the root of the source | ||
| 6 | ## tree. An additional intellectual property rights grant can be found | ||
| 7 | ## in the file PATENTS. All contributing project authors may | ||
| 8 | ## be found in the AUTHORS file in the root of the source tree. | ||
| 9 | ## | ||
| 10 | |||
| 11 | |||
| 12 | PORTS_SRCS-yes += vpx_ports.mk | ||
| 13 | |||
| 14 | PORTS_SRCS-$(BUILD_LIBVPX) += asm_offsets.h | ||
| 15 | PORTS_SRCS-$(BUILD_LIBVPX) += mem.h | ||
| 16 | PORTS_SRCS-$(BUILD_LIBVPX) += vpx_timer.h | ||
| 17 | |||
| 18 | ifeq ($(ARCH_X86)$(ARCH_X86_64),yes) | ||
| 19 | PORTS_SRCS-$(BUILD_LIBVPX) += emms.asm | ||
| 20 | PORTS_SRCS-$(BUILD_LIBVPX) += x86.h | ||
| 21 | PORTS_SRCS-$(BUILD_LIBVPX) += x86_abi_support.asm | ||
| 22 | PORTS_SRCS-$(BUILD_LIBVPX) += x86_cpuid.c | ||
| 23 | endif | ||
| 24 | |||
| 25 | PORTS_SRCS-$(ARCH_ARM) += arm_cpudetect.c | ||
| 26 | PORTS_SRCS-$(ARCH_ARM) += arm.h | ||