Merge pull request #2 from balp/master

-lphread changed into -phread for linking the cpp code
This commit is contained in:
Emily Bache 2012-01-20 06:48:08 -08:00
commit 53235864ec

View File

@ -72,4 +72,4 @@ GildedRose.o : $(USER_DIR)/GildedRose.cc \
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/GildedRose.cc $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/GildedRose.cc
GildedRose : GildedRose.o gtest_main.a GildedRose : GildedRose.o gtest_main.a
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -lpthread $^ -o $@ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -pthread $^ -o $@