From 536b9cf9b4c63985f9a95f5675fff26d30a9ee1b Mon Sep 17 00:00:00 2001
From: DominikDeak <deak.software@gmail.com>
Date: Thu, 22 Jul 2021 16:03:08 +1000
Subject: [PATCH] Updated scripts and build docs.

---
 Documentation/BuildingOnDarwin.md  | 16 ++++++++++++++++
 Documentation/BuildingOnWindows.md | 17 ++++++++---------
 Scripts/Build/BuildDarwin.sh       |  2 +-
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/Documentation/BuildingOnDarwin.md b/Documentation/BuildingOnDarwin.md
index 56a29df..fb43226 100644
--- a/Documentation/BuildingOnDarwin.md
+++ b/Documentation/BuildingOnDarwin.md
@@ -7,6 +7,7 @@
       * [Homebrew](http://brew.sh/)
       * [Python 3](https://www.python.org/downloads/windows/)
       * [XCode](https://developer.apple.com/xcode/download/)
+      * [Qt5](https://download.qt.io/official_releases/qt/)
 
 2. Run the installer script to configure additional dependencies, as noted below. If you wish to examine what packages will be installed, see package lists [`PackageListBrew.txt`](../Scripts/Install/PackageListBrew.txt) and [`PackageListPython.txt`](../Scripts/Install/PackageListPython.txt).
 
@@ -45,3 +46,18 @@ Similarly, one can clean the project, which resets Git repositories to a clean s
 ```sh
 ./Scripts/clean.py
 ```
+<!--
+### Issues
+
+If you are building on Apple M1 and having trouble linking `arm64` binaries with the Qt5 library, try the following. Install Qt build dependencies:
+
+```sh
+brew install pcre2 harfbuzz freetype
+```
+
+Reinstall Qt5 and build from source:
+
+```sh
+brew reinstall -s qt5
+```
+-->
\ No newline at end of file
diff --git a/Documentation/BuildingOnWindows.md b/Documentation/BuildingOnWindows.md
index b0029b7..8de0430 100644
--- a/Documentation/BuildingOnWindows.md
+++ b/Documentation/BuildingOnWindows.md
@@ -12,16 +12,9 @@
       * [WiX Toolset](https://wixtoolset.org/releases/), install the following components:
          * WiX Toolset Build Tools
          * WiX Toolset Visual Studio 2019 Extension
-      * [Qt 5](https://www.qt.io/download/), select the following components:
-         * Qt 5.12.9 / MSVC 2017 64-bit
+      * [Qt5](https://download.qt.io/official_releases/qt/)
 
-2. Edit the [`Scripts\config.txt`](../Scripts/config.txt) file and make sure the following variables are configured properly under the `[Windows]` section:
-
-      * `libQtPath` -- Full path to the Qt library, Visual C++, 64-bit build.
-      * `vcvarsallPath` -- Full path to Visual Studio's `vcvarsall.bat` command script. This sets the necessary compiler environment variables for building. See [Microsoft C++ toolset documentation](https://docs.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=vs-2019) for details.
-      * `cmakeGenerator` -- Specifies the generator setting for cmake. Run `cmake --help` to choose a suitable generator that best matches the Visual Studio version installed earlier.
-
-3. Run the installer script to configure additional dependencies, as noted below. If you wish to examine what packages will be installed, see package lists [`PackageListChoco.config`](../Scripts/Install/PackageListChoco.config) and [`PackageListPython.txt`](../Scripts/Install/PackageListPython.txt).
+2. Run the installer script to configure additional dependencies, as noted below. If you wish to examine what packages will be installed, see package lists [`PackageListChoco.config`](../Scripts/Install/PackageListChoco.config) and [`PackageListPython.txt`](../Scripts/Install/PackageListPython.txt).
 
       * If Python is already installed:
          ```bat
@@ -34,6 +27,12 @@
 
       Use the `--upgrade` switch (Python), or the `-upgrade` switch (PowerShell) to refresh packages at a later date.
 
+3. Edit the [`Scripts\config.txt`](../Scripts/config.txt) file and make sure the following variables are configured properly under the `[Windows]` section:
+
+      * `libQtPath` -- Full path to the Qt library, Visual C++, 64-bit build.
+      * `vcvarsallPath` -- Full path to Visual Studio's `vcvarsall.bat` command script. This sets the necessary compiler environment variables for building. See [Microsoft C++ toolset documentation](https://docs.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=vs-2019) for details.
+      * `cmakeGenerator` -- Specifies the generator setting for cmake. Run `cmake --help` to choose a suitable generator that best matches the Visual Studio version installed earlier.
+
 ### Building
 
 Build the project with the following Python script. Packages will be copied into the [`Binaries`](../Binaries) directory.
diff --git a/Scripts/Build/BuildDarwin.sh b/Scripts/Build/BuildDarwin.sh
index f1ea02a..48592fc 100755
--- a/Scripts/Build/BuildDarwin.sh
+++ b/Scripts/Build/BuildDarwin.sh
@@ -6,7 +6,7 @@ configureCMake() {
       -D CMAKE_PREFIX_PATH="${libQtPath};${openSSLPath}" \
       -D CMAKE_BUILD_TYPE=Release \
       -D CMAKE_OSX_DEPLOYMENT_TARGET=10.12 \
-      -D CMAKE_OSX_ARCHITECTURES="arm64;x86_64" \
+      -D CMAKE_OSX_ARCHITECTURES=x86_64 \
       -D SYNERGY_ENTERPRISE=ON \
       -D SYNERGY_REVISION="${productRevision}" \
       || exit 1