VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Build/build_veracrypt_macosx.sh
diff options
context:
space:
mode:
Diffstat (limited to 'src/Build/build_veracrypt_macosx.sh')
-rwxr-xr-xsrc/Build/build_veracrypt_macosx.sh26
1 files changed, 16 insertions, 10 deletions
diff --git a/src/Build/build_veracrypt_macosx.sh b/src/Build/build_veracrypt_macosx.sh
index 0198bd37..5319fa6a 100755
--- a/src/Build/build_veracrypt_macosx.sh
+++ b/src/Build/build_veracrypt_macosx.sh
@@ -55,22 +55,27 @@ if [ -n "$brew" ]; then
exit 0
fi
-# Check if wxWidgets-3.2.5 exists in PARENTDIR; if not, use /tmp
-if [ ! -d "$PARENTDIR/wxWidgets-3.2.5" ]; then
+# Check the condition of wxBuildConsole and wxWidgets-3.2.5 in the original PARENTDIR
+if [ -d "$PARENTDIR/wxBuildConsole" ]; then
+ echo "Using existing PARENTDIR: $PARENTDIR, wxBuildConsole is present."
+elif [ -d "$PARENTDIR/wxWidgets-3.2.5" ]; then
+ echo "Using existing PARENTDIR: $PARENTDIR, wxWidgets-3.2.5 is present."
+else
+ # Change PARENTDIR to /tmp and check conditions again
export PARENTDIR="/tmp"
+ if [ -d "$PARENTDIR/wxBuildConsole" ]; then
+ echo "Switched to PARENTDIR: /tmp, wxBuildConsole is present in /tmp."
+ elif [ -d "$PARENTDIR/wxWidgets-3.2.5" ]; then
+ echo "Switched to PARENTDIR: /tmp, wxWidgets-3.2.5 is present in /tmp."
+ else
+ echo "Error: Neither wxBuildConsole nor wxWidgets-3.2.5 found in /tmp. Exiting."
+ exit 1
+ fi
fi
# The sources of wxWidgets 3.2.5 must be extracted to the parent directory
export WX_ROOT=$PARENTDIR/wxWidgets-3.2.5
-# Exit with error if wxWidgets is not found
-if [ ! -d "$WX_ROOT" ]; then
- echo "Error: wxWidgets-3.2.5 not found in either the default PARENTDIR or /tmp. Exiting."
- exit 1
-fi
-
-echo "Using wxWidgets sources in $WX_ROOT"
-
# this will be the temporary wxWidgets directory
export WX_BUILD_DIR=$PARENTDIR/wxBuild-3.2.5
@@ -86,6 +91,7 @@ echo "Building VeraCrypt"
if [ -L "${WX_BUILD_DIR}/wx-config" ]; then
echo "wx-config already exists in ${WX_BUILD_DIR}. Skipping wxbuild."
else
+ echo "Using wxWidgets sources in $WX_ROOT"
make WXSTATIC=FULL wxbuild || exit 1
fi
make WXSTATIC=FULL clean || exit 1