[feat, build] Compatibility with other CMake generators

.ci/before_install.sh

@@ -2,13 +2,13 @@
 
 # don't do this for clang
 if [ "$CXX" = "g++" ]; then
-    export CXX="g++-4.8" CC="gcc-4.8"
+    export CXX="g++-5" CC="gcc-5"
 fi
 # in case anything ignores the environment variables, override through PATH
 mkdir bin
-ln -s "$(command -v gcc-4.8)" bin/cc
-ln -s "$(command -v gcc-4.8)" bin/gcc
-ln -s "$(command -v c++-4.8)" bin/c++
-ln -s "$(command -v g++-4.8)" bin/g++
+ln -s "$(command -v gcc-5)" bin/cc
+ln -s "$(command -v gcc-5)" bin/gcc
+ln -s "$(command -v c++-5)" bin/c++
+ln -s "$(command -v g++-5)" bin/g++
 
 export PATH=$PWD/bin:$PATH

.travis.yml

@@ -16,6 +16,7 @@ env:
   matrix:
     - SHELLCHECKS=1
     - EMULATE_READER=1 CC=gcc
+    - EMULATE_READER=1 CC=gcc USE_NINJA=1
     - EMULATE_READER=1 CC=gcc KODEBUG=1
     - EMULATE_READER=1 CC=clang
     - TARGET=kindle DOCKER_IMG=frenzie/kokindle:0.1.0
@@ -30,7 +31,8 @@ addons:
   apt:
     packages:
       - cmake
-      - g++-4.8
+      - ninja-build
+      - g++
       - libsdl1.2-dev
       - luarocks
       # for luasec

Makefile.defs

@@ -34,6 +34,11 @@ export CMAKE_BUILD_TYPE
 
 # CMAKE=cmake --no-warn-unused-cli
 CMAKE=cmake
+CMAKE_MAKE_PROGRAM=$(MAKE)
+ifdef USE_NINJA
+	CMAKE:=cmake -G Ninja
+	CMAKE_MAKE_PROGRAM:=ninja
+endif
 
 # set this to your ARM cross compiler:
 # set CC CXX AR LD RANLIB