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

Changed back to original googletest path

Browse Source
This commit is contained in:
Jonas Granquist 2012-02-25 10:18:01 +01:00
parent 072c37dd89
commit 5e873aeefd
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
GildedRose/cpp/Makefile
View File

@ -12,7 +12,7 @@
# Points to the root of Google Test, relative to where this file is. # Points to the root of Google Test, relative to where this file is.
# Remember to tweak this if you move this file. # Remember to tweak this if you move this file.
GTEST_DIR = ../../../googletest GTEST_DIR = gtest
# Where to find user code. # Where to find user code.
USER_DIR = . USER_DIR = .
@ -80,7 +80,7 @@ GildedRose : GildedRoseUnitTests.o GildedRose.o 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
$(CXX) -c $(USER_DIR)/GildedRoseTextTests.cc $(CXX) -c $^
GildedRoseTextTests : GildedRoseTextTests.o GildedRose.o GildedRoseTextTests : GildedRoseTextTests.o GildedRose.o
$(CXX) -pthread $^ -o $@ $(CXX) -pthread $^ -o $@