diff options
| author | John Koleszar <jkoleszar@google.com> | 2011-08-03 13:44:32 -0700 |
|---|---|---|
| committer | Code Review <code-review@webmproject.org> | 2011-08-03 13:44:32 -0700 |
| commit | a49b9e00145e3345f96d89a2e369bdd29e3b1616 (patch) | |
| tree | 426b0685b2493b11631be21306de2d67e9ec3c9d | |
| parent | 238dae8604af11c484bdd8a9f5f17a07f29b4469 (diff) | |
| parent | 06f58c0df7f0f05d6cf8e3e4715f8c4111424640 (diff) | |
| download | libvpx-a49b9e00145e3345f96d89a2e369bdd29e3b1616.tar libvpx-a49b9e00145e3345f96d89a2e369bdd29e3b1616.tar.gz libvpx-a49b9e00145e3345f96d89a2e369bdd29e3b1616.tar.bz2 libvpx-a49b9e00145e3345f96d89a2e369bdd29e3b1616.zip | |
Merge changes I585167e1,Ia07602bd into cayuga
* changes:
Fix building of static libs on universal-darwin
Fix asm offsets generation for universal-darwin builds
| -rw-r--r-- | libs.mk | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -180,7 +180,7 @@ endif else LIBVPX_OBJS=$(call objs,$(CODEC_SRCS)) OBJS-$(BUILD_LIBVPX) += $(LIBVPX_OBJS) -LIBS-$(CONFIG_STATIC) += $(BUILD_PFX)libvpx.a $(BUILD_PFX)libvpx_g.a +LIBS-$(if $(BUILD_LIBVPX),$(CONFIG_STATIC)) += $(BUILD_PFX)libvpx.a $(BUILD_PFX)libvpx_g.a $(BUILD_PFX)libvpx_g.a: $(LIBVPX_OBJS) BUILD_LIBVPX_SO := $(if $(BUILD_LIBVPX),$(CONFIG_SHARED)) @@ -272,20 +272,20 @@ $(filter %$(ASM).o,$(OBJS-yes)): $(BUILD_PFX)vpx_config.asm # ifeq ($(filter icc gcc,$(TGT_CC)), $(TGT_CC)) - asm_com_offsets.asm: $(VP8_PREFIX)common/asm_com_offsets.c.S + $(BUILD_PFX)asm_com_offsets.asm: $(BUILD_PFX)$(VP8_PREFIX)common/asm_com_offsets.c.S grep EQU $< | tr -d '$$\#' $(ADS2GAS) > $@ - $(VP8_PREFIX)common/asm_com_offsets.c.S: vp8/common/asm_com_offsets.c - CLEAN-OBJS += asm_com_offsets.asm $(VP8_PREFIX)common/asm_com_offsets.c.S + $(BUILD_PFX)$(VP8_PREFIX)common/asm_com_offsets.c.S: $(VP8_PREFIX)common/asm_com_offsets.c + CLEAN-OBJS += $(BUILD_PFX)asm_com_offsets.asm $(BUILD_PFX)$(VP8_PREFIX)common/asm_com_offsets.c.S - asm_enc_offsets.asm: $(VP8_PREFIX)encoder/asm_enc_offsets.c.S + $(BUILD_PFX)asm_enc_offsets.asm: $(BUILD_PFX)$(VP8_PREFIX)encoder/asm_enc_offsets.c.S grep EQU $< | tr -d '$$\#' $(ADS2GAS) > $@ - $(VP8_PREFIX)encoder/asm_enc_offsets.c.S: vp8/encoder/asm_enc_offsets.c - CLEAN-OBJS += asm_enc_offsets.asm $(VP8_PREFIX)encoder/asm_enc_offsets.c.S + $(BUILD_PFX)$(VP8_PREFIX)encoder/asm_enc_offsets.c.S: $(VP8_PREFIX)encoder/asm_enc_offsets.c + CLEAN-OBJS += $(BUILD_PFX)asm_enc_offsets.asm $(BUILD_PFX)$(VP8_PREFIX)encoder/asm_enc_offsets.c.S - asm_dec_offsets.asm: $(VP8_PREFIX)decoder/asm_dec_offsets.c.S + $(BUILD_PFX)asm_dec_offsets.asm: $(BUILD_PFX)$(VP8_PREFIX)decoder/asm_dec_offsets.c.S grep EQU $< | tr -d '$$\#' $(ADS2GAS) > $@ - $(VP8_PREFIX)decoder/asm_dec_offsets.c.S: vp8/decoder/asm_dec_offsets.c - CLEAN-OBJS += asm_dec_offsets.asm $(VP8_PREFIX)decoder/asm_dec_offsets.c.S + $(BUILD_PFX)$(VP8_PREFIX)decoder/asm_dec_offsets.c.S: $(VP8_PREFIX)decoder/asm_dec_offsets.c + CLEAN-OBJS += $(BUILD_PFX)asm_dec_offsets.asm $(BUILD_PFX)$(VP8_PREFIX)decoder/asm_dec_offsets.c.S else ifeq ($(filter rvct,$(TGT_CC)), $(TGT_CC)) asm_com_offsets.asm: obj_int_extract |