gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes link errors due to an MS VC bug. By Vlad Losev.

Browse Source
This commit is contained in:
zhanyong.wan
2009-02-19 22:30:22 +00:00
parent 4a5330d3d6
commit 38ca64dd5f
9 changed files with 735 additions and 129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
make/Makefile
View File

@@ -89,15 +89,15 @@ gmock_main.a : gmock-all.o gtest-all.o gmock_main.o
# Builds a sample test.
gmock-sample.o : $(USER_DIR)/gmock-sample.cc $(USER_DIR)/gmock-sample.h \
$(GMOCK_HEADERS)
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/gmock-sample.cc
gmock_link_test.o : $(USER_DIR)/gmock_link_test.cc \
$(USER_DIR)/gmock-sample.h $(GMOCK_HEADERS)
$(USER_DIR)/gmock_link_test.h $(GMOCK_HEADERS)
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/gmock_link_test.cc
gmock_link_test : gmock-sample.o gmock_link_test.o gmock_main.a
gmock_link2_test.o : $(USER_DIR)/gmock_link2_test.cc \
$(USER_DIR)/gmock_link_test.h $(GMOCK_HEADERS)
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/gmock_link2_test.cc
gmock_link_test : gmock_link_test.o gmock_link2_test.o gmock_main.a
$(CXX) $(CPPFLAGS) $(CXXFLAGS) $^ -o $@
# Builds another sample test.