diff --git a/Documentation/BuildingOnDarwin.md b/Documentation/BuildingOnDarwin.md index 77fd4cb..56a29df 100644 --- a/Documentation/BuildingOnDarwin.md +++ b/Documentation/BuildingOnDarwin.md @@ -7,14 +7,8 @@ * [Homebrew](http://brew.sh/) * [Python 3](https://www.python.org/downloads/windows/) * [XCode](https://developer.apple.com/xcode/download/) - * [Qt 5](https://www.qt.io/download/), select the following components: - * Qt 5.12.9 / macOS -2. Edit the [`Scripts/config.txt`](../Scripts/config.txt) file and make sure the following variables are configured properly under the `[Darwin]` section: - - * `libQtPath` -- Full path to the Qt library, clang, 64-bit build. - -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 [`PackageListBrew.txt`](../Scripts/Install/PackageListBrew.txt) 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 [`PackageListBrew.txt`](../Scripts/Install/PackageListBrew.txt) and [`PackageListPython.txt`](../Scripts/Install/PackageListPython.txt). * If Python is already installed: ```sh @@ -27,6 +21,11 @@ Use the `--upgrade` switch 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 `[Darwin]` section: + + * `libQtPath` -- Full path to the Qt library (query with `brew --prefix qt5`). + * `openSSLPath` -- Full path to the OpenSSL library (query with `brew --prefix openssl`). + ### 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 48592fc..f1ea02a 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=x86_64 \ + -D CMAKE_OSX_ARCHITECTURES="arm64;x86_64" \ -D SYNERGY_ENTERPRISE=ON \ -D SYNERGY_REVISION="${productRevision}" \ || exit 1 diff --git a/Scripts/Install/PackageListBrew.txt b/Scripts/Install/PackageListBrew.txt index 91cc448..6064a04 100644 --- a/Scripts/Install/PackageListBrew.txt +++ b/Scripts/Install/PackageListBrew.txt @@ -3,3 +3,4 @@ git libsodium openssl python +qt5 diff --git a/Scripts/config.txt b/Scripts/config.txt index 097b5a3..45ea897 100644 --- a/Scripts/config.txt +++ b/Scripts/config.txt @@ -19,8 +19,8 @@ [Darwin] - libQtPath = ~/Qt5.12.9/5.12.9/clang_64 - openSSLPath = /usr/local/opt/openssl + libQtPath = /usr/local/opt/qt@5 + openSSLPath = /usr/local/opt/openssl@1.1 [Linux] diff --git a/Synergy-Core b/Synergy-Core index 67d824b..2def465 160000 --- a/Synergy-Core +++ b/Synergy-Core @@ -1 +1 @@ -Subproject commit 67d824b8483003d531097dded302965b88ee867b +Subproject commit 2def4652562278b63e608b4a762ed1daee76db3b