From 21487146514341eb72ec2728ce474b088c945b11 Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Wed, 26 Jun 2024 02:29:22 +0200 Subject: Linux/FreeBSD: Update build scripts: use wxwidgets 3.2.5, drop explicit GTK3 config since it detected automatically We also update copyrights date --- src/Build/build_cmake_opensuse.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/Build/build_cmake_opensuse.sh') diff --git a/src/Build/build_cmake_opensuse.sh b/src/Build/build_cmake_opensuse.sh index 622eb4cd..52bed78a 100644 --- a/src/Build/build_cmake_opensuse.sh +++ b/src/Build/build_cmake_opensuse.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# Copyright (c) 2013-2022 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. @@ -18,8 +18,8 @@ export SOURCEPATH=$(readlink -f "$SCRIPTPATH/..") # Directory where the VeraCrypt has been checked out export PARENTDIR=$(readlink -f "$SCRIPTPATH/../../..") -# The sources of wxWidgets 3.2.2.1 must be extracted to the parent directory -export WX_ROOT=$PARENTDIR/wxWidgets-3.2.2.1 +# The sources of wxWidgets 3.2.5 must be extracted to the parent directory +export WX_ROOT=$PARENTDIR/wxWidgets-3.2.5 echo "Using wxWidgets sources in $WX_ROOT" cd $SOURCEPATH @@ -29,7 +29,7 @@ echo "Building GUI version of VeraCrypt for RPM using wxWidgets static libraries # This will be the temporary wxWidgets directory export WX_BUILD_DIR=$PARENTDIR/wxBuildGui -# To build wxWidgets using GTK-2 +# To build wxWidgets using native GTK version make WXSTATIC=1 wxbuild || exit 1 ln -s $WX_BUILD_DIR/lib $WX_BUILD_DIR/lib64 make WXSTATIC=1 clean || exit 1 @@ -50,7 +50,7 @@ echo "Building console version of VeraCrypt for RPM using wxWidgets static libra # This will be the temporary wxWidgets directory export WX_BUILD_DIR=$PARENTDIR/wxBuildConsole -# To build wxWidgets using GTK-2 +# To build wxWidgets using native GTK version make WXSTATIC=1 NOGUI=1 wxbuild || exit 1 ln -s $WX_BUILD_DIR/lib $WX_BUILD_DIR/lib64 make WXSTATIC=1 NOGUI=1 clean || exit 1 @@ -70,8 +70,8 @@ echo "Creating VeraCrypt RPM packages " mkdir -p $PARENTDIR/VeraCrypt_Packaging/GUI mkdir -p $PARENTDIR/VeraCrypt_Packaging/Console -# wxWidgets was built using GTK-2 -cmake -H$SCRIPTPATH -B$PARENTDIR/VeraCrypt_Packaging/GUI -DVERACRYPT_BUILD_DIR="$PARENTDIR/VeraCrypt_Setup/GUI" -DWITHGTK3=FALSE -DNOGUI=FALSE || exit 1 +# wxWidgets was built using native GTK version +cmake -H$SCRIPTPATH -B$PARENTDIR/VeraCrypt_Packaging/GUI -DVERACRYPT_BUILD_DIR="$PARENTDIR/VeraCrypt_Setup/GUI" -DNOGUI=FALSE || exit 1 cpack --config $PARENTDIR/VeraCrypt_Packaging/GUI/CPackConfig.cmake || exit 1 -cmake -H$SCRIPTPATH -B$PARENTDIR/VeraCrypt_Packaging/Console -DVERACRYPT_BUILD_DIR="$PARENTDIR/VeraCrypt_Setup/Console" -DWITHGTK3=FALSE -DNOGUI=TRUE || exit 1 +cmake -H$SCRIPTPATH -B$PARENTDIR/VeraCrypt_Packaging/Console -DVERACRYPT_BUILD_DIR="$PARENTDIR/VeraCrypt_Setup/Console" -DNOGUI=TRUE || exit 1 cpack --config $PARENTDIR/VeraCrypt_Packaging/Console/CPackConfig.cmake|| exit 1 -- cgit v1.2.3