encounter/cpp3ds
0
0
Fork 0
mirror of https://github.com/encounter/cpp3ds.git synced 2026-03-30 11:04:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

Fix some relative path stuff for travis build

Browse Source
This commit is contained in:
Thomas Edvalson
2014-02-15 00:20:26 -05:00
parent bcafc3de14
commit f65bb70c83
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis.yml
+2 -2
View File
@@ -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:
Makefile
+1 -1
View File
@@ -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)
test/run.sh
+1 -1
View File
@@ -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=$?