Update submodules and instructions.

docs/building-cmake.md

@@ -276,7 +276,8 @@ Go to ***BuildPath*** and run
         -static \
         -dbus-runtime \
         -openssl-linked \
-    -I "$OPENSSL_DIR/include" OPENSSL_LIBS="$OPENSSL_DIR/lib/libssl.a $OPENSSL_DIR/lib/libcrypto.a -ldl -lpthread" \
+        -I "$OPENSSL_DIR/include" \
+        OPENSSL_LIBS="$OPENSSL_DIR/lib/libssl.a $OPENSSL_DIR/lib/libcrypto.a -ldl -lpthread" \
         -nomake examples \
         -nomake tests
 

docs/building-msvc.md

@@ -61,8 +61,6 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
     mkdir Libraries
     cd Libraries
 
-    SET LibrariesPath=%cd%
-
     git clone https://github.com/desktop-app/patches.git
     cd patches
     git checkout ddd4084
@@ -162,6 +160,7 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
     SET PATH=%PATH_BACKUP_%
     cd ..
 
+    SET LibrariesPath=%cd%
     git clone git://code.qt.io/qt/qt5.git qt_5_12_8
     cd qt_5_12_8
     perl init-repository --module-subset=qtbase,qtimageformats
@@ -171,7 +170,27 @@ Open **x86 Native Tools Command Prompt for VS 2019.bat**, go to ***BuildPath***
     for /r %i in (..\..\patches\qtbase_5_12_8\*) do git apply %i
     cd ..
 
-    configure -prefix "%LibrariesPath%\Qt-5.12.8" -debug-and-release -force-debug-info -opensource -confirm-license -static -static-runtime -I "%LibrariesPath%\openssl_1_1_1\include" -no-opengl -openssl-linked OPENSSL_LIBS_DEBUG="%LibrariesPath%\openssl_1_1_1\out32.dbg\libssl.lib %LibrariesPath%\openssl_1_1_1\out32.dbg\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" OPENSSL_LIBS_RELEASE="%LibrariesPath%\openssl_1_1_1\out32\libssl.lib %LibrariesPath%\openssl_1_1_1\out32\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" -mp -nomake examples -nomake tests -platform win32-msvc -I "%LibrariesPath%\mozjpeg" LIBJPEG_LIBS_DEBUG="%LibrariesPath%\mozjpeg\Debug\jpeg-static.lib" LIBJPEG_LIBS_RELEASE="%LibrariesPath%\mozjpeg\Release\jpeg-static.lib"
+    configure ^
+        -prefix "%LibrariesPath%\Qt-5.12.8" ^
+        -debug-and-release ^
+        -force-debug-info ^
+        -opensource ^
+        -confirm-license ^
+        -static ^
+        -static-runtime ^
+        -no-opengl ^
+        -openssl-linked ^
+        -recheck ^
+        -I "%LibrariesPath%\openssl_1_1_1\include" ^
+        OPENSSL_LIBS_DEBUG="%LibrariesPath%\openssl_1_1_1\out32.dbg\libssl.lib %LibrariesPath%\openssl_1_1_1\out32.dbg\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" ^
+        OPENSSL_LIBS_RELEASE="%LibrariesPath%\openssl_1_1_1\out32\libssl.lib %LibrariesPath%\openssl_1_1_1\out32\libcrypto.lib Ws2_32.lib Gdi32.lib Advapi32.lib Crypt32.lib User32.lib" ^
+        -I "%LibrariesPath%\mozjpeg" ^
+        LIBJPEG_LIBS_DEBUG="%LibrariesPath%\mozjpeg\Debug\jpeg-static.lib" ^
+        LIBJPEG_LIBS_RELEASE="%LibrariesPath%\mozjpeg\Release\jpeg-static.lib" ^
+        -mp ^
+        -nomake examples ^
+        -nomake tests ^
+        -platform win32-msvc
 
     jom -j4
     jom -j4 install

docs/building-osx.md

@@ -1,6 +1,6 @@
 ## Build instructions for Xcode 10.1
 
-**NB** These are used for OS X 10.10/10.11 build, after the [Building using Xcode][xcode] instructions.
+**NB** These are outdated, please refer to [Building using Xcode][xcode] instructions.
 
 ### Prepare folder
 

docs/building-xcode.md

@@ -271,12 +271,12 @@ Go to ***BuildPath*** and run
         -opengl desktop \
         -no-openssl \
         -securetransport \
-    -nomake examples \
-    -nomake tests \
-    -platform macx-clang \
         -I "/usr/local/macos/include" \
         LIBJPEG_LIBS="/usr/local/macos/lib/libjpeg.a" \
-    ZLIB_LIBS="/usr/local/macos/lib/libz.a"
+        ZLIB_LIBS="/usr/local/macos/lib/libz.a" \
+        -nomake examples \
+        -nomake tests \
+        -platform macx-clang
 
     make $MAKE_THREADS_CNT
     sudo make install