From f2799a329cfa2c811656ab83965e8c4862f6e56b Mon Sep 17 00:00:00 2001 From: DominikDeak Date: Tue, 24 Jan 2023 16:44:39 +1100 Subject: [PATCH 1/2] Script cleanup on for darwin --- Scripts/Build/BuildDarwin.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Scripts/Build/BuildDarwin.sh b/Scripts/Build/BuildDarwin.sh index 48592fc..222765f 100755 --- a/Scripts/Build/BuildDarwin.sh +++ b/Scripts/Build/BuildDarwin.sh @@ -6,10 +6,10 @@ 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 SYNERGY_ENTERPRISE=ON \ -D SYNERGY_REVISION="${productRevision}" \ || exit 1 + } buildApplication() { From a2ac6db5786ea7280b27d5798ec66e95b6fcd9a8 Mon Sep 17 00:00:00 2001 From: Dominik Deak Date: Tue, 24 Jan 2023 16:50:01 +1100 Subject: [PATCH 2/2] Windows script changes. --- Scripts/Install/InstallWindows.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Scripts/Install/InstallWindows.ps1 b/Scripts/Install/InstallWindows.ps1 index b56a34d..f471561 100644 --- a/Scripts/Install/InstallWindows.ps1 +++ b/Scripts/Install/InstallWindows.ps1 @@ -9,7 +9,7 @@ $installBlock = iex ( ( New-Object System.Net.WebClient ).DownloadString( 'https://chocolatey.org/install.ps1' ) ) $packageListChocoPath = Join-Path -Path $installToolsPath -ChildPath "PackageListChoco.config" - choco install --force "$packageListChocoPath" + choco install "$packageListChocoPath" refreshenv $packageListPythonPath = Join-Path -Path $installToolsPath -ChildPath "PackageListPython.txt"