Merge remote-tracking branch 'origin/quacking' into master

BUG=webm:1686

Jerome Jiang committed 6 years ago

Commit a3fc0272 parents b358f90 6516e974 files · +31 −2Browse files

Showing the changes to libs.mk (1 of 4 files). Show all

Unified · Split

@@ -282,7 +282,7 @@ LIBS-$(if yes,$(CONFIG_STATIC)) += $(BUILD_PFX)libvpx.a $(BUILD_PFX)libvpx_g.a · 281 unmodified lines
282	$(BUILD_PFX)libvpx_g.a: $(LIBVPX_OBJS)	282	$(BUILD_PFX)libvpx_g.a: $(LIBVPX_OBJS)
283		283
284	SO_VERSION_MAJOR := 6	284	SO_VERSION_MAJOR := 6
285	SO_VERSION_MINOR := 2	285	SO_VERSION_MINOR := 3
286	SO_VERSION_PATCH := 0	286	SO_VERSION_PATCH := 0
287	ifeq ($(filter darwin%,$(TGT_OS)),$(TGT_OS))	287	ifeq ($(filter darwin%,$(TGT_OS)),$(TGT_OS))
288	LIBVPX_SO := libvpx.$(SO_VERSION_MAJOR).dylib	288	LIBVPX_SO := libvpx.$(SO_VERSION_MAJOR).dylib

Keyboard shortcuts