Update compilation doc to match website version

author: Mounir IDRASSI <mounir.idrassi@idrix.fr> 2023-06-09 20:16:49 +0200
committer: Mounir IDRASSI <mounir.idrassi@idrix.fr> 2023-06-09 20:16:49 +0200
commit: e7f5bca0b5c6c186529a5179f6c8f7f69d88063c (patch)
tree: 79487cb471f8ecf688a7cbe5f5ffe869403de289 /doc/html
parent: 9d9a73d4eb4ac96e6d5f0093692bb8ba3d448ca3 (diff)
download: VeraCrypt-e7f5bca0b5c6c186529a5179f6c8f7f69d88063c.tar.gz
VeraCrypt-e7f5bca0b5c6c186529a5179f6c8f7f69d88063c.zip
3 files changed, 59 insertions, 75 deletions
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>
diff --git a/doc/html/CompilingGuidelineWin.html b/doc/html/CompilingGuidelineWin.html
index a7508166..b7419a51 100644
--- a/doc/html/CompilingGuidelineWin.html
+++ b/doc/html/CompilingGuidelineWin.html
@@ -91,29 +91,29 @@ The following components are required for compiling VeraCrypt:
 </div>
 
 <div class="wikidoc">
-<p>Below are the procedure steps:</p> 
+Below are the procedure steps. Clicking on any of the link takes directly to the related step:
 <ul>
-<li><a href="#InstallationOfMicrosoftVisualStudio2010">Installation of Microsoft Visual Studio 2010</a></li>
-<li><a href="#InstallationOfMicrosoftVisualStudio2010ServicePack1">Installation of Microsoft Visual Studio 2010 Service Pack 1</a></li>
-<li><a href="#InstallationOfNASM">Installation of NASM</a></li>
-<li><a href="#InstallationOfYASM">Installation of YASM</a></li>
-<li><a href="#InstallationOfVisualC++">Installation of Microsoft Visual C++ 1.52</a></li>
-<li><a href="#InstallationOfWindowsSDK71++">Installation of the Windows SDK 7.1</a></li>
-<li><a href="#InstallationOfWDK71++">Installation of the Windows Driver Kit 7.1</a></li>
-<li><a href="#InstallationOfSDK81++">Installation of the Windows 8.1 SDK</a></li>
-<li><a href="#InstallationOfGzip">Installation of gzip</a></li>
-<li><a href="#InstallationOfUpx">Installation of upx</a></li>
-<li><a href="#InstallationOf7zip">Installation of 7zip</a></li>
-<li><a href="#InstallationOfWix3">Installation of Wix3</a></li>
-<li><a href="#InstallationOfVS2019">Installation of Microsoft Visual Studio 2019</a></li>
-<li><a href="#InstallationOfWDK10">Installation of the Windows Driver Kit 2004</a></li>
-<li><a href="#InstallationOfVisualBuildTools">Installation of the Visual Studio build tools</a></li>
-<li><a href="#DownloadVeraCrypt">Download VeraCrypt Source Files</a></li>
-<li><a href="#CompileWin32X64">Compile the Win32/x64 Versions of VeraCrypt</a></li>
-<li><a href="#CompileARM64">Compile the ARM64 Version of VeraCrypt</a></li>
-<li><a href="#BuildVeraCryptExecutables">Build the VeraCrypt Executables</a></li>
-<li><a href="#ImportCertificates">Import the Certificates</a></li>
-<li><a href="#KnownIssues">Known Issues</a></li>
+<li><strong><a href="#InstallationOfMicrosoftVisualStudio2010">Installation of Microsoft Visual Studio 2010</a></li></strong>
+<li><strong><a href="#InstallationOfMicrosoftVisualStudio2010ServicePack1">Installation of Microsoft Visual Studio 2010 Service Pack 1</a></li></strong>
+<li><strong><a href="#InstallationOfNASM">Installation of NASM</a></li></strong>
+<li><strong><a href="#InstallationOfYASM">Installation of YASM</a></li></strong>
+<li><strong><a href="#InstallationOfVisualCPP">Installation of Microsoft Visual C++ 1.52</a></li></strong>
+<li><strong><a href="#InstallationOfWindowsSDK71PP">Installation of the Windows SDK 7.1</a></li></strong>
+<li><strong><a href="#InstallationOfWDK71PP">Installation of the Windows Driver Kit 7.1</a></li></strong>
+<li><strong><a href="#InstallationOfSDK81PP">Installation of the Windows 8.1 SDK</a></li></strong>
+<li><strong><a href="#InstallationOfGzip">Installation of gzip</a></li></strong>
+<li><strong><a href="#InstallationOfUpx">Installation of upx</a></li></strong>
+<li><strong><a href="#InstallationOf7zip">Installation of 7zip</a></li></strong>
+<li><strong><a href="#InstallationOfWix3">Installation of Wix3</a></li></strong>
+<li><strong><a href="#InstallationOfVS2019">Installation of Microsoft Visual Studio 2019</a></li></strong>
+<li><strong><a href="#InstallationOfWDK10">Installation of the Windows Driver Kit 2004</a></li></strong>
+<li><strong><a href="#InstallationOfVisualBuildTools">Installation of the Visual Studio build tools</a></li></strong>
+<li><strong><a href="#DownloadVeraCrypt">Download VeraCrypt Source Files</a></li></strong>
+<li><strong><a href="#CompileWin32X64">Compile the Win32/x64 Versions of VeraCrypt</a></li></strong>
+<li><strong><a href="#CompileARM64">Compile the ARM64 Version of VeraCrypt</a></li></strong>
+<li><strong><a href="#BuildVeraCryptExecutables">Build the VeraCrypt Executables</a></li></strong>
+<li><strong><a href="#ImportCertificates">Import the Certificates</a></li></strong>
+<li><strong><a href="#KnownIssues">Known Issues</a></li></strong>
 </ul>
 </div>
 
