source/libvpx/libs.mk - Issue 17451020: libvpx: Pull from upstream

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: source/libvpx/libs.mk

Issue 17451020: libvpx: Pull from upstream (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/libvpx/

Patch Set: Created 7 years, 6 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: source/libvpx/libs.mk

===================================================================

--- source/libvpx/libs.mk (revision 207479)

+++ source/libvpx/libs.mk (working copy)

@@ -442,6 +442,7 @@

include $(SRC_PATH_BARE)/third_party/googletest/gtest.mk

GTEST_SRCS := $(addprefix third_party/googletest/src/,$(call enabled,GTEST_SRCS))

GTEST_OBJS=$(call objs,$(GTEST_SRCS))

+$(GTEST_OBJS) $(GTEST_OBJS:.o=.d): CXXFLAGS += -DGTEST_HAS_PTHREAD=0

$(GTEST_OBJS) $(GTEST_OBJS:.o=.d): CXXFLAGS += -I$(SRC_PATH_BARE)/third_party/googletest/src

$(GTEST_OBJS) $(GTEST_OBJS:.o=.d): CXXFLAGS += -I$(SRC_PATH_BARE)/third_party/googletest/src/include

OBJS-$(BUILD_LIBVPX) += $(GTEST_OBJS)

@@ -466,7 +467,7 @@

lib$(CODEC_LIB)$(CODEC_LIB_SUF) libgtest.a ))\

$(if $(BUILD_LIBVPX),$(eval $(call linkerxx_template,$(bin),\

$(LIBVPX_TEST_OBJS) \

- -L. -lvpx -lgtest -lpthread -lm)\

+ -L. -lvpx -lgtest $(extralibs) -lm)\

)))\

$(if $(LIPO_LIBS),$(eval $(call lipo_bin_template,$(bin))))\

« no previous file with comments | « source/libvpx/configure ('k') | source/libvpx/test/clear_system_state.h » ('j') | no next file with comments »