VeraCrypt
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2024-06-16 15:28:33 +0200
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2024-06-16 15:28:33 +0200
commite4e83d30c15c2a261d9e6c652a7a6604edee11a0 (patch)
treeb7cd901d47e614d8d9c72b4ddb6851b327546f11
parent978ebe669351e6fbd8da6c1195878bb805cd674f (diff)
downloadVeraCrypt-e4e83d30c15c2a261d9e6c652a7a6604edee11a0.tar.gz
VeraCrypt-e4e83d30c15c2a261d9e6c652a7a6604edee11a0.zip
MacOSX: Use wxWidgets 3.2.5. Detect SDK version dynamically. Remove unused "r" getopts option.
-rwxr-xr-xsrc/Build/build_veracrypt_macosx.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/Build/build_veracrypt_macosx.sh b/src/Build/build_veracrypt_macosx.sh
index 74fe5d93..687da160 100755
--- a/src/Build/build_veracrypt_macosx.sh
+++ b/src/Build/build_veracrypt_macosx.sh
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
#
-# Copyright (c) 2013-2019 IDRIX
+# Copyright (c) 2013-2024 IDRIX
# Governed by the Apache License 2.0 the full text of which is contained
# in the file License.txt included in VeraCrypt binary and source
# code distribution packages.
@@ -14,7 +14,7 @@ SOURCEPATH=$(cd "$(dirname "$SCRIPTPATH/../.")"; pwd)
# directory where the VeraCrypt project has been checked out
PARENTDIR=$(cd "$(dirname "$SCRIPTPATH/../../../.")"; pwd)
-while getopts bpr flag
+while getopts bp flag
do
case "${flag}" in
b) brew=true;;
@@ -45,16 +45,16 @@ if [ -n "$brew" ]; then
exit 0
fi
-# the sources of wxWidgets 3.1.2 must be extracted to the parent directory (for night mode)
-export WX_ROOT=$PARENTDIR/wxWidgets-3.2.2.1
+# the sources of wxWidgets 3.2.5 must be extracted to the parent directory (for night mode)
+export WX_ROOT=$PARENTDIR/wxWidgets-3.2.5
echo "Using wxWidgets sources in $WX_ROOT"
# this will be the temporary wxWidgets directory
-export WX_BUILD_DIR=$PARENTDIR/wxBuild-3.2.2.1
+export WX_BUILD_DIR=$PARENTDIR/wxBuild-3.2.5
# define the SDK version to use and OSX minimum target. We target 12 by default
export VC_OSX_TARGET=12
-export VC_OSX_SDK=13
+export VC_OSX_SDK=$(xcrun --show-sdk-version) #use the latest version installed
echo "Using MacOSX SDK $VC_OSX_SDK with target set to $VC_OSX_TARGET"
cd $SOURCEPATH