OpenSource/GildedRose-Refactoring-Kata
1
0
Fork 0
mirror of https://github.com/emilybache/GildedRose-Refactoring-Kata.git synced 2025-12-12 04:12:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

With Google Test 1.8.0, I seem to need both libs.

Browse Source
This commit is contained in:
Amitai Schleier 2018-08-14 00:22:38 +01:00
parent 97ec616334
commit 6599767748
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cpp/Makefile
View File

@ -65,9 +65,8 @@ gtest.a : gtest-all.o
gtest_main.a : gtest-all.o gtest_main.o gtest_main.a : gtest-all.o gtest_main.o
$(AR) $(ARFLAGS) $@ $^ $(AR) $(ARFLAGS) $@ $^
# Builds a sample test. A test should link with either gtest.a or # Builds a sample test. A test should link with gtest.a, and also
# gtest_main.a, depending on whether it defines its own main() # gtest_main.a if it doesn't define its own main() function.
# function.
GildedRose.o : $(USER_DIR)/GildedRose.cc GildedRose.o : $(USER_DIR)/GildedRose.cc
$(CXX) -c $^ $(CXX) -c $^
@ -76,7 +75,7 @@ GildedRoseUnitTests.o : $(USER_DIR)/GildedRoseUnitTests.cc \
$(GTEST_HEADERS) $(GTEST_HEADERS)
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/GildedRoseUnitTests.cc $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/GildedRoseUnitTests.cc
GildedRose : GildedRoseUnitTests.o GildedRose.o gtest_main.a GildedRose : GildedRoseUnitTests.o GildedRose.o gtest.a gtest_main.a
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -pthread $^ -o $@ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -pthread $^ -o $@
GildedRoseTextTests.o : $(USER_DIR)/GildedRoseTextTests.cc GildedRoseTextTests.o : $(USER_DIR)/GildedRoseTextTests.cc