|
8 | 8 | # the following conditions are met:
|
9 | 9 |
|
10 | 10 | # 1. Redistributions of source code must retain
|
11 |
| -# the above copyright notice, this list |
| 11 | +# the above copyright notice, this list |
12 | 12 | # of conditions and the following disclaimer.
|
13 | 13 |
|
14 | 14 | # 2. Redistributions in binary form must reproduce the above copyright
|
@@ -202,29 +202,29 @@ cp .\build\huggle_core\Release\huggle_core.dll release
|
202 | 202 | cp .\build\huggle_l10n\Release\huggle_l10n.dll release
|
203 | 203 | cp ..\src\scripts\*.js release\extensions
|
204 | 204 | # 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 |
228 | 228 | #cp $openssl_path\bin\libeay32.dll release
|
229 | 229 |
|
230 | 230 | # New SSL
|
|
0 commit comments