Merge remote-tracking branch 'origin/master' into view_dev_cards

Author: malecki1

.travis.yml

@@ -2,5 +2,7 @@ language: cpp
 before_install: 
  - sudo add-apt-repository ppa:antumdeluge/sdl2 -y
  - sudo apt-get update -y
+ - sudo apt-get install libgtest-dev
+ - cd /usr/src/gtest && sudo cmake . && sudo make && sudo mv libg* /usr/lib/ && cd $TRAVIS_BUILD_DIR
  - sudo apt-get install libsdl2 libsdl2-dev libsdl2-ttf libsdl2-ttf-dev -y
-script: make tests
+script: make tests

Makefile

@@ -1,8 +1,8 @@
 export OBJ_HOME := $(realpath obj)
 export SRC_HOME := $(realpath src)
 export INCL_HOME := $(realpath include)
-export TEST_LINK_FILES := $(realpath UnitTest++)/libUnitTest++.a
-export TEST_INCLUDE := $(realpath UnitTest++/src)
+export TEST_LINK_FILES := -lgtest -lgtest_main
+export TEST_INCLUDE := 
 export EXECUTABLE := warsofcatan
 ALLFILES := $(wildcard $(SRC_HOME)/*) $(wildcard $(INCL_HOME)/*)
 export CXX := g++
@@ -19,7 +19,6 @@ $(EXECUTABLE): $(ALLFILES)
 
 .PHONY: tests
 tests: $(EXECUTABLE)
-	cd UnitTest++ && $(MAKE) libUnitTest++.a
 	cd tests && $(MAKE)
 
 .PHONY: clean