Move the code into a header file

This commit is contained in:
Jonas Granquist 2012-02-25 08:50:42 +01:00
parent 7832dd745c
commit e8cfd96ccf
2 changed files with 6 additions and 6 deletions

View File

@ -12,7 +12,7 @@
# Points to the root of Google Test, relative to where this file is.
# Remember to tweak this if you move this file.
GTEST_DIR = gtest
GTEST_DIR = ../../../googletest
# Where to find user code.
USER_DIR = .
@ -67,9 +67,9 @@ gtest_main.a : gtest-all.o gtest_main.o
# gtest_main.a, depending on whether it defines its own main()
# function.
GildedRose.o : $(USER_DIR)/GildedRose.cc \
$(GTEST_HEADERS)
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/GildedRose.cc
#GildedRose.o : $(USER_DIR)/GildedRose.h \
# $(GTEST_HEADERS)
# $(CXX) $(CPPFLAGS) $(CXXFLAGS) -c $(USER_DIR)/GildedRose.h
GildedRose : GildedRose.o gtest_main.a
$(CXX) $(CPPFLAGS) $(CXXFLAGS) -pthread $^ -o $@
GildedRose : GildedRose.h gtest_main.a
$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(USER_DIR)/GildedRose.h -pthread $^ -o $@