mirror of
https://github.com/obhq/obliteration.git
synced 2024-10-07 00:13:24 +00:00
Change to Visual Studio 2022 (#164)
This commit is contained in:
parent
316c5f0769
commit
e59ac0133c
3
.github/workflows/ci-windows.yml
vendored
3
.github/workflows/ci-windows.yml
vendored
@ -4,7 +4,7 @@ on:
|
||||
jobs:
|
||||
build:
|
||||
name: Windows
|
||||
runs-on: windows-2019 # We need VS 2019, not 2022.
|
||||
runs-on: windows-2022
|
||||
env:
|
||||
CMAKE_BUILD_PARALLEL_LEVEL: '2'
|
||||
steps:
|
||||
@ -39,6 +39,7 @@ jobs:
|
||||
uses: actions/cache@v3
|
||||
with:
|
||||
path: |
|
||||
cmake*.*
|
||||
build
|
||||
src/target
|
||||
key: ${{ runner.os }}-build-files-${{ github.run_id }}
|
||||
|
4
.github/workflows/release.yml
vendored
4
.github/workflows/release.yml
vendored
@ -14,9 +14,9 @@ jobs:
|
||||
name: Build Releases
|
||||
strategy:
|
||||
matrix:
|
||||
os: [windows-2019, ubuntu-22.04, macos-12]
|
||||
os: [windows-2022, ubuntu-22.04, macos-12]
|
||||
include:
|
||||
- os: windows-2019
|
||||
- os: windows-2022
|
||||
release_suffix: windows
|
||||
- os: ubuntu-22.04
|
||||
release_suffix: linux
|
||||
|
@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.24)
|
||||
|
||||
project(obliteration)
|
||||
|
||||
# Set warning level to highest. Thie will propagate to sub-directories too.
|
||||
# Set warning level to highest. This will propagate to sub-directories too.
|
||||
if(WIN32)
|
||||
add_compile_options(/W4)
|
||||
else()
|
||||
|
@ -8,7 +8,7 @@
|
||||
{
|
||||
"name": "windows",
|
||||
"inherits": "default",
|
||||
"generator": "Visual Studio 16 2019",
|
||||
"generator": "Visual Studio 17 2022",
|
||||
"architecture": "x64",
|
||||
"condition": {
|
||||
"type": "equals",
|
||||
|
@ -38,7 +38,7 @@ We have a Matrix Room Space `#obliteration:matrix.org` on [Matrix.to](https://ma
|
||||
|
||||
### Windows-specific requirements
|
||||
|
||||
- [Microsoft Visual C++ 2019 Redistributable](https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist). It's likely your system already has it, so try to run Obliteration first. If there is an error related to `msvcp140.dll`, `vcruntime140.dll`, or `vcruntime140_1.dll` that means you need to install this manually.
|
||||
- [Microsoft Visual C++ 2022 Redistributable](https://learn.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist). If there is an error related to `msvcp140.dll`, `vcruntime140.dll`, or `vcruntime140_1.dll` that means you need to install this manually. It's likely your system already has it, so try to run Obliteration first.
|
||||
|
||||
### Linux-specific requirements
|
||||
|
||||
@ -48,9 +48,8 @@ Obliteration supports only 4KB/8KB/16KB pages. Most people should not have any p
|
||||
|
||||
### Windows prerequisites
|
||||
|
||||
- Visual Studio 2019
|
||||
- Visual Studio 2022
|
||||
- `Desktop development with C++` workload is required
|
||||
- Your system must not have 2022 installed
|
||||
- Rust on the latest stable channel
|
||||
- CMake 3.24+
|
||||
- Make sure you have `Add CMake to the system PATH` selected when installing
|
||||
|
Loading…
Reference in New Issue
Block a user