From e7f5bca0b5c6c186529a5179f6c8f7f69d88063c Mon Sep 17 00:00:00 2001
From: Mounir IDRASSI <mounir.idrassi@idrix.fr>
Date: Fri, 9 Jun 2023 20:16:49 +0200
Subject: Update compilation doc to match website version

---
 doc/html/CompilingGuidelineLinux.html | 71 +++++++++++++----------------------
 1 file changed, 27 insertions(+), 44 deletions(-)

(limited to 'doc/html/CompilingGuidelineLinux.html')

diff --git a/doc/html/CompilingGuidelineLinux.html b/doc/html/CompilingGuidelineLinux.html
index bf256b6e..842d106e 100644
--- a/doc/html/CompilingGuidelineLinux.html
+++ b/doc/html/CompilingGuidelineLinux.html
@@ -74,45 +74,34 @@ The following components are required for compiling VeraCrypt:
 	<li>GNU C/C++ Compiler</li>
 	<li>YASM 1.3.0</li>
 	<li>pkg-config</li>
-	<li>wxWidgets 3.2 shared library and header files installed or wxWidgets 3.0 library source code </li>
+	<li>wxWidgets 3.x shared library and header files installed by the system or wxWidgets 3.x library source code </li>
 	<li>FUSE library and header files</li>
 </ol>
 </div>
 
 <div class="wikidoc">
-<p>Below are the detailed procedure steps:</p>
+<p>Below are the procedure steps. Clicking on any of the link takes directly to the related step:
 <ul>
-<li><a href="#InstallationOfGNUMake">Installation of GNU Make</a></li>
-<li><a href="#InstallationOfGNUCompiler">Installation of GNU C/C++ Compiler</a></li>
-<li><a href="#InstallationOfYASM">Installation of YASM</a></li>
-<li><a href="#InstallationOfPKGConfig">Installation of pkg-config</a></li>
-<li><a href="#InstallationOfwxWidgets">Installation of wxWidgets 3.2</a></li>
-<li><a href="#InstallationOfFuse">Installation of libfuse</a></li>
-<li><a href="#DownloadVeraCrypt">Download VeraCrypt</a></li>
-<li><a href="#CompileVeraCrypt">Compile VeraCrypt</a></li>
+<li><strong><a href="#InstallationOfGNUMake">Installation of GNU Make</a></li></strong>
+<li><strong><a href="#InstallationOfGNUCompiler">Installation of GNU C/C++ Compiler</a></li></strong>
+<li><strong><a href="#InstallationOfYASM">Installation of YASM</a></li></strong>
+<li><strong><a href="#InstallationOfPKGConfig">Installation of pkg-config</a></li></strong>
+<li><strong><a href="#InstallationOfwxWidgets">Installation of wxWidgets 3.2</a></li></strong>
+<li><strong><a href="#InstallationOfFuse">Installation of libfuse</a></li></strong>
+<li><strong><a href="#DownloadVeraCrypt">Download VeraCrypt</a></li></strong>
+<li><strong><a href="#CompileVeraCrypt">Compile VeraCrypt</a></li></strong>
 </ul>
-<p>They can also be performed by running the below list of commands in a terminal or by copying them to a script:</p>
+</p>
+<p>They can also be performed by running the below list of commands in a terminal or by copying them to a script:<br>
 <code>
 sudo apt update <br>
-sudo apt install -y build-essential yasm pkg-config libgtk-3-dev <br>
-wget https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.0/wxWidgets-3.2.0.tar.bz2 <br>
-tar -xf wxWidgets-3.2.0.tar.bz2 <br>
-cd wxWidgets-3.2.0 <br>
-mkdir gtk-build <br>
-cd gtk-build <br>
-../configure <br>
-make <br>
-sudo make install <br>
-sudo ldconfig <br>
-cd ../.. <br>
-rm -r wxWidgets-3.2.0 <br>
-rm wxWidgets-3.2.0.tar.bz2 <br>
+sudo apt install -y build-essential yasm pkg-config libwxgtk3.0-gtk3-dev <br>
 sudo apt install -y libfuse-dev git <br>
-git clone https://github.com/veracrypt/VeraCrypt.git
+git clone https://github.com/veracrypt/VeraCrypt.git <br>
 cd ~/VeraCrypt/src <br>
 make
 </code>
-<p>
+</p>
 </div>
 
 <div class="wikidoc">
@@ -207,18 +196,8 @@ make
 			<li>
 				Execute the following commands: <br>
 				<code>		
-				sudo apt install libgtk-3-dev <br>
-				wget https://github.com/wxWidgets/wxWidgets/releases/download/v3.2.0/wxWidgets-3.2.0.tar.bz2 <br>
-				tar -xf wxWidgets-3.2.0.tar.bz2 <br>
-				cd wxWidgets-3.2.0 <br>
-				mkdir gtk-build <br>
-				cd gtk-build <br>
-				../configure <br>
-				make <br>
-				sudo make install <br>
-				sudo ldconfig <br>
-				cd ../.. <br>
-				rm -r wxWidgets-3.2.0 <br>
+				sudo apt update <br>
+				sudo apt install libwxgtk3.0-gtk3-dev <br>
 				</code>
 			</li>
 		</ol>
@@ -273,15 +252,19 @@ make
     <p> Remarks: <br>
 	<ul>
 		<li>
-			If you have not installed wxWidgets like described here, you may have to modify the make statement to reference to the right file: <br>
-			<code>make WXSTATIC=1</code>
+			By default, a universal executable supporting both graphical and text user interface (through the switch --text) is built. <br>
+			On Linux, a console-only executable, which requires no GUI library, can be built using the 'NOGUI' parameter. <br>
+			For that, you need to dowload wxWidgets sources, extract them to a location of your choice and then run the following commands: <br>
+			<code>
+			make NOGUI=1 WXSTATIC=1 WX_ROOT=/path/to/wxWidgetsSources wxbuild <br>
+			make NOGUI=1 WXSTATIC=1 WX_ROOT=/path/to/wxWidgetsSources
+			</code>
 		</li>
 		<li>
-			By default, a universal executable supporting both graphical and text user interface (through the switch --text) is built. <br>
-			On Linux, a console-only executable, which requires no GUI library, can be built using the 'NOGUI' parameter: <br>
+			If you are not using the system wxWidgets library, you will have to download and use wxWidgets sources like the remark above but this time the following commands should be run to build GUI version of VeraCrypt (NOGUI is not specified): <br>
 			<code>
-			make NOGUI=1 WXSTATIC=1 WX_ROOT=/usr/src/wxWidgets wxbuild <br>
-			make NOGUI=1 WXSTATIC=1
+			make WXSTATIC=1 WX_ROOT=/path/to/wxWidgetsSources wxbuild <br>
+			make WXSTATIC=1 WX_ROOT=/path/to/wxWidgetsSources
 			</code>
 		</li>
 	</ul>
-- 
cgit v1.2.3