Skip to content

Commit 1885cd4

Browse files
author
Matthew Orlando
committed
Update for VS 2019
1 parent 71c271a commit 1885cd4

File tree

3 files changed

+248
-307
lines changed

3 files changed

+248
-307
lines changed

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,9 @@ caff_freeInstance(&instance);
5252
5353
Prereqs:
5454
55-
* Visual Studio 2017 (and [LLVM Compiler Toolchain Extension](https://marketplace.visualstudio.com/items?itemName=LLVMExtensions.llvm-toolchain))
56-
* LLVM toolchain
55+
* [Visual Studio 2019](https://visualstudio.microsoft.com/downloads/)
56+
* Select "Desktop C++ development with C++"
57+
* Add the "C++ Clang tools for Windows" component
5758
5859
Steps:
5960
@@ -63,7 +64,7 @@ Steps:
6364
* In the libcaffeine root directory:
6465
* `mkdir build`
6566
* `cd build`
66-
* `cmake .. -G "Visual Studio 15 2017 Win64" -T LLVM`
67+
* `cmake .. -G "Visual Studio 16 2019" -T ClangCL`
6768
* `start libcaffeine.sln`
6869
* Build the solution in Visual Studio
6970

appveyor.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,18 @@ matrix:
66

77
environment:
88
global:
9-
CMAKE_SYSTEM_VERSION: 10.0.17134.0
9+
CMAKE_SYSTEM_VERSION: 10.0
1010
CURL_VERSION: 7.56.1
1111
LLVM_VERSION: 8.0.0
1212
LIBYUV_GIT: "https://chromium.googlesource.com/libyuv/libyuv"
1313

1414
matrix:
15-
- APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
16-
CMAKE_GENERATOR: "Visual Studio 15 2017 Win64"
17-
CMAKE_TOOLSET: "LLVM"
15+
- APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2019"
16+
CMAKE_GENERATOR: "Visual Studio 16 2019"
17+
CMAKE_TOOLSET: "ClangCL"
1818
WEBRTC_URL: "https://github.com/caffeinetv/webrtc/releases/download/v70.2-libcaffeine/webrtc-prebuilt-windows.7z"
1919
WEBRTC_PATH: .cache\\webrtc
20+
#LLVM_EXTENSION: "https://llvmextensions.gallerycdn.vsassets.io/extensions/llvmextensions/llvm-toolchain/1.0.363769/1560930595399/llvm.vsix"
2021
# Used for libcurl only, should be replaced in the future by a proper C++ library.
2122
OBS_DEPENDENCIES_URL: "https://obsproject.com/downloads/dependencies2017.zip"
2223
OBS_DEPENDENCIES_ARCH: "win64"

0 commit comments

Comments
 (0)