diff options
| author | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-02-19 22:30:22 +0000 |
|---|---|---|
| committer | zhanyong.wan <zhanyong.wan@8415998a-534a-0410-bf83-d39667b30386> | 2009-02-19 22:30:22 +0000 |
| commit | 38ca64dd5f8dd4a5ee1822d805f16911213f18fb (patch) | |
| tree | b1d01ee93e3f13594d87292640af07719a954692 /make | |
| parent | 4a5330d3d6e582248dbcf602f70048dc72cc8182 (diff) | |
| download | googletest-38ca64dd5f8dd4a5ee1822d805f16911213f18fb.tar.gz googletest-38ca64dd5f8dd4a5ee1822d805f16911213f18fb.tar.bz2 googletest-38ca64dd5f8dd4a5ee1822d805f16911213f18fb.zip | |
Fixes link errors due to an MS VC bug. By Vlad Losev.
Diffstat (limited to 'make')
| -rw-r--r-- | make/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/make/Makefile b/make/Makefile index 557eb1e1..85c8b38b 100644 --- a/make/Makefile +++ b/make/Makefile @@ -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. |