Fix ANGLE GL and Visual Studio detection
This commit is contained in:
1 parent
783c50bf4d
commit
8dbcb291a9
2 files changed
+10
-2
No files matched your search
@@ -35,7 +35,7 @@ jobs:
|
|||||||
- name: Install native build dependencies
|
- name: Install native build dependencies
|
||||||
run: |
|
run: |
|
||||||
sudo apt-get update
|
sudo apt-get update
|
||||||
sudo apt-get install -y clang lld llvm g++ ninja-build pkg-config libfontconfig1-dev libglib2.0-dev libpci-dev libx11-dev libxcb1-dev libxext-dev
|
sudo apt-get install -y clang lld llvm g++ ninja-build pkg-config libfontconfig1-dev libglib2.0-dev libgl1-mesa-dev libpci-dev libx11-dev libxcb1-dev libxext-dev
|
||||||
|
|
||||||
- name: Build Linux static graphics libraries
|
- name: Build Linux static graphics libraries
|
||||||
env:
|
env:
|
||||||
@@ -71,6 +71,13 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
arch: ${{ matrix.msvc_arch }}
|
arch: ${{ matrix.msvc_arch }}
|
||||||
|
|
||||||
|
- name: Configure Chromium Visual Studio environment
|
||||||
|
shell: pwsh
|
||||||
|
run: |
|
||||||
|
"DEPOT_TOOLS_WIN_TOOLCHAIN=0" >> $env:GITHUB_ENV
|
||||||
|
"GYP_MSVS_VERSION=17.0" >> $env:GITHUB_ENV
|
||||||
|
"GYP_MSVS_OVERRIDE_PATH=$($env:VSINSTALLDIR.TrimEnd('\', '/'))" >> $env:GITHUB_ENV
|
||||||
|
|
||||||
- name: Install native build dependencies
|
- name: Install native build dependencies
|
||||||
shell: pwsh
|
shell: pwsh
|
||||||
run: |
|
run: |
|
||||||
@@ -83,6 +90,7 @@ jobs:
|
|||||||
RID: ${{ matrix.rid }}
|
RID: ${{ matrix.rid }}
|
||||||
TARGET_CPU: ${{ matrix.target_cpu }}
|
TARGET_CPU: ${{ matrix.target_cpu }}
|
||||||
DEPOT_TOOLS_WIN_TOOLCHAIN: 0
|
DEPOT_TOOLS_WIN_TOOLCHAIN: 0
|
||||||
|
GYP_MSVS_VERSION: 17.0
|
||||||
run: .\scripts\build-windows-static-graphics.ps1 all
|
run: .\scripts\build-windows-static-graphics.ps1 all
|
||||||
|
|
||||||
- name: Upload Windows static archives
|
- name: Upload Windows static archives
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ if (-not $env:DEPOT_TOOLS_WIN_TOOLCHAIN) {
|
|||||||
}
|
}
|
||||||
if ($env:DEPOT_TOOLS_WIN_TOOLCHAIN -eq "0") {
|
if ($env:DEPOT_TOOLS_WIN_TOOLCHAIN -eq "0") {
|
||||||
if (-not $env:GYP_MSVS_VERSION) {
|
if (-not $env:GYP_MSVS_VERSION) {
|
||||||
$env:GYP_MSVS_VERSION = "2022"
|
$env:GYP_MSVS_VERSION = "17.0"
|
||||||
}
|
}
|
||||||
if (-not $env:GYP_MSVS_OVERRIDE_PATH) {
|
if (-not $env:GYP_MSVS_OVERRIDE_PATH) {
|
||||||
if ($env:VSINSTALLDIR) {
|
if ($env:VSINSTALLDIR) {
|
||||||
|
|||||||
Reference in new issue
Block a user