From 212c5bf7fac448da3392148b91e7cdba49e1beae Mon Sep 17 00:00:00 2001
From: DominikDeak <deak.software@gmail.com>
Date: Tue, 20 Jul 2021 17:46:57 +1000
Subject: [PATCH] Fix openssl path for CMake build system on macOS.

---
 Scripts/Build/BuildDarwin.sh   | 3 +--
 Scripts/Build/BuildWindows.cmd | 2 +-
 Scripts/Detail/Config.py       | 1 +
 Scripts/config.txt             | 4 +++-
 Synergy-Core                   | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Scripts/Build/BuildDarwin.sh b/Scripts/Build/BuildDarwin.sh
index 92fa0fe..48592fc 100755
--- a/Scripts/Build/BuildDarwin.sh
+++ b/Scripts/Build/BuildDarwin.sh
@@ -3,14 +3,13 @@
 configureCMake() {
 
    cmake -S "${productRepoPath}" -B "${productBuildPath}" \
-      -D CMAKE_PREFIX_PATH="${libQtPath}" \
+      -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 SYNERGY_ENTERPRISE=ON \
       -D SYNERGY_REVISION="${productRevision}" \
       || exit 1
-
 }
 
 buildApplication() {
diff --git a/Scripts/Build/BuildWindows.cmd b/Scripts/Build/BuildWindows.cmd
index a7572b3..89316ab 100644
--- a/Scripts/Build/BuildWindows.cmd
+++ b/Scripts/Build/BuildWindows.cmd
@@ -20,7 +20,7 @@
 
    cmake -S "%productRepoPath%" -B "%productBuildPath%"^
       -G "%cmakeGenerator%"^
-      -D CMAKE_PREFIX_PATH="%libQtPath%"^
+      -D CMAKE_PREFIX_PATH="%libQtPath%;%openSSLPath%"^
       -D CMAKE_BUILD_TYPE=Release^
       -D SYNERGY_ENTERPRISE=ON^
       -D SYNERGY_REVISION="%productRevision%"^
diff --git a/Scripts/Detail/Config.py b/Scripts/Detail/Config.py
index d0e5057..2028c54 100644
--- a/Scripts/Detail/Config.py
+++ b/Scripts/Detail/Config.py
@@ -14,6 +14,7 @@ class Configuration():
    toolsPath    = ""
 
    libQtPath      = ""
+   openSSLPath    = ""
    vcvarsallPath  = ""
    cmakeGenerator = ""
    linuxdeployURL = ""
diff --git a/Scripts/config.txt b/Scripts/config.txt
index 27ea1cf..097b5a3 100644
--- a/Scripts/config.txt
+++ b/Scripts/config.txt
@@ -11,6 +11,7 @@
 [Windows]
 
    libQtPath      = C:\Qt\Qt5.12.9\5.12.9\msvc2017_64
+   openSSLPath    = .\Synergy-Core\ext\openssl\windows\x64
    vcvarsallPath  = C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat
 
    # Run cmake --help to choose a suitable generator
@@ -18,7 +19,8 @@
 
 [Darwin]
 
-   libQtPath = ~/Qt5.12.9/5.12.9/clang_64
+   libQtPath   = ~/Qt5.12.9/5.12.9/clang_64
+   openSSLPath = /usr/local/opt/openssl
 
 [Linux]
 
diff --git a/Synergy-Core b/Synergy-Core
index 063519a..67d824b 160000
--- a/Synergy-Core
+++ b/Synergy-Core
@@ -1 +1 @@
-Subproject commit 063519a8882169e35938df3018742b917ce43ed0
+Subproject commit 67d824b8483003d531097dded302965b88ee867b