chore: Update build configurations for Linux, macOS, and Windows

This commit is contained in:
Mauro Balades
2024-08-01 15:08:54 +02:00
parent 2c0b34e666
commit 349b33c115
3 changed files with 15 additions and 12 deletions

View File

@@ -26,10 +26,8 @@ fi
if test "$SURFER_COMPAT" = "1"; then
# Build for linux-i686
ac_add_options --target=i686-pc-linux
else
# Build for linux-x86_64
# Dont' declare, let's build with default target
# ac_add_options --target=x86_64-pc-linux
fi
# Build for linux-x86_64
# Dont' declare, let's build with default target
# ac_add_options --target=x86_64-pc-linux

View File

@@ -7,11 +7,9 @@ export MOZ_MACBUNDLE_ID=${appId}
export MOZ_MACBUNDLE_NAME="Zen Browser.app"
if test "$SURFER_COMPAT" = "1"; then
# No need to declare, let's build with default target
# ac_add_options --target=i686-apple-darwin
export MOZ_PGO=1
ac_add_options MOZ_PGO=1
ac_add_options --target=x86_64-apple-darwin
else
ac_add_options --target=aarch64-apple-darwin
fi

View File

@@ -1,5 +1,6 @@
if test "$ZEN_CROSS_COMPILING"; then
export WINSYSROOT="$(echo ~)/win-cross/vs2022"
export MIDL="$(echo ~)/win-cross/wine/bin/widl"
@@ -8,7 +9,11 @@ if test "$ZEN_CROSS_COMPILING"; then
#? https://bugzilla.mozilla.org/show_bug.cgi?id=1617793
#? https://phabricator.services.mozilla.com/D170170
ac_add_options --target=x86_64-pc-windows-msvc
if test "$SURFER_COMPAT" = "1"; then
ac_add_options --target=i686-pc-windows-msvc
else
ac_add_options --target=x86_64-pc-windows-msvc
fi
export MOZ_STUB_INSTALLER=1
export MOZ_PKG_FORMAT=TAR
@@ -17,13 +22,15 @@ if test "$ZEN_CROSS_COMPILING"; then
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"
#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"
fi
ac_add_options --disable-maintenance-service