Skip to content

Commit 6ef55aa

Browse files
wargioXVilka
authored andcommitted
Fix #1881 - Fix windows build (#1984)
1 parent d379546 commit 6ef55aa

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

dist/windows/build_windows_installer.ps1

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,15 @@ $bits=$args[1]
33
$end=$args.Length
44
$meson_options=$args[2..$end]
55
$scriptpath=$PSScriptRoot
6-
$builddir=$(Join-Path -Path $env:TEMP -ChildPath "build-win-installer")
7-
$installdir=$(Join-Path -Path $env:TEMP -ChildPath "rizin-win-installer")
6+
$builddir=$(Join-Path -Path $env:TEMP -ChildPath "build-win-installer-$name-$bits")
7+
$installdir=$(Join-Path -Path $env:TEMP -ChildPath "rizin-win-installer-$name-$bits")
88

99
pushd $PSScriptRoot\..\..
1010

1111
$version=$(python sys\version.py)
1212
echo $version
13+
echo $builddir
14+
echo $installdir
1315

1416
$env:Path += ";$env:ProgramFiles (x86)\Microsoft Visual Studio\Installer"
1517
$env:Path += ";$env:ProgramFiles\7-Zip"
@@ -18,12 +20,12 @@ $env:Path += ";$env:ProgramFiles (x86)\Inno Setup 6"
1820
dist\windows\vsdevenv.ps1 $bits
1921

2022
meson --buildtype=release --prefix=$installdir $builddir $meson_options
21-
ninja -C $builddir
23+
ninja -C $builddir -j1
2224
ninja -C $builddir install
2325
7z a dist\windows\Output\rizin-$name-$version.zip $installdir
2426
iscc dist\windows\rizin.iss /DRizinLocation=$installdir\* /DLicenseLocation=$PWD\COPYING.LESSER /DMyAppVersion=$version
2527

2628
rm -r $builddir
2729
rm -r $installdir
2830

29-
popd
31+
popd

0 commit comments

Comments
 (0)