diff --git a/Scripts/Build/BuildWindows.cmd b/Scripts/Build/BuildWindows.cmd index e8cb0a0..36b5faa 100644 --- a/Scripts/Build/BuildWindows.cmd +++ b/Scripts/Build/BuildWindows.cmd @@ -18,6 +18,9 @@ :configureCMake + mkdir -p "%productRepoPath%\ext\openssl\windows\x64" + xcopy "%openSSLPath%" "%productRepoPath%\ext\openssl\windows\x64" /e /y || exit 1 + cmake -S "%productRepoPath%" -B "%productBuildPath%"^ -G "%cmakeGenerator%"^ -D CMAKE_PREFIX_PATH="%libQtPath%;%openSSLPath%"^ diff --git a/Scripts/Install/PackageListChoco.config b/Scripts/Install/PackageListChoco.config index 990eae8..dce6818 100644 --- a/Scripts/Install/PackageListChoco.config +++ b/Scripts/Install/PackageListChoco.config @@ -2,6 +2,7 @@ + diff --git a/Scripts/config.txt b/Scripts/config.txt index 097b5a3..4fc4337 100644 --- a/Scripts/config.txt +++ b/Scripts/config.txt @@ -11,7 +11,7 @@ [Windows] libQtPath = C:\Qt\Qt5.12.9\5.12.9\msvc2017_64 - openSSLPath = .\Synergy-Core\ext\openssl\windows\x64 + openSSLPath = C:\Program Files\OpenSSL-Win64 vcvarsallPath = C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\VC\Auxiliary\Build\vcvarsall.bat # Run cmake --help to choose a suitable generator diff --git a/Synergy-Core b/Synergy-Core index 67d824b..37bbd3c 160000 --- a/Synergy-Core +++ b/Synergy-Core @@ -1 +1 @@ -Subproject commit 67d824b8483003d531097dded302965b88ee867b +Subproject commit 37bbd3c0ee7708c0bf26bebcc115d02c97bbbe38