From 27c8cf126ffe6b040bf19143658aca09c6b3204c Mon Sep 17 00:00:00 2001 From: IntelOrca Date: Sat, 9 Jan 2016 17:53:25 +0000 Subject: [PATCH] update build / publish scripts for new VS dependencies --- distribution/windows/install.nsi | 2 -- scripts/ps/install.ps1 | 6 +++--- scripts/ps/publish.ps1 | 1 - 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/distribution/windows/install.nsi b/distribution/windows/install.nsi index c0455e61a9..8b8917aef3 100644 --- a/distribution/windows/install.nsi +++ b/distribution/windows/install.nsi @@ -141,7 +141,6 @@ Section "!OpenRCT2" Section1 ; Copy executable File /oname=openrct2.exe ${BINARY_DIR}\openrct2.exe File /oname=openrct2.dll ${BINARY_DIR}\openrct2.dll - File /oname=SDL2.dll ${BINARY_DIR}\SDL2.dll ; Create the Registry Entries WriteRegStr HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenRCT2" "Comments" "Visit ${APPURLLINK}" @@ -207,7 +206,6 @@ Section "Uninstall" Delete "$INSTDIR\contributors.md" Delete "$INSTDIR\openrct2.exe" Delete "$INSTDIR\openrct2.dll" - Delete "$INSTDIR\SDL2.dll" Delete "$INSTDIR\licence.txt" Delete "$INSTDIR\INSTALL.LOG" Delete "$INSTDIR\crash.log" diff --git a/scripts/ps/install.ps1 b/scripts/ps/install.ps1 index e578c731bf..8ca77d1acf 100644 --- a/scripts/ps/install.ps1 +++ b/scripts/ps/install.ps1 @@ -13,13 +13,13 @@ $scriptsPath = Split-Path $Script:MyInvocation.MyCommand.Path Import-Module "$scriptsPath\common.psm1" -DisableNameChecking # Constants -$libsUrl = "https://openrct2.website/files/orctlibs-vs.zip" -$libsVersion = 4 +$libsUrl = "https://openrct2.website/files/openrct2-libs-vs2015.zip" +$libsVersion = 5 # Get paths $rootPath = Get-RootPath $libsPath = Join-Path $rootPath "lib" -$zipPath = Join-Path $libsPath "orctlibs.zip" +$zipPath = Join-Path $libsPath "openrct2-libs-vs2015.zip" $libsVersionPath = Join-Path $libsPath "libversion" # Check if we need to update the dependencies diff --git a/scripts/ps/publish.ps1 b/scripts/ps/publish.ps1 index 07b5f2580a..4e83208408 100644 --- a/scripts/ps/publish.ps1 +++ b/scripts/ps/publish.ps1 @@ -80,7 +80,6 @@ function Do-Package() Copy-Item -Force "$releaseDir\openrct2.exe" $tempDir -ErrorAction Stop Copy-Item -Force "$releaseDir\openrct2.dll" $tempDir -ErrorAction Stop Copy-Item -Force "$releaseDir\curl-ca-bundle.crt" $tempDir -ErrorAction Stop - Copy-Item -Force "$releaseDir\SDL2.dll" $tempDir -ErrorAction Stop Copy-Item -Force "$distDir\changelog.txt" $tempDir -ErrorAction Stop Copy-Item -Force "$distDir\known_issues.txt" $tempDir -ErrorAction Stop Copy-Item -Force "$distDir\readme.txt" $tempDir -ErrorAction Stop