wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-10-04 06:17:30 +09:00
Code Issues Projects Releases Packages Wiki Activity

Fix installer

Browse source
This commit is contained in:
K4sum1 2025-03-24 14:52:09 -07:00
commit ce73865643
8 changed files with 18 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
application/basilisk/installer/windows/nsis/defines.nsi.in
View file

@ -43,10 +43,10 @@
#ifdef HAVE_64BIT_BUILD #ifdef HAVE_64BIT_BUILD
!define HAVE_64BIT_BUILD !define HAVE_64BIT_BUILD
!define ARCH "x64" !define ARCH "x64"
!define MinSupportedVer "Microsoft Windows 7 x64" !define MinSupportedVer "Microsoft Windows XP x64"
#else #else
!define ARCH "x86" !define ARCH "x86"
!define MinSupportedVer "Microsoft Windows XP SP2" !define MinSupportedVer "Microsoft Windows XP"
#endif #endif
!define MinSupportedCPU "SSE2" !define MinSupportedCPU "SSE2"

6
application/basilisk/installer/windows/nsis/installer.nsi
View file

@ -1042,10 +1042,8 @@ Function .onInit
; SSE2 instruction set is available. ; SSE2 instruction set is available.
System::Call "kernel32::IsProcessorFeaturePresent(i 10)i .R7" System::Call "kernel32::IsProcessorFeaturePresent(i 10)i .R7"
!ifdef HAVE_64BIT_BUILD ; Windows NT 5.0 and lower are not supported on any architecture.
; Restrict x64 builds from being installed on x86 and pre Win7 ${Unless} ${AtLeastWinXP}
${Unless} ${RunningX64}
${OrUnless} ${AtLeastWin7}
${If} "$R7" == "0" ${If} "$R7" == "0"
strCpy $R7 "$(WARN_MIN_SUPPORTED_OSVER_CPU_MSG)" strCpy $R7 "$(WARN_MIN_SUPPORTED_OSVER_CPU_MSG)"
${Else} ${Else}

3
application/palemoon/installer/Makefile.in
View file

@ -60,6 +60,9 @@ DEFINES += -DMOZ_ANGLE_RENDERER=$(MOZ_ANGLE_RENDERER)
ifdef MOZ_D3DCOMPILER_VISTA_DLL ifdef MOZ_D3DCOMPILER_VISTA_DLL
DEFINES += -DMOZ_D3DCOMPILER_VISTA_DLL=$(MOZ_D3DCOMPILER_VISTA_DLL) DEFINES += -DMOZ_D3DCOMPILER_VISTA_DLL=$(MOZ_D3DCOMPILER_VISTA_DLL)
endif endif
ifdef MOZ_D3DCOMPILER_XP_DLL
DEFINES += -DMOZ_D3DCOMPILER_XP_DLL=$(MOZ_D3DCOMPILER_XP_DLL)
endif
endif endif
DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME) DEFINES += -DMOZ_CHILD_PROCESS_NAME=$(MOZ_CHILD_PROCESS_NAME)

4
application/palemoon/installer/package-manifest.in
View file

@ -174,6 +174,10 @@
#ifdef MOZ_D3DCOMPILER_VISTA_DLL #ifdef MOZ_D3DCOMPILER_VISTA_DLL
@BINPATH@/@MOZ_D3DCOMPILER_VISTA_DLL@ @BINPATH@/@MOZ_D3DCOMPILER_VISTA_DLL@
#endif #endif
#ifdef MOZ_D3DCOMPILER_XP_DLL
@BINPATH@/@MOZ_D3DCOMPILER_XP_DLL@
#endif
#endif # MOZ_ANGLE_RENDERER #endif # MOZ_ANGLE_RENDERER
; [Browser Chrome Files] ; [Browser Chrome Files]

4
application/palemoon/installer/windows/nsis/defines.nsi.in
View file

@ -43,10 +43,10 @@
#ifdef HAVE_64BIT_BUILD #ifdef HAVE_64BIT_BUILD
!define HAVE_64BIT_BUILD !define HAVE_64BIT_BUILD
!define ARCH "x64" !define ARCH "x64"
!define MinSupportedVer "Microsoft Windows 7 x64" !define MinSupportedVer "Microsoft Windows XP x64"
#else #else
!define ARCH "x86" !define ARCH "x86"
!define MinSupportedVer "Microsoft Windows 7" !define MinSupportedVer "Microsoft Windows XP"
#endif #endif
!define MinSupportedCPU "SSE2" !define MinSupportedCPU "SSE2"

4
application/palemoon/installer/windows/nsis/installer.nsi
View file

@ -1036,8 +1036,8 @@ Function .onInit
; SSE2 instruction set is available. Result returned in $R7. ; SSE2 instruction set is available. Result returned in $R7.
System::Call "kernel32::IsProcessorFeaturePresent(i 10)i .R7" System::Call "kernel32::IsProcessorFeaturePresent(i 10)i .R7"
; Windows NT 6.0 and lower are not supported on any architecture. ; Windows NT 5.0 and lower are not supported on any architecture.
${Unless} ${AtLeastWin7} ${Unless} ${AtLeastWinXP}
${If} "$R7" == "0" ${If} "$R7" == "0"
strCpy $R7 "$(WARN_MIN_SUPPORTED_OSVER_CPU_MSG)" strCpy $R7 "$(WARN_MIN_SUPPORTED_OSVER_CPU_MSG)"
${Else} ${Else}

6
build/moz.configure/windows.configure
View file

@ -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 # 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 # is, however, supposed to be a reduced install of the SDK 10
# with the UCRT. # with the UCRT.
if version != 'include': #if version != 'include':
sdks[d] = Version(version), sdk sdks[d] = Version(version), sdk
continue continue
if d == windows_sdk_dir_env: if d == windows_sdk_dir_env:
# When WINDOWSSDKDIR is set in the environment and we can't find the # 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 # Universal CRT SDK, chances are this is a start-shell-msvc*.bat

4
old-configure.in
View file

@ -3233,9 +3233,6 @@ if test -n "$MOZ_ANGLE_RENDERER"; then
###################################### ######################################
# Find _43 for use by XP. # 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. # Get the SDK path from the registry.
# First try to get the June 2010 SDK # 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` 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 else
AC_MSG_RESULT([Couldn't find an acceptable DirectX SDK for ANGLE, needed for d3dcompiler_43.]) AC_MSG_RESULT([Couldn't find an acceptable DirectX SDK for ANGLE, needed for d3dcompiler_43.])
fi fi
fi
###################################### ######################################
# Check that we found what we needed. # Check that we found what we needed.