Skip to content

Update for VS 2019 #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
cogwheel wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Update for VS 2019 #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
02b596e
Update for VS 2019
Aug 12, 2019
9ce3c9e
Attempt appveyor fix
Aug 13, 2019
a347f53
Attempt built-in clang-cl support
Aug 13, 2019
2691f7b
Second attempt at fix
Aug 14, 2019
ca57ab7
Test another random thing
Aug 14, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,9 @@ caff_freeInstance(&instance);

Prereqs:

* Visual Studio 2017 (and [LLVM Compiler Toolchain Extension](https://marketplace.visualstudio.com/items?itemName=LLVMExtensions.llvm-toolchain))
* LLVM toolchain
* [LLVM 8.0.1 or later](http://releases.llvm.org/download.html)
* [Visual Studio 2019](https://visualstudio.microsoft.com/downloads/)
* [LLVM Compiler Toolchain Extension](https://marketplace.visualstudio.com/items?itemName=LLVMExtensions.llvm-toolchain) (can also be installed from within Visual Studio)

Steps:

Expand All @@ -63,7 +64,7 @@ Steps:
* 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 LLVM`
* `start libcaffeine.sln`
* Build the solution in Visual Studio

Expand Down
9 changes: 5 additions & 4 deletions appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
12 changes: 11 additions & 1 deletion ci/win/install.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,16 @@ IF NOT EXIST "%ROOT%\.cache" (
MKDIR "%ROOT%\.cache"
)

SET VSIXPATH=%ROOT%\.cache\llvm.vsix

REM ECHO Installing LLVM toolchain
REM IF EXIST %ROOT%\.cache\obs_deps.zip (
REM curl -kL "%LLVM_EXTENSION%" -f --retry 5 -o "%VSIXPATH%" -z "%VSIXPATH%"
REM ) ELSE (
REM curl -kL "%LLVM_EXTENSION%" -f --retry 5 -o "%VSIXPATH%"
REM )
REM "C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\Common7\IDE\VSIXInstaller.exe" /q /a "%VSIXPATH%"

ECHO Updating libcurl...
IF EXIST %ROOT%\.cache\obs_deps.zip (
curl -kL "%OBS_DEPENDENCIES_URL%" -f --retry 5 -o "%ROOT%\.cache\obs_deps.zip" -z "%ROOT%\.cache\obs_deps.zip"
Expand All @@ -26,4 +36,4 @@ IF EXIST "%ROOT%\.cache\webrtc.7z" (
)
7z x -y -o"%ROOT%\%WEBRTC_PATH%" "%ROOT%\.cache\webrtc.7z"

ECHO Done.
ECHO Done.
Loading