aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYann Herklotz <ymherklotz@gmail.com>2017-09-09 11:08:08 +0100
committerYann Herklotz <ymherklotz@gmail.com>2017-09-09 11:08:08 +0100
commita1795180fd74607e4f572b2bfa8743f8167f4fa1 (patch)
treee2c4b7902fead0a777fff9d5e8db90d833871fee
parent14b4fdd958c4df7e2cb72a88c30f6d250ed43a67 (diff)
downloadYAGE-a1795180fd74607e4f572b2bfa8743f8167f4fa1.tar.gz
YAGE-a1795180fd74607e4f572b2bfa8743f8167f4fa1.zip
Removing unnecessary libraries
-rw-r--r--.dir-locals.el12
-rw-r--r--.travis.yml6
m---------lib/SDL20
m---------lib/glew0
4 files changed, 5 insertions, 13 deletions
diff --git a/.dir-locals.el b/.dir-locals.el
index 48a041b2..f39d59fe 100644
--- a/.dir-locals.el
+++ b/.dir-locals.el
@@ -2,25 +2,19 @@
(require 'projectile)
(setq company-clang-arguments (delete-dups (append
company-clang-arguments
- (list (concat "-I" (projectile-project-root) "include")))))
+ (list (concat "-I" (projectile-project-root) "yage")))))
(setq company-clang-arguments (delete-dups (append
company-clang-arguments
(list (concat "-I" (projectile-project-root) "lib/googletest/googletest/include")))))
(setq company-clang-arguments (delete-dups (append
company-clang-arguments
(list (concat "-I" (projectile-project-root) "lib/rapidjson/include")))))
- (setq company-clang-arguments (delete-dups (append
- company-clang-arguments
- (list (concat "-I" (projectile-project-root) "lib/rapidxml")))))
(setq flycheck-clang-include-path (delete-dups (append
flycheck-clang-include-path
- (list (concat (projectile-project-root) "include")))))
+ (list (concat (projectile-project-root) "yage")))))
(setq flycheck-clang-include-path (delete-dups (append
flycheck-clang-include-path
(list (concat (projectile-project-root) "lib/googletest/googletest/include")))))
(setq flycheck-clang-include-path (delete-dups (append
flycheck-clang-include-path
- (list (concat (projectile-project-root) "lib/rapidjson/include")))))
- (setq flycheck-clang-include-path (delete-dups (append
- flycheck-clang-include-path
- (list (concat (projectile-project-root) "lib/rapidxml"))))))))))
+ (list (concat (projectile-project-root) "lib/rapidjson/include"))))))))))
diff --git a/.travis.yml b/.travis.yml
index b5c22c9b..dae2e92e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,4 @@
language: cpp
-sudo: required
-os: linux
dist: trusty
branches:
@@ -12,7 +10,7 @@ notifications:
email: false
git:
- depth: 3
+ depth: 1
#############
# Compilers #
@@ -45,6 +43,6 @@ script:
- cd $TRAVIS_BUILD_DIR
- mkdir -p build
- cd build
- - cmake ..
+ - cmake -DENABLE_TESTING=1 ..
- make
- ctest
diff --git a/lib/SDL2 b/lib/SDL2
deleted file mode 160000
-Subproject 5d7cfcca344034aff9327f77fc181ae3754e7a9
diff --git a/lib/glew b/lib/glew
deleted file mode 160000
-Subproject 3a8eff77da3658c13fbd3634c943d5251d76322