Skip to content

Commit 63d07df

Browse files
committed
Basic compatibility
1 parent 77f199a commit 63d07df

File tree

9 files changed

+3
-216
lines changed

9 files changed

+3
-216
lines changed

.github/workflows/linux.yml

-42
This file was deleted.

.github/workflows/mac.yml

-64
This file was deleted.

.github/workflows/notify.yml

-22
This file was deleted.

.github/workflows/windows-arm.yml

-57
This file was deleted.

.github/workflows/windows.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
5656
- name: Build CLI and LibHB
5757
run: |
58-
export PATH="/home/runner/work/HandBrake/HandBrake/toolchains/mingw-w64-toolchain-10.0.0-msvcrt-linux-x86_64/mingw-w64-x86_64/bin:${PATH}"
58+
export PATH="/home/runner/work/StickShift/StickShift/toolchains/mingw-w64-toolchain-10.0.0-msvcrt-linux-x86_64/mingw-w64-x86_64/bin:${PATH}"
5959
export PATH=/usr/bin:$PATH
6060
./configure --cross=x86_64-w64-mingw32 --enable-qsv --enable-vce --enable-nvenc --enable-nvdec --launch-jobs=0 --launch
6161
cd build

win/CS/HandBrake.Installer/Product.wxs

-8
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,6 @@
4848
<WixVariable Id="WixUIUpIco" Value="..\HandBrakeWPF\handbrakepineapple.ico" />
4949
<WixVariable Id="WixUINewIco" Value="..\HandBrakeWPF\handbrakepineapple.ico" />
5050

51-
<!-- System Requirement Checks -->
52-
<Property Id="WINDOWSBUILDNUMBER" Secure="yes">
53-
<RegistrySearch Id="BuildNumberSearch" Root="HKLM" Key="SOFTWARE\Microsoft\Windows NT\CurrentVersion" Name="CurrentBuildNumber" Type="raw" />
54-
</Property>
55-
<Condition Message="HandBrake is only supported on Windows 10 version 1909 (build 18363) or higher.">
56-
<![CDATA[(WINDOWSBUILDNUMBER >= 18363)]]>
57-
</Condition>
58-
5951
<!-- Install Files -->
6052
<Directory Id="TARGETDIR" Name="SourceDir">
6153

win/CS/HandBrake.Nsis.Installer/Installer64.nsi

+1-7
Original file line numberDiff line numberDiff line change
@@ -79,14 +79,8 @@ Function .onInit
7979
MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK
8080
Abort
8181

82-
; Detect if the installer is running on an unsupported version of windows.
83-
${IfNot} ${AtLeastBuild} 10240
84-
MessageBox MB_OK "Windows 10 or later is required in order to run HandBrake. Old versions of HandBrake can be downloaded from handbrake.fr "
85-
Quit
86-
${EndIf}
87-
8882
${IfNot} ${RunningX64}
89-
MessageBox MB_OK "HandBrake requires a 64bit version of Windows 10 or later to install. Your system has a 32bit version of Windows."
83+
MessageBox MB_OK "HandBrake requires a 64bit version of Windows to install. Your system has a 32bit version of Windows."
9084
Quit
9185
${EndIf}
9286

win/CS/HandBrake.Nsis.Installer/MakeNightly64.nsi

+1-7
Original file line numberDiff line numberDiff line change
@@ -78,14 +78,8 @@ Function .onInit
7878
MessageBox MB_OK|MB_ICONEXCLAMATION "The installer is already running." /SD IDOK
7979
Abort
8080

81-
; Detect if the installer is running on an unsupported version of windows.
82-
${IfNot} ${AtLeastBuild} 10240
83-
MessageBox MB_OK "Windows 10 or later is required in order to run HandBrake. Old versions of HandBrake can be downloaded from handbrake.fr "
84-
Quit
85-
${EndIf}
86-
8781
${IfNot} ${RunningX64}
88-
MessageBox MB_OK "HandBrake requires a 64bit version of Windows 10 or later to install. Your system has a 32bit version of Windows."
82+
MessageBox MB_OK "HandBrake requires a 64bit version of Windows to install. Your system has a 32bit version of Windows."
8983
Quit
9084
${EndIf}
9185

win/CS/HandBrakeWPF/App.xaml.cs

-8
Original file line numberDiff line numberDiff line change
@@ -65,14 +65,6 @@ private void Init(StartupEventArgs e)
6565
return;
6666
}
6767

68-
// We don't support Windows earlier than 10.
69-
if (!SystemInfo.IsWindows10OrLater())
70-
{
71-
MessageBox.Show(HandBrakeWPF.Properties.Resources.OsVersionWarning, HandBrakeWPF.Properties.Resources.Warning, MessageBoxButton.OK, MessageBoxImage.Warning);
72-
Application.Current.Shutdown();
73-
return;
74-
}
75-
7668
if (!Environment.Is64BitOperatingSystem)
7769
{
7870
MessageBox.Show(HandBrakeWPF.Properties.Resources.OsBitnessWarning, HandBrakeWPF.Properties.Resources.Warning, MessageBoxButton.OK, MessageBoxImage.Warning);

0 commit comments

Comments
 (0)