@@ -309,8 +309,8 @@ The following components are required for compiling VeraCrypt:
   </div>
  </div>
 
- <div class="textbox" id="InstallationOfVisualC++">
-  <a href="#InstallationOfVisualC++">Installation of Microsoft Visual C++ 1.52</a>
+ <div class="textbox" id="InstallationOfVisualCPP">
+  <a href="#InstallationOfVisualCPP">Installation of Microsoft Visual C++ 1.52</a>
   <div class="texttohide">
     <p>
 		<ol>
@@ -360,8 +360,8 @@ The following components are required for compiling VeraCrypt:
   </div>
  </div> 
  
- <div class="textbox" id="InstallationOfWindowsSDK71++">
-  <a href="#InstallationOfWindowsSDK71++">Installation of the Windows SDK 7.1</a>
+ <div class="textbox" id="InstallationOfWindowsSDK71PP">
+  <a href="#InstallationOfWindowsSDK71PP">Installation of the Windows SDK 7.1</a>
   <div class="texttohide">
     <p>
 		The installer requires .Net Framework 4 (Not a newer one like .Net Framework 4.8!). Since a newer version is already preinstalled with Windows 10, the installer has to be tricked:
@@ -442,8 +442,8 @@ The following components are required for compiling VeraCrypt:
   </div>
  </div>  
  
- <div class="textbox" id="InstallationOfWDK71++">
-  <a href="#InstallationOfWDK71++">Installation of the Windows Driver Kit 7.1</a>
+ <div class="textbox" id="InstallationOfWDK71PP">
+  <a href="#InstallationOfWDK71PP">Installation of the Windows Driver Kit 7.1</a>
   <div class="texttohide">
     <p>
 		<ol>
@@ -466,8 +466,8 @@ The following components are required for compiling VeraCrypt:
   </div>
  </div>
  
- <div class="textbox" id="InstallationOfSDK81++">
-  <a href="#InstallationOfSDK81++">Installation of the Windows 8.1 SDK</a>
+ <div class="textbox" id="InstallationOfSDK81PP">
+  <a href="#InstallationOfSDK81PP">Installation of the Windows 8.1 SDK</a>
   <div class="texttohide">
     <p>
 		<ol>
diff --git a/doc/html/CompilingGuidelines.html b/doc/html/CompilingGuidelines.html
index c4c50849..22d30d34 100644
--- a/doc/html/CompilingGuidelines.html
+++ b/doc/html/CompilingGuidelines.html
@@ -36,11 +36,12 @@
 
 <div class="wikidoc">
 <h1>Building VeraCrypt From Source</h1>
-
+<p>In order to build VeraCrypt from the source code, you can follow these step-by-step guidelines:
 <ul style="text-align:left; margin-top:18px; margin-bottom:19px; padding-top:0px; padding-bottom:0px">
 <li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="CompilingGuidelineWin.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Windows Build Guide</a>
 </li><li style="text-align:left; margin-top:0px; margin-bottom:0px; padding-top:0px; padding-bottom:0px">
 <a href="CompilingGuidelineLinux.html" style="text-align:left; color:#0080c0; text-decoration:none.html">Linux Build Guide</a>
 </li></ul>
+</p>
 </div><div class="ClearBoth"></div></body></html>
author	Mounir IDRASSI <mounir.idrassi@idrix.fr>	2023-06-09 20:16:49 +0200
committer	Mounir IDRASSI <mounir.idrassi@idrix.fr>	2023-06-09 20:16:49 +0200
commit	e7f5bca0b5c6c186529a5179f6c8f7f69d88063c (patch)
tree	79487cb471f8ecf688a7cbe5f5ffe869403de289 /doc/html
parent	9d9a73d4eb4ac96e6d5f0093692bb8ba3d448ca3 (diff)
download	VeraCrypt-e7f5bca0b5c6c186529a5179f6c8f7f69d88063c.tar.gz VeraCrypt-e7f5bca0b5c6c186529a5179f6c8f7f69d88063c.zip