Skip to content

Commit

Permalink
Basic compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
K4sum1 committed Aug 22, 2024
1 parent 77f199a commit 63d07df
Show file tree
Hide file tree
Showing 9 changed files with 3 additions and 216 deletions.
42 changes: 0 additions & 42 deletions .github/workflows/linux.yml

This file was deleted.

64 changes: 0 additions & 64 deletions .github/workflows/mac.yml

This file was deleted.

22 changes: 0 additions & 22 deletions .github/workflows/notify.yml

This file was deleted.

57 changes: 0 additions & 57 deletions .github/workflows/windows-arm.yml

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
- name: Build CLI and LibHB
run: |
export PATH="/home/runner/work/HandBrake/HandBrake/toolchains/mingw-w64-toolchain-10.0.0-msvcrt-linux-x86_64/mingw-w64-x86_64/bin:${PATH}"
export PATH="/home/runner/work/StickShift/StickShift/toolchains/mingw-w64-toolchain-10.0.0-msvcrt-linux-x86_64/mingw-w64-x86_64/bin:${PATH}"
export PATH=/usr/bin:$PATH
./configure --cross=x86_64-w64-mingw32 --enable-qsv --enable-vce --enable-nvenc --enable-nvdec --launch-jobs=0 --launch
cd build
Expand Down
8 changes: 0 additions & 8 deletions win/CS/HandBrake.Installer/Product.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -48,14 +48,6 @@
<WixVariable Id="WixUIUpIco" Value="..\HandBrakeWPF\handbrakepineapple.ico" />
<WixVariable Id="WixUINewIco" Value="..\HandBrakeWPF\handbrakepineapple.ico" />

<!-- System Requirement Checks -->
<Property Id="WINDOWSBUILDNUMBER" Secure="yes">
<RegistrySearch Id="BuildNumberSearch" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Name="CurrentBuildNumber" Type="raw" />
</Property>
<Condition Message="HandBrake is only supported on Windows 10 version 1909 (build 18363) or higher.">
<![CDATA[(WINDOWSBUILDNUMBER >= 18363)]]>
</Condition>

<!-- Install Files -->
<Directory Id="TARGETDIR" Name="SourceDir">

Expand Down
8 changes: 1 addition & 7 deletions win/CS/HandBrake.Nsis.Installer/Installer64.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,8 @@ Function .onInit
MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK
Abort

; Detect if the installer is running on an unsupported version of windows.
${IfNot} ${AtLeastBuild} 10240
MessageBox MB_OK "Windows 10 or later is required in order to run HandBrake. Old versions of HandBrake can be downloaded from handbrake.fr "
Quit
${EndIf}

${IfNot} ${RunningX64}
MessageBox MB_OK "HandBrake requires a 64bit version of Windows 10 or later to install. Your system has a 32bit version of Windows."
MessageBox MB_OK "HandBrake requires a 64bit version of Windows to install. Your system has a 32bit version of Windows."
Quit
${EndIf}

Expand Down
8 changes: 1 addition & 7 deletions win/CS/HandBrake.Nsis.Installer/MakeNightly64.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -78,14 +78,8 @@ Function .onInit
MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK
Abort

; Detect if the installer is running on an unsupported version of windows.
${IfNot} ${AtLeastBuild} 10240
MessageBox MB_OK "Windows 10 or later is required in order to run HandBrake. Old versions of HandBrake can be downloaded from handbrake.fr "
Quit
${EndIf}

${IfNot} ${RunningX64}
MessageBox MB_OK "HandBrake requires a 64bit version of Windows 10 or later to install. Your system has a 32bit version of Windows."
MessageBox MB_OK "HandBrake requires a 64bit version of Windows to install. Your system has a 32bit version of Windows."
Quit
${EndIf}

Expand Down
8 changes: 0 additions & 8 deletions win/CS/HandBrakeWPF/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -65,14 +65,6 @@ private void Init(StartupEventArgs e)
return;
}

// We don't support Windows earlier than 10.
if (!SystemInfo.IsWindows10OrLater())
{
MessageBox.Show(HandBrakeWPF.Properties.Resources.OsVersionWarning, HandBrakeWPF.Properties.Resources.Warning, MessageBoxButton.OK, MessageBoxImage.Warning);
Application.Current.Shutdown();
return;
}

if (!Environment.Is64BitOperatingSystem)
{
MessageBox.Show(HandBrakeWPF.Properties.Resources.OsBitnessWarning, HandBrakeWPF.Properties.Resources.Warning, MessageBoxButton.OK, MessageBoxImage.Warning);
Expand Down

0 comments on commit 63d07df

Please sign in to comment.