Update for VS2019

README.md

@@ -52,18 +52,24 @@ caff_freeInstance(&instance);
 
 Prereqs:
 
-* Visual Studio 2017 (and [LLVM Compiler Toolchain Extension](https://marketplace.visualstudio.com/items?itemName=LLVMExtensions.llvm-toolchain))
-* LLVM toolchain
+* [CMake](https://cmake.org/download/)
+* [OBS dependencies](https://obsproject.com/downloads/dependencies2017.zip) - **TODO** This is only used for libcurl. We should use something else
+* [Pre-built WebRTC](https://github.com/caffeinetv/webrtc/releases/latest)
+* [Visual Studio 2019](https://visualstudio.microsoft.com/downloads/)
+    * Select "Desktop C++ development with C++"
+    * Add the "C++ Clang tools for Windows" component
 
 Steps:
 
-* Download the latest version of webrtc-prebuilt-windows.7z from https://github.com/caffeinetv/webrtc/releases
-* Extract the file somewhere convenient
-* Set `WEBRTC_ROOT_DIR` environment variable to the directory you extracted the files to
+* Extract the OBS dependencies and prebuilt webrtc somewhere convenient
+* Set `DepsPath` environment variable to the `win64` directory inside the OBS dependencies
+    * E.g. `C:\Users\Cogwheel\Desktop\obs-dependencies2017\win64`
+* Set `WEBRTC_ROOT_DIR` environment variable to the directory you extracted prebuilt webrtc
+    * E.g. `C:
 * In the libcaffeine root directory:
     * `mkdir build`
     * `cd build`
-    * `cmake .. -G "Visual Studio 15 2017 Win64" -T LLVM`
+    * `cmake .. -G "Visual Studio 16 2019" -T ClangCL`
     * `start libcaffeine.sln`
 * Build the solution in Visual Studio
 

appveyor.yml

@@ -6,17 +6,18 @@ matrix:
 
 environment:
   global:
-    CMAKE_SYSTEM_VERSION: 10.0.17134.0
+    CMAKE_SYSTEM_VERSION: 10.0
     CURL_VERSION: 7.56.1
     LLVM_VERSION: 8.0.0
     LIBYUV_GIT: "https://chromium.googlesource.com/libyuv/libyuv"
 
   matrix:
-  - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
-    CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
-    CMAKE_TOOLSET: "LLVM"
+  - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019"
+    CMAKE_GENERATOR: "Visual Studio 16 2019"
+    CMAKE_TOOLSET: "ClangCL"
     WEBRTC_URL: "https://github.com/caffeinetv/webrtc/releases/download/v70.2-libcaffeine/webrtc-prebuilt-windows.7z"
     WEBRTC_PATH: .cache\\webrtc
+    #LLVM_EXTENSION: "https://llvmextensions.gallerycdn.vsassets.io/extensions/llvmextensions/llvm-toolchain/1.0.363769/1560930595399/llvm.vsix"
     # Used for libcurl only, should be replaced in the future by a proper C++ library.
     OBS_DEPENDENCIES_URL: "https://obsproject.com/downloads/dependencies2017.zip"
     OBS_DEPENDENCIES_ARCH: "win64"
@@ -28,6 +29,12 @@ cache:
   - .cache/obs_deps.zip
 
 # Scripts
+
+init:
+    #- ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))
+- ps: |
+    & 'C:\Users\appveyor\AppData\Local\Temp\vs_Community.exe' --wait --norestart --add Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset --quiet
+
 install:
 - cmd: ci/win/install.cmd