From 5e873aeefdc6f437502a963d5a15ba1f30712d44 Mon Sep 17 00:00:00 2001 From: Jonas Granquist Date: Sat, 25 Feb 2012 10:18:01 +0100 Subject: [PATCH] Changed back to original googletest path --- GildedRose/cpp/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/GildedRose/cpp/Makefile b/GildedRose/cpp/Makefile index d68fc1c6..5ebc68d9 100644 --- a/GildedRose/cpp/Makefile +++ b/GildedRose/cpp/Makefile @@ -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 = ../../../googletest +GTEST_DIR = gtest # Where to find user code. USER_DIR = . @@ -80,7 +80,7 @@ GildedRose : GildedRoseUnitTests.o GildedRose.o gtest_main.a $(CXX) $(CPPFLAGS) $(CXXFLAGS) -pthread $^ -o $@ GildedRoseTextTests.o : $(USER_DIR)/GildedRoseTextTests.cc - $(CXX) -c $(USER_DIR)/GildedRoseTextTests.cc + $(CXX) -c $^ GildedRoseTextTests : GildedRoseTextTests.o GildedRose.o $(CXX) -pthread $^ -o $@