Skip to content

Commit c075fbf

Browse files
Merge pull request #378 from ternera/master
Minor grammar corrections
2 parents 21f2a6b + dd9d579 commit c075fbf

File tree

2 files changed

+28
-28
lines changed

2 files changed

+28
-28
lines changed

windows/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ This is used to build packages for Windows systems.
55

66
# Instructions:
77

8-
* Open `Huggle.nsi` and update the version of Huggle to current one
9-
* Run powershell script `release.ps1`
10-
* You can pick generator using `-cmake_generator`
8+
* Open `Huggle.nsi` and update the version of Huggle to the current one
9+
* Run the PowerShell script `release.ps1`
10+
* You can pick a generator using `-cmake_generator`
1111

1212
By default, this script will try to use Visual Studio to compile Huggle. You may want to pass the parameter `-mingw true`.
1313

14-
We use MingW for the 32bit version of Huggle release builds because it has fewer dependencies than Visual Studio and works on more versions of Windows with no need to install any redistributable files from Microsoft.
14+
We use MinGW for the 32-bit version of Huggle release builds because it has fewer dependencies than Visual Studio and works on more versions of Windows with no need to install any redistributable files from Microsoft.

windows/release.ps1

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# the following conditions are met:
99

1010
# 1. Redistributions of source code must retain
11-
# the above copyright notice, this list
11+
# the above copyright notice, this list
1212
# of conditions and the following disclaimer.
1313

1414
# 2. Redistributions in binary form must reproduce the above copyright
@@ -202,29 +202,29 @@ cp .\build\huggle_core\Release\huggle_core.dll release
202202
cp .\build\huggle_l10n\Release\huggle_l10n.dll release
203203
cp ..\src\scripts\*.js release\extensions
204204
# get the qt
205-
cp ..\src\huggle_res\Resources\huggle.ico huggle.ico
206-
cp ..\src\huggle_res\Resources\huggle.ico release
207-
# missing Qt dll, bug in winqtdeploy :/
208-
$path = Join-Path $qt_path 'bin'
209-
$fileQt5 = 'Qt5Multimedia.dll'
210-
$fileQt6 = 'Qt6Multimedia.dll'
211-
212-
if (Test-Path (Join-Path $path $fileQt5))
213-
{
214-
Copy-Item (Join-Path $path $fileQt5) 'release'
215-
}
216-
elseif (Test-Path (Join-Path $path $fileQt6))
217-
{
218-
Copy-Item (Join-Path $path $fileQt6) 'release'
219-
}
220-
else
221-
{
222-
Write-Error 'Neither Qt5Multimedia.dll nor Qt6Multimedia.dll was found.'
223-
}
224-
225-
# Older SSL, used by Qt 5.10 and older
226-
#cp $openssl_path\libssl32.dll release
227-
#cp $openssl_path\bin\ssleay32.dll release
205+
cp ..\src\huggle_res\Resources\huggle.ico huggle.ico
206+
cp ..\src\huggle_res\Resources\huggle.ico release
207+
# missing Qt dll, bug in winqtdeploy :/
208+
$path = Join-Path $qt_path 'bin'
209+
$fileQt5 = 'Qt5Multimedia.dll'
210+
$fileQt6 = 'Qt6Multimedia.dll'
211+
212+
if (Test-Path (Join-Path $path $fileQt5))
213+
{
214+
Copy-Item (Join-Path $path $fileQt5) 'release'
215+
}
216+
elseif (Test-Path (Join-Path $path $fileQt6))
217+
{
218+
Copy-Item (Join-Path $path $fileQt6) 'release'
219+
}
220+
else
221+
{
222+
Write-Error 'Neither Qt5Multimedia.dll nor Qt6Multimedia.dll was found.'
223+
}
224+
225+
# Older SSL, used by Qt 5.10 and older
226+
#cp $openssl_path\libssl32.dll release
227+
#cp $openssl_path\bin\ssleay32.dll release
228228
#cp $openssl_path\bin\libeay32.dll release
229229

230230
# New SSL

0 commit comments

Comments
 (0)