Merge branch 'develop' of https://github.com/vcmi/vcmi into develop

.travis.yml

@@ -64,11 +64,11 @@ before_script:
     source $TRAVIS_BUILD_DIR/CI/get_package_name.sh;
     if [[ $VCMI_PLATFORM == 'mxe' ]];
     then
-      /usr/lib/mxe/usr/bin/i686-w64-mingw32.shared-cmake -G "Unix Makefiles" .. $VCMI_CMAKE_FLAGS
+      /usr/lib/mxe/usr/bin/i686-w64-mingw32.shared-cmake -G Ninja .. $VCMI_CMAKE_FLAGS
       -DPACKAGE_NAME_SUFFIX:STRING="$VCMI_PACKAGE_NAME_SUFFIX"
       -DPACKAGE_FILE_NAME:STRING="$VCMI_PACKAGE_FILE_NAME";
     else
-      cmake -G "Unix Makefiles" .. $VCMI_CMAKE_FLAGS
+      cmake -G Ninja .. $VCMI_CMAKE_FLAGS
       -DPACKAGE_NAME_SUFFIX:STRING="$VCMI_PACKAGE_NAME_SUFFIX"
       -DPACKAGE_FILE_NAME:STRING="$VCMI_PACKAGE_FILE_NAME";
     fi
@@ -77,14 +77,7 @@ before_script:
   
 script:
 - test $TRAVIS_BRANCH != coverity_scan || exit 0
-- if [[ $TRAVIS_OS_NAME == 'osx' ]];
-  then
-    cd ..;
-    xcodebuild -project osx/osx-vcmibuilder/vcmibuilder.xcodeproj/
-      -configuration Release CONFIGURATION_BUILD_DIR=..;
-    cd build;
-  fi
-- make -j2
+- ninja
 
 after_success:
 - test $TRAVIS_BRANCH != coverity_scan || exit 0

CI/mac/before_install.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 brew update
-brew install smpeg2 libpng freetype sdl2 sdl2_ttf sdl2_image qt5 ffmpeg
+brew install smpeg2 libpng freetype sdl2 sdl2_ttf sdl2_image qt5 ffmpeg ninja
 brew install sdl2_mixer --with-smpeg2
 
 export CMAKE_PREFIX_PATH="/usr/local/opt/qt5:$CMAKE_PREFIX_PATH"

CI/mxe/before_install.sh

@@ -23,7 +23,7 @@ mxe-$MXE_TARGET-qt \
 mxe-$MXE_TARGET-qtbase
 
 # Install nsis for installer creation
-sudo apt-get install -qq nsis
+sudo apt-get install -qq nsis ninja-build
 
 # alias for CMake
 sudo mv /usr/bin/cmake /usr/bin/cmake.orig