Fix travis

.travis.yml

@@ -4,6 +4,20 @@ language:
 
 python: 3.7
 
+cache:
+  apt: true
+
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - gcc-6
+      - g++-6
+      - cmake
+      - libvulkan-dev
+      - libegl1-mesa-dev
+
 matrix:
   include:
     - os: linux
@@ -12,27 +26,19 @@ matrix:
       env:
         - GENERATOR="Unix Makefiles" BUILD_TYPE=Debug EXTRA_CHECKS=ON TRACE=ON
         - GENERATOR="Unix Makefiles" BUILD_TYPE=Release EXTRA_CHECKS=OFF TRACE=OFF
-      packages:
-        - cmake
-        - libvulkan-dev
-        - libegl1-mesa-dev
     - os: linux
       dist: trusty
       compiler: clang
       env:
         - GENERATOR="Unix Makefiles" BUILD_TYPE=Debug EXTRA_CHECKS=ON TRACE=ON
         - GENERATOR="Unix Makefiles" BUILD_TYPE=Release EXTRA_CHECKS=OFF TRACE=OFF
-      packages:
-        - cmake
-        - libvulkan-dev
-        - libegl1-mesa-dev
     - os: windows
       before_install:
         - choco install python3
         - export PATH="/c/Python37:/c/Python37/Scripts:$PATH"
-        - curl --silent --show-error --output VulkanSDK.exe https://vulkan.lunarg.com/sdk/home#sdk/downloadConfirm/1.1.106.0/windows/VulkanSDK-1.1.106.0-Installer.exe
+        - curl --silent --show-error --output VulkanSDK.exe https://vulkan.lunarg.com/sdk/download/1.1.106.0/windows/VulkanSDK-1.1.106.0-Installer.exe
         - .\VulkanSDK.exe /S
-        - export VULKAN_SDK=$TRAVIS_BUILD_DIR/VulkanSDK/1.0.51.0/x86_64
+        - export VULKAN_SDK=$TRAVIS_BUILD_DIR/VulkanSDK/1.1.106.0/x86_64
       env:
         - GENERATOR="Visual Studio 15 2017 Win64" BUILD_TYPE=Debug EXTRA_CHECKS=ON TRACE=ON
         - GENERATOR="Visual Studio 15 2017 Win64" BUILD_TYPE=Release EXTRA_CHECKS=OFF TRACE=OFF
@@ -42,6 +48,7 @@ script:
   - if [[ "$TRAVIS_OS_NAME" != "windows" ]]; then PYTHON3=$(which python3); fi
   - $CC --version
   - $CXX --version
+  - echo "VULKAN_SDK ENV" $VULKAN_SDK
   - mkdir build
   - cd build
   - cmake .. -G "${GENERATOR}" -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DANKI_EXTRA_CHECKS=${EXTRA_CHECKS} -DANKI_BUILD_TOOLS=ON -DANKI_BUILD_TESTS=ON -DANKI_TRACE=${TRACE} -DPYTHON_EXECUTABLE:FILEPATH="${PYTHON3}"

README.md

@@ -15,10 +15,7 @@ See `LICENSE` file for more info.
 2 Building AnKi
 ===============
 
-| OS      | Master Branch Build Status                                                                                                                                    |
-| ------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| Linux   | [![Build Status Linux](https://travis-ci.org/godlikepanos/anki-3d-engine.svg?branch=master)](https://travis-ci.org/godlikepanos/anki-3d-engine)               |
-| Windows | [![Build status Windows](https://ci.appveyor.com/api/projects/status/waij29m7o8ajjoqh?svg=true)](https://ci.appveyor.com/project/godlikepanos/anki-3d-engine) |
+Build Status (Linux & Windows): [![Build Status](https://travis-ci.org/godlikepanos/anki-3d-engine.svg?branch=master)](https://travis-ci.org/godlikepanos/anki-3d-engine)
 
 To checkout the source including the submodules type:
 
@@ -32,8 +29,8 @@ external dependencies are almost none.
 
 Prerequisites:
 
-- Cmake 2.8 and up
-- GCC 5.0 and up or Clang 3.7 and up
+- Cmake 3.0 and up
+- GCC 5.0 and up or Clang 6.0 and up
 - libx11-dev installed
 - libxrandr-dev installed
 - libx11-xcb-dev installed
@@ -59,22 +56,26 @@ This will open an interface with all the available options.
 
 Prerequisites:
 
-- CMake 2.8 and up
-	- Make sure you add cmake.exe to your PATH environment variable (The installer asks, press yes)
-- MinGW-w64 5.0 and up
-	- MinGW has many variants. You need the POSIX version plus SEH (eg x86_64-posix-seh)
-	- Install to a path without spaces (eg C:/mingw-w64)
-	- Append the path where mingw's binaries are located (eg C:/mingw-w64/bin) to the PATH environment variable
+- Cmake 3.0 and up
+- VulkanSDK version 1.1.x and up
+	- Add an environment variable named `VULKAN_SDK` that points to the installation path of VulkanSDK
+- Microsoft Visual Studio 2017 and up
 
 To build the release version open `PowerShell` and type:
 
 	$cd path/to/anki
 	$mkdir build
 	$cd build
-	$cmake .. -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release
-	$mingw32-make
+	$cmake .. -G "Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE=Release
+	$cmake --build .
+
+Alternatively, recent Visual Studio versions support building CMake projects from inside the IDE:
+
+- Open Visual Studio
+- Choose the "open folder" option and navigate to AnKi's checkout
+- Visual Studio will automatically understand that AnKi is a CMake project and it will populate the CMake cache
+- Press "build all"
 
-> NOTE: If you have a better way to build on Windows please let us know.
 
 3 Next steps
 ============