From 96520e22bd3cb44411d7d096473ac048d5855f9d Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Thu, 6 Aug 2015 05:57:24 +0200 Subject: Linux: modify official build script to use different build directories for wxWidgets console and GUI builds. --- src/Build/build_veracrypt_linux.sh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/src/Build/build_veracrypt_linux.sh b/src/Build/build_veracrypt_linux.sh index bc4b84f7..0d2dd82a 100755 --- a/src/Build/build_veracrypt_linux.sh +++ b/src/Build/build_veracrypt_linux.sh @@ -24,13 +24,24 @@ fi export WX_ROOT=$PARENTDIR/wxWidgets-3.0.2 echo "Using wxWidgets sources in $WX_ROOT" -# this will be the temporary wxWidgets directory -export WX_BUILD_DIR=$PARENTDIR/wxBuild - cd $SOURCEPATH echo "Building GUI version of VeraCrypt" + +# this will be the temporary wxWidgets directory +export WX_BUILD_DIR=$PARENTDIR/wxBuildGui + make WXSTATIC=1 wxbuild && make WXSTATIC=1 clean && make WXSTATIC=1 +# Uncomment below and comment line above to reuse existing wxWidgets build +# make WXSTATIC=1 clean && make WXSTATIC=1 + echo "Building console version of VeraCrypt" + +# this will be the temporary wxWidgets directory +export WX_BUILD_DIR=$PARENTDIR/wxBuildConsole + make WXSTATIC=1 NOGUI=1 wxbuild && make WXSTATIC=1 NOGUI=1 clean && make WXSTATIC=1 NOGUI=1 + +# Uncomment below and comment line above to reuse existing wxWidgets build +# make WXSTATIC=1 NOGUI=1 clean && make WXSTATIC=1 NOGUI=1 -- cgit v1.2.3