Update appveyor configuration & README.md

.appveyor.yml

@@ -3,63 +3,73 @@
 ############################################################################
 clone_depth: 1
 
-os:
+platform:
-  - Visual Studio 2017
+  - x64
+
+build_cloud: APOLLO
+image: Windows
 
 build:
   verbosity: detailed
 
-branches:
-  only:
-    - master
-
 configuration:
-  - Debug
+  - Release
+
+cache:
+  - C:\projects\deps
 
 install:
   ############################################################################
   # All external dependencies are installed in C:\projects\deps
   ############################################################################
-  - mkdir C:\projects\deps
+  - if not exist C:\projects\deps mkdir C:\projects\deps
   - cd C:\projects\deps
 
   ############################################################################
   # Install Ninja
   ############################################################################
-  - set NINJA_URL="https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-win.zip"
+  - set NINJA_URL="https://github.com/ninja-build/ninja/releases/download/v1.10.0/ninja-win.zip"
-  - appveyor DownloadFile %NINJA_URL% -FileName ninja.zip
+  - if not exist ninja.zip appveyor DownloadFile %NINJA_URL% -FileName ninja.zip
-  - 7z x ninja.zip -oC:\projects\deps\ninja > nul
+  - if not exist ninja 7z x ninja.zip -oC:\projects\deps\ninja > nul
-  - set PATH=C:\projects\deps\ninja;%PATH%
-  - ninja --version
 
   ############################################################################
   # Install a recent CMake
   ############################################################################
-  - set CMAKE_URL="https://cmake.org/files/v3.10/cmake-3.10.1-win64-x64.zip"
+  - set CMAKE_URL="https://github.com/Kitware/CMake/releases/download/v3.16.4/cmake-3.16.4-win64-x64.zip"
-  - appveyor DownloadFile %CMAKE_URL% -FileName cmake.zip
+  - if not exist cmake.zip appveyor DownloadFile %CMAKE_URL% -FileName cmake.zip
-  - 7z x cmake.zip -oC:\projects\deps\cmake > nul
+  - if not exist cmake 7z x cmake.zip -oC:\projects\deps\cmake > nul
-  - set PATH=C:\projects\deps\cmake\bin;%PATH%
-  - C:\projects\deps\cmake\cmake-3.10.1-win64-x64\bin\cmake.exe --version
 
   ############################################################################
   # Install custom LLVM
   ############################################################################
-  - set LLVM_URL="https://axiodl.com/LLVM-6.0.0svn-win64.exe"
+  - set LLVM_URL="https://axiodl.com/files/LLVM-9.0.1-win64.exe"
-  - appveyor DownloadFile %LLVM_URL% -FileName llvm.exe
+  - if not exist llvm.exe appveyor DownloadFile %LLVM_URL% -FileName llvm.exe
-  - llvm.exe /S /D=C:\projects\deps\llvm
+  - if not exist llvm llvm.exe /S /D=C:\projects\deps\llvm
-  - set PATH=C:\projects\deps\llvm\bin;%PATH%
-  - llvm-config --version
 
 before_build:
-  - call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+  # Configure ninja
-  - cd C:\projects\urde
+  - set PATH=C:\projects\deps\ninja;%PATH%
+  - ninja --version
+  # Configure cmake
+  - set PATH=C:\projects\deps\cmake\cmake-3.16.4-win64-x64\bin;%PATH%
+  - cmake --version
+  # Configure LLVM
+  - set PATH=C:\projects\deps\llvm\bin;%PATH%
+  - llvm-config --version
+  - clang-cl -v
+  - set CC=clang-cl -mrtm
+  - set CXX=clang-cl -mrtm
+  # Configure VS
+  - call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat" amd64
+  # Fetch submodules
+  - cd %APPVEYOR_BUILD_FOLDER%
   - git submodule update --init --recursive
 
 build_script:
   - mkdir build
   - cd build
-  - C:\projects\deps\cmake\cmake-3.10.1-win64-x64\bin\cmake.exe -GNinja ..
+  - cmake -DCMAKE_BUILD_TYPE=%CONFIGURATION% -GNinja ..
-  - ninja
+  - ninja urde
 
 #notifications:
 #  - provider: Slack

README.md

@@ -21,8 +21,8 @@ Everything else is much too experimental to make portable/stable release builds
 * [CMake 3.13+](https://cmake.org)
 * [Python 3+](https://python.org)
 * LLVM development package *(headers and libs)*
-    * [Specialized Windows Package](https://axiodl.com/files/LLVM-9.0.0svn-win64.exe)
+    * [Specialized Windows Package](https://axiodl.com/files/LLVM-9.0.1-win64.exe)
-    * [macOS Package](http://releases.llvm.org/7.0.0/clang+llvm-7.0.0-x86_64-apple-darwin.tar.xz)
+    * [Specialized macOS Package](https://axiodl.com/files/LLVM-9.0.1-Darwin.tar.xz)
 * **[Windows]** [Visual Studio 2017/2019 and Windows SDK](https://www.visualstudio.com/en-us/products/visual-studio-community-vs.aspx)
 * **[macOS]** [Xcode Tools](https://developer.apple.com/xcode/download/)
 * **[Linux]** recent development packages of `udev`, `x11`, `xcb`, `xinput`, `glx`, `asound`
@@ -60,11 +60,9 @@ Build / Debug / Run on Windows, macOS and Linux in a unified way.
 
 #### Visual Studio
 
-```sh
+Open the `urde` directory in Visual Studio (automatically imports CMake configuration)
-cmake -G "Visual Studio 15 2017 Win64" -DCMAKE_BUILD_TYPE=Debug ../urde
-```
 
-Then open `urde.sln`
+Follow these instructions to use clang-cl for the build process https://docs.microsoft.com/en-us/cpp/build/clang-support-cmake?view=vs-2019
 
 #### Xcode