mirrors/desktop
1
0
Fork 0
mirror of https://github.com/zen-browser/desktop.git synced 2025-09-05 19:08:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Update Windows build configuration for compatibility with x32 architecture

Browse Source
This commit is contained in:
Mauro Balades
2024-08-01 18:10:47 +02:00
parent 5bbbefb2a7
commit 81f88c2c21
2 changed files with 39 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
configs/common/mozconfig
View File

@@ -33,7 +33,7 @@ if test "$ZEN_RELEASE"; then
ac_add_options --disable-tests
ac_add_options --disable-jprof
if test "$ZEN_CROSS_COMPILING"; then
if ! test "$ZEN_CROSS_COMPILING"; then
# TODO: Should actually be "not on windows"
ac_add_options --enable-install-strip
ac_add_options --enable-strip

75
configs/windows/mozconfig
View File

@@ -1,37 +1,38 @@
if test "$ZEN_CROSS_COMPILING"; then
export WINSYSROOT="$(echo ~)/win-cross/vs2022"
export MIDL="$(echo ~)/win-cross/wine/bin/widl"
export WINE="$(echo ~)/win-cross/wine/bin/wine64"
export WINEDEBUG=-all
export MOZ_STUB_INSTALLER=1
export MOZ_PKG_FORMAT=TAR
export CROSS_BUILD=1
CROSS_COMPILE=1
TOOLS=$(echo ~)/win-cross
#export WIN32_REDIST_DIR="$TOOLS"/vs2022/VC/Redist/MSVC/14.34.31931/x64/Microsoft.VC143.CRT
#export WIN_UCRT_REDIST_DIR="$TOOLS/vs2022/Windows Kits/10/Redist/10.0.22621.0/ucrt/DLLs/x64"
export MIDL="$TOOLS/wine/bin/widl"
export MOZ_INCLUDE_SOURCE_INFO=1
export MOZ_STUB_INSTALLER=1
export WINEDEBUG=-all
export WINE="$TOOLS/wine/bin/wine64"
fi
#? https://bugzilla.mozilla.org/show_bug.cgi?id=1617793
#? https://phabricator.services.mozilla.com/D170170
if test "$SURFER_COMPAT" = "true"; then
ac_add_options --target=i686-pc-windows-msvc
else
ac_add_options --target=x86_64-pc-windows-msvc
fi
ac_add_options --disable-maintenance-service
ac_add_options --disable-bits-download
if test "$ZEN_CROSS_COMPILING"; then
export WINSYSROOT="$(echo ~)/win-cross/vs2022"
export MIDL="$(echo ~)/win-cross/wine/bin/widl"
export WINE="$(echo ~)/win-cross/wine/bin/wine64"
export WINEDEBUG=-all
export MOZ_STUB_INSTALLER=1
export MOZ_PKG_FORMAT=TAR
export CROSS_BUILD=1
CROSS_COMPILE=1
TOOLS=$(echo ~)/win-cross
#export WIN32_REDIST_DIR="$TOOLS"/vs2022/VC/Redist/MSVC/14.34.31931/x64/Microsoft.VC143.CRT
#export WIN_UCRT_REDIST_DIR="$TOOLS/vs2022/Windows Kits/10/Redist/10.0.22621.0/ucrt/DLLs/x64"
export MIDL="$TOOLS/wine/bin/widl"
export MOZ_INCLUDE_SOURCE_INFO=1
export MOZ_STUB_INSTALLER=1
export WINEDEBUG=-all
export WINE="$TOOLS/wine/bin/wine64"
fi
#? https://bugzilla.mozilla.org/show_bug.cgi?id=1617793
#? https://phabricator.services.mozilla.com/D170170
if test "$SURFER_COMPAT" = "true"; then
ac_add_options --target=i686-pc-windows-msvc
else
ac_add_options --target=x86_64-pc-windows-msvc
fi
ac_add_options --disable-maintenance-service
ac_add_options --disable-bits-download