dallasgroot/Gimp
dallasgroot/Gimp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

build/windows: Prettify MSYSTEM_PREFIX condition

Browse source
This commit is contained in:
Bruno 2025-02-20 19:11:14 -03:00
parent ca70bce088
commit cbfd1152ad
No known key found for this signature in database
3 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
build/windows/1_build-deps-msys2.ps1
View file

@ -32,14 +32,7 @@ if (-not $MSYS_ROOT)
}
if (-not $MSYSTEM_PREFIX)
{
if ((Get-WmiObject Win32_ComputerSystem).SystemType -like 'ARM64*')
{
$MSYSTEM_PREFIX = 'clangarm64'
}
elseif ((Get-WmiObject Win32_ComputerSystem).SystemType -like 'x64*')
{
$MSYSTEM_PREFIX = 'clang64'
}
$MSYSTEM_PREFIX = if ((Get-WmiObject Win32_ComputerSystem).SystemType -like 'ARM64*') { 'clangarm64' } else { 'clang64' }
}
if ($MSYSTEM_PREFIX -eq 'clangarm64')
{

2
build/windows/2_build-gimp-msys2.ps1
View file

@ -23,7 +23,7 @@ if (-not $GITLAB_CI)
# Install the required (pre-built) packages for babl, GEGL and GIMP (again)
Invoke-Expression ((Get-Content build\windows\1_build-deps-msys2.ps1 | Select-String 'MSYS_ROOT\)' -Context 0,28) -replace '> ','')
Invoke-Expression ((Get-Content build\windows\1_build-deps-msys2.ps1 | Select-String 'MSYS_ROOT\)' -Context 0,21) -replace '> ','')
if ($GITLAB_CI)
{

2
build/windows/installer/3_dist-gimp-inno.ps1
View file

@ -13,7 +13,7 @@ $PSNativeCommandUseErrorActionPreference = $true
# This script needs a bit of MSYS2 to work
Invoke-Expression ((Get-Content build\windows\1_build-deps-msys2.ps1 | Select-String 'MSYS_ROOT\)' -Context 0,28) -replace '> ','')
Invoke-Expression ((Get-Content build\windows\1_build-deps-msys2.ps1 | Select-String 'MSYS_ROOT\)' -Context 0,21) -replace '> ','')
# 1. GET INNO