From f65bb70c830172526fa67bfbb9502802e1a9aa90 Mon Sep 17 00:00:00 2001
From: Thomas Edvalson <machin3@gmail.com>
Date: Sat, 15 Feb 2014 00:20:26 -0500
Subject: [PATCH] Fix some relative path stuff for travis build

---
 .travis.yml | 4 ++--
 Makefile    | 2 +-
 test/run.sh | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 64132f2..4ced32d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,8 @@ before_install:
  - sudo apt-get -qq update
  - sudo apt-get -qq install libgtest-dev g++-4.8
  - sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 90
- - git clone https://github.com/cpp3ds/universal-tween-engine-cpp.git tween
- - "cd tween && make test ; cd -"
+ - git clone https://github.com/cpp3ds/universal-tween-engine-cpp.git ../tween-engine
+ - "cd ../tween-engine && make test ; cd -"
  - "cd /usr/src/gtest && sudo cmake . && sudo cmake --build . && sudo mv libg* /usr/local/lib/ ; cd -"
 script: "make test && cd test && ./run.sh"
 notifications:
diff --git a/Makefile b/Makefile
index d362ea5..1a69a07 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ TEST_CXX = g++
 TEST_AR = ar
 TEST_CXXFLAGS = -g -Wall -pedantic -std=c++11 -fno-rtti -fno-exceptions -DTESTING
 
-INCLUDES = -Iinclude/
+INCLUDES = -Iinclude/ -I../tween-engine/include
 SOURCES = $(wildcard src/*.cpp) $(wildcard src/*/*.cpp) $(wildcard src/*.S)
 OBJECTS = $(SOURCES:src/%.cpp=build/%.o) $(SOURCES:src/%.S=build/%.o)
 
diff --git a/test/run.sh b/test/run.sh
index fdf18c3..4827143 100755
--- a/test/run.sh
+++ b/test/run.sh
@@ -1,5 +1,5 @@
 echo "Compiling unit tests..."
-g++ main.cpp -o test -L../lib -I../include -L../tween/lib -I../tween/include -std=c++11 -lgtest -lpthread -lcpp3ds -ltween -DTESTING
+g++ main.cpp -o test -L../lib -I../include -L../../tween-engine/lib -I../../tween-engine/include -std=c++11 -lgtest -lpthread -lcpp3ds -ltween -DTESTING
 echo "Running unit tests..."
 ./test -v
 result=$?