Altered Makefiles to get Paul's tests to run

Author: Databean

.gitignore

@@ -18,3 +18,4 @@ warsofcatan
 *.d
 *.test
 /Default
+*.wocs

Makefile

@@ -3,7 +3,7 @@ export SRC_HOME := $(realpath src)
 export INCL_HOME := $(realpath include)
 export TEST_LINK_FILES := $(realpath UnitTest++/libUnitTest++.a)
 export TEST_INCLUDE := $(realpath UnitTest++/src)
-EXECUTABLE := warsofcatan
+export EXECUTABLE := warsofcatan
 ALLFILES := $(wildcard $(SRC_HOME)/*) $(wildcard $(INCL_HOME)/*)
 export CXX := g++
 export LD := g++

tests/Makefile

@@ -1,11 +1,14 @@
 TEST_FILE := main.test
 
+OBJECTS := $(wildcard $(OBJ_HOME)/*.o)
+OBJECTS_NO_MAIN := $(subst $(OBJ_HOME)/main.o,,$(OBJECTS))
+
 .PHONY: run
 run: $(TEST_FILE)
 	./$(TEST_FILE)
 
-$(TEST_FILE): ../$(LIBRARY) $(TEST_LINK_FILES)
-	$(CXX) $(CXXFLAGS) -I$(TEST_INCLUDE) $(wildcard *.cpp) -o $@ $(TEST_LINK_FILES)
+$(TEST_FILE): ../$(EXECUTABLE) $(TEST_LINK_FILES)
+	$(CXX) $(CXXFLAGS) -I$(TEST_INCLUDE) $(wildcard *.cpp) -o $@ $(TEST_LINK_FILES) $(OBJECTS_NO_MAIN) $(LDFLAGS)
 
 .PHONY: clean
 clean: