mirror of
https://github.com/SpartanJ/eepp.git
synced 2026-07-23 03:02:50 +03:00
Fix MSBuild path.
This commit is contained in:
8
.github/workflows/ecode-nightly.yml
vendored
8
.github/workflows/ecode-nightly.yml
vendored
@@ -482,9 +482,9 @@ jobs:
|
||||
name: Windows x86_64 MSVC Nightly
|
||||
needs: release
|
||||
runs-on: windows-latest
|
||||
env:
|
||||
MSBUILD_PATH: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin
|
||||
steps:
|
||||
- name: Add msbuild to PATH
|
||||
uses: microsoft/setup-msbuild@v3
|
||||
- name: Configure Git
|
||||
shell: pwsh
|
||||
run: |
|
||||
@@ -511,9 +511,9 @@ jobs:
|
||||
name: Windows arm64 MSVC Nightly
|
||||
needs: release
|
||||
runs-on: windows-latest
|
||||
env:
|
||||
MSBUILD_PATH: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin
|
||||
steps:
|
||||
- name: Add msbuild to PATH
|
||||
uses: microsoft/setup-msbuild@v3
|
||||
- name: Configure Git
|
||||
shell: pwsh
|
||||
run: |
|
||||
|
||||
@@ -5,9 +5,9 @@ on: [push, pull_request]
|
||||
jobs:
|
||||
Windows:
|
||||
runs-on: windows-latest
|
||||
env:
|
||||
MSBUILD_PATH: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\
|
||||
steps:
|
||||
- name: Add msbuild to PATH
|
||||
uses: microsoft/setup-msbuild@v3
|
||||
- name: Configure Git
|
||||
shell: cmd
|
||||
run: |
|
||||
@@ -32,7 +32,7 @@ jobs:
|
||||
- name: Build
|
||||
shell: cmd
|
||||
run: |
|
||||
"%MSBUILD_PATH%\MSBuild.exe" .\make\windows\eepp.sln -m /p:Platform="x64" /p:Configuration="release"
|
||||
msbuild .\make\windows\eepp.sln -m /p:Platform="x64" /p:Configuration="release"
|
||||
- name: Install Mesa for software rendering
|
||||
uses: f3d-app/install-mesa-windows-action@v1
|
||||
with:
|
||||
|
||||
@@ -26,7 +26,22 @@ $sdlDll = if ($isSdl3) { "SDL3.dll" } else { "SDL2.dll" }
|
||||
|
||||
& $premakeCmd --windows-vc-build --with-backend=$backendArg $(if ($premakeExtra) { $premakeExtra }) --disable-static-build vs2022
|
||||
|
||||
& "$env:MSBUILD_PATH/MSBuild.exe" .\make\windows\eepp.sln -m /t:ecode /p:Platform=$msbuildPlat /p:Configuration=release
|
||||
$msbuildInPath = Get-Command msbuild -ErrorAction SilentlyContinue
|
||||
|
||||
if ($msbuildInPath) {
|
||||
$msbuildCmd = "msbuild"
|
||||
} elseif ($env:MSBUILD_PATH) {
|
||||
$msbuildCmd = "$env:MSBUILD_PATH/MSBuild.exe"
|
||||
if (-not (Test-Path $msbuildCmd)) {
|
||||
Write-Error "MSBuild.exe not found at $msbuildCmd"
|
||||
exit 1
|
||||
}
|
||||
} else {
|
||||
Write-Error "msbuild not found in PATH and MSBUILD_PATH is not defined"
|
||||
exit 1
|
||||
}
|
||||
|
||||
& $msbuildCmd .\make\windows\eepp.sln -m /t:ecode /p:Platform=$msbuildPlat /p:Configuration=release
|
||||
.\projects\scripts\copy_ecode_assets.ps1 .\bin .\projects\windows\ecode\ecode
|
||||
Copy-Item -Path ".\bin\$sdlDll", ".\libs\windows\$archSuffix\eepp.dll", ".\bin\ecode.exe" -Destination ".\projects\windows\ecode\ecode"
|
||||
Compress-Archive -LiteralPath ".\projects\windows\ecode\ecode" -DestinationPath .\projects\windows\ecode\ecode-windows-nightly-msvc-$archSuffix.zip -Force
|
||||
|
||||
2
src/thirdparty/SOIL2
vendored
2
src/thirdparty/SOIL2
vendored
Submodule src/thirdparty/SOIL2 updated: 9b7d218b20...d6bf0ade3f
2
src/thirdparty/efsw
vendored
2
src/thirdparty/efsw
vendored
Submodule src/thirdparty/efsw updated: 347397c0e3...c694c94c47
Reference in New Issue
Block a user