Merge branch 'master' of https://github.com/Databean/warsofcatan into settlements_and_cities

Author: apolitakis

.travis.yml

@@ -0,0 +1,6 @@
+language: cpp
+before_install: 
+ - sudo add-apt-repository ppa:antumdeluge/sdl2 -y
+ - sudo apt-get update -y
+ - sudo apt-get install libsdl2 libsdl2-dev -y
+script: make tests

Makefile

@@ -1,14 +1,14 @@
 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_LINK_FILES := $(realpath UnitTest++)/libUnitTest++.a
 export TEST_INCLUDE := $(realpath UnitTest++/src)
 export EXECUTABLE := warsofcatan
 ALLFILES := $(wildcard $(SRC_HOME)/*) $(wildcard $(INCL_HOME)/*)
 export CXX := g++
 export LD := g++
 export CXXFLAGS := -g -I$(INCL_HOME) -std=c++0x -Wall
-export LDFLAGS := -lSDL2 -lGL -lGLU
+export LDFLAGS := -L/usr/local/lib -lSDL2 -lGL -lGLU
 
 .PHONY: all
 all: $(EXECUTABLE)