From ce7386564363652166aeadbc1e6f627484e59089 Mon Sep 17 00:00:00 2001 From: K4sum1 Date: Mon, 24 Mar 2025 14:52:09 -0700 Subject: [PATCH] Fix installer --- application/basilisk/installer/windows/nsis/defines.nsi.in | 4 ++-- application/basilisk/installer/windows/nsis/installer.nsi | 6 ++---- application/palemoon/installer/Makefile.in | 3 +++ application/palemoon/installer/package-manifest.in | 4 ++++ application/palemoon/installer/windows/nsis/defines.nsi.in | 4 ++-- application/palemoon/installer/windows/nsis/installer.nsi | 4 ++-- build/moz.configure/windows.configure | 6 +++--- old-configure.in | 4 ---- 8 files changed, 18 insertions(+), 17 deletions(-) diff --git a/application/basilisk/installer/windows/nsis/defines.nsi.in b/application/basilisk/installer/windows/nsis/defines.nsi.in index 451aea2385..d431043075 100644 --- a/application/basilisk/installer/windows/nsis/defines.nsi.in +++ b/application/basilisk/installer/windows/nsis/defines.nsi.in @@ -43,10 +43,10 @@ #ifdef HAVE_64BIT_BUILD !define HAVE_64BIT_BUILD !define ARCH "x64" -!define MinSupportedVer "Microsoft Windows 7 x64" +!define MinSupportedVer "Microsoft Windows XP x64" #else !define ARCH "x86" -!define MinSupportedVer "Microsoft Windows XP SP2" +!define MinSupportedVer "Microsoft Windows XP" #endif !define MinSupportedCPU "SSE2" diff --git a/application/basilisk/installer/windows/nsis/installer.nsi b/application/basilisk/installer/windows/nsis/installer.nsi index 3c36672795..de11975113 100644 --- a/application/basilisk/installer/windows/nsis/installer.nsi +++ b/application/basilisk/installer/windows/nsis/installer.nsi @@ -1042,10 +1042,8 @@ Function .onInit ; SSE2 instruction set is available. System::Call "kernel32::IsProcessorFeaturePresent(i 10)i .R7" -!ifdef HAVE_64BIT_BUILD - ; Restrict x64 builds from being installed on x86 and pre Win7 - ${Unless} ${RunningX64} - ${OrUnless} ${AtLeastWin7} + ; Windows NT 5.0 and lower are not supported on any architecture. + ${Unless} ${AtLeastWinXP} ${If} "$R7" == "0" strCpy $R7 "$(WARN_MIN_SUPPORTED_OSVER_CPU_MSG)" ${Else} diff --git a/application/palemoon/installer/Makefile.in b/application/palemoon/installer/Makefile.in index 0547108488..bd765b4e20 100644 --- a/application/palemoon/installer/Makefile.in +++ b/application/palemoon/installer/Makefile.in @@ -60,6 +60,9 @@ DEFINES += -DMOZ_ANGLE_RENDERER=$(MOZ_ANGLE_RENDERER) ifdef MOZ_D3DCOMPILER_VISTA_DLL DEFINES += -DMOZ_D3DCOMPILER_VISTA_DLL=$(MOZ_D3DCOMPILER_VISTA_DLL) endif +ifdef MOZ_D3DCOMPILER_XP_DLL +DEFINES += -DMOZ_D3DCOMPILER_XP_DLL=$(MOZ_D3DCOMPILER_XP_DLL) +endif endif DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME) diff --git a/application/palemoon/installer/package-manifest.in b/application/palemoon/installer/package-manifest.in index 49f98bfd07..87fd7aa6b9 100644 --- a/application/palemoon/installer/package-manifest.in +++ b/application/palemoon/installer/package-manifest.in @@ -174,6 +174,10 @@ #ifdef MOZ_D3DCOMPILER_VISTA_DLL @BINPATH@/@MOZ_D3DCOMPILER_VISTA_DLL@ #endif + +#ifdef MOZ_D3DCOMPILER_XP_DLL +@BINPATH@/@MOZ_D3DCOMPILER_XP_DLL@ +#endif #endif # MOZ_ANGLE_RENDERER ; [Browser Chrome Files] diff --git a/application/palemoon/installer/windows/nsis/defines.nsi.in b/application/palemoon/installer/windows/nsis/defines.nsi.in index 1764b10c40..c6b9820353 100644 --- a/application/palemoon/installer/windows/nsis/defines.nsi.in +++ b/application/palemoon/installer/windows/nsis/defines.nsi.in @@ -43,10 +43,10 @@ #ifdef HAVE_64BIT_BUILD !define HAVE_64BIT_BUILD !define ARCH "x64" -!define MinSupportedVer "Microsoft Windows 7 x64" +!define MinSupportedVer "Microsoft Windows XP x64" #else !define ARCH "x86" -!define MinSupportedVer "Microsoft Windows 7" +!define MinSupportedVer "Microsoft Windows XP" #endif !define MinSupportedCPU "SSE2" diff --git a/application/palemoon/installer/windows/nsis/installer.nsi b/application/palemoon/installer/windows/nsis/installer.nsi index 9f61c9cbb1..66f341ab74 100644 --- a/application/palemoon/installer/windows/nsis/installer.nsi +++ b/application/palemoon/installer/windows/nsis/installer.nsi @@ -1036,8 +1036,8 @@ Function .onInit ; SSE2 instruction set is available. Result returned in $R7. System::Call "kernel32::IsProcessorFeaturePresent(i 10)i .R7" - ; Windows NT 6.0 and lower are not supported on any architecture. - ${Unless} ${AtLeastWin7} + ; Windows NT 5.0 and lower are not supported on any architecture. + ${Unless} ${AtLeastWinXP} ${If} "$R7" == "0" strCpy $R7 "$(WARN_MIN_SUPPORTED_OSVER_CPU_MSG)" ${Else} diff --git a/build/moz.configure/windows.configure b/build/moz.configure/windows.configure index 4d429f32da..048b46eebe 100644 --- a/build/moz.configure/windows.configure +++ b/build/moz.configure/windows.configure @@ -193,9 +193,9 @@ def valid_ucrt_sdk_dir(windows_sdk_dir, windows_sdk_dir_env): # contain the Universal CRT SDK. When the main SDK is 8.1, there # is, however, supposed to be a reduced install of the SDK 10 # with the UCRT. - if version != 'include': - sdks[d] = Version(version), sdk - continue + #if version != 'include': + sdks[d] = Version(version), sdk + continue if d == windows_sdk_dir_env: # When WINDOWSSDKDIR is set in the environment and we can't find the # Universal CRT SDK, chances are this is a start-shell-msvc*.bat diff --git a/old-configure.in b/old-configure.in index eb3439de48..b0f4992d22 100644 --- a/old-configure.in +++ b/old-configure.in @@ -3233,9 +3233,6 @@ if test -n "$MOZ_ANGLE_RENDERER"; then ###################################### # Find _43 for use by XP. - if test "$HAVE_64BIT_BUILD"; then - AC_MSG_RESULT([We are building a 64-bit binary, skip checking d3dcompiler_43.]) - else # Get the SDK path from the registry. # First try to get the June 2010 SDK MOZ_DIRECTX_SDK_REG_KEY=`reg query 'HKLM\Software\Microsoft\DirectX' //s | grep 'Microsoft DirectX SDK (June 2010)' | head -n 1` @@ -3283,7 +3280,6 @@ if test -n "$MOZ_ANGLE_RENDERER"; then else AC_MSG_RESULT([Couldn't find an acceptable DirectX SDK for ANGLE, needed for d3dcompiler_43.]) fi - fi ###################################### # Check that we found what we needed.