From 2ba50af7ae934310062dcf26df6ebd908c805d51 Mon Sep 17 00:00:00 2001 From: wgroeneveld Date: Tue, 14 Aug 2018 10:16:56 +0200 Subject: [PATCH] travis upd --- .travis.yml | 6 +++--- README.md | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 54c0c48..c3e0103 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ notifications: email: false env: - - GTEST_DIR=~/gtest + - GTEST_DIR=~/gtest/googletest-release-1.8.0 before_install: # Install a supported cmake version @@ -26,8 +26,8 @@ before_install: - mkdir build - ln -s libgtest_main.so build/libgtest_main.a - ln -s libgtest.so build/libgtest.a - - sudo cp -a include/gtest /usr/include - - sudo cp -a libgtest_main.so libgtest.so /usr/lib/ + #- sudo cp -a include/gtest /usr/include + #- sudo cp -a libgtest_main.so libgtest.so /usr/lib/ script: - cd $TRAVIS_BUILD_DIR diff --git a/README.md b/README.md index ed010ac..d4754b0 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,8 @@ A portion of [ToncLib](https://www.coranac.com/man/tonclib/main.htm) has been us BIOS methods and Sin/Cos lookup tables are also compiled. + + ### Implementing your own GBA Game #### Scenes @@ -192,7 +194,7 @@ The demos will be in `cmake-build-debug/demox/demoname.gba`. Things you might need to change in `CMakeLists.txt` files: 1. I'm assuming your GBA cross compiler is in your `$PATH`. If it's not, add an absolute path to `SET(CMAKE_C_COMPILER arm-none-eabi-gcc)` etc. -2. I'm assuming your Google Test Library is compiled and in your `$GTEST_DIR` path. If not, add an absolute path to: `SET(GTEST_LIBRARY "/Users/jefklak/CLionProjects/googletest-release-1.8.0/googletest")`. +2. I'm assuming your Google Test Library is compiled and in your `$GTEST_DIR` path. If not, add an absolute path to: `SET(GTEST_LIBRARY "/Users/jefklak/CLionProjects/googletest-release-1.8.0/googletest")`. The linker searches for 'ligbtest.a' and 'liggtest_main.a' - if you're on Linux it'll likely be a .so extension. #### Running unit tests