From f4263d2cece41ae273fedc0c8ad1b4acc0c3c60a Mon Sep 17 00:00:00 2001 From: Ted John Date: Mon, 28 Aug 2017 13:08:32 +0100 Subject: [PATCH 1/3] Update VS dependencies to v13 --- openrct2.common.props | 8 ++++---- openrct2.proj | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/openrct2.common.props b/openrct2.common.props index ebb17b3e4e..64726fa8ef 100644 --- a/openrct2.common.props +++ b/openrct2.common.props @@ -58,9 +58,9 @@ /utf-8 /std:c++latest /permissive- - imm32.lib;version.lib;winmm.lib;crypt32.lib;%(AdditionalDependencies) - openrct2-libs-vs2015-x86.lib;%(AdditionalDependencies) - openrct2-libs-vs2015-x64.lib;%(AdditionalDependencies) + imm32.lib;version.lib;winmm.lib;crypt32.lib;wldap32.lib;%(AdditionalDependencies) + openrct2-libs-vs2017-x86.lib;%(AdditionalDependencies) + openrct2-libs-vs2017-x64.lib;%(AdditionalDependencies) /OPT:NOLBR /ignore:4099 %(AdditionalOptions) @@ -97,7 +97,7 @@ - $(SolutionDir)src;$(SolutionDir)lib\include;$(SolutionDir)lib\include\breakpad;$(SolutionDir)lib\include\libspeex;$(SolutionDir)lib\include\sdl;$(SolutionDir)lib\include\jansson;$(SolutionDir)lib\include\sdl_ttf;$(SolutionDir)lib\include\libpng;$(SolutionDir)lib\include\zlib;$(SolutionDir)lib\include\libzip;$(IncludePath) + $(SolutionDir)src;$(SolutionDir)lib\include;$(SolutionDir)lib\include\sdl2;$(IncludePath) $(SolutionDir)lib;$(LibraryPath) diff --git a/openrct2.proj b/openrct2.proj index 7cad3cbc7b..4c0d203dfc 100644 --- a/openrct2.proj +++ b/openrct2.proj @@ -21,7 +21,7 @@ 0.1.2 -$(GIT_BRANCH)-$(GIT_COMMIT_SHA1_SHORT) - 12 + 13 /D "OPENRCT2_BUILD_SERVER=\"$(BUILD_SERVER)\"" $(OPENRCT2_CL_ADDITIONALOPTIONS) @@ -63,8 +63,8 @@ $(RootDir).dependencies - https://github.com/OpenRCT2/Dependencies/releases/download/v$(TargetLibsVersion)/openrct2-libs-vs2015.zip - f845fe2fad0a1dece905c42ac4cfc1234ec447a7 + https://github.com/OpenRCT2/Dependencies/releases/download/v$(TargetLibsVersion)/openrct2-libs-vs2017.zip + 00d4eaf3ed7653a1abf82df0c255338fa0d6f9b0 1.8.0 https://github.com/google/googletest/archive/release-1.8.0.zip 667f873ab7a4d246062565fad32fb6d8e203ee73 From f894c71dbfec278332fa5d26e25c9e4ae78200e5 Mon Sep 17 00:00:00 2001 From: Ted John Date: Mon, 28 Aug 2017 13:09:15 +0100 Subject: [PATCH 2/3] Disable breakpad Breakpad is no longer in dependencies. This is because it is difficult to build and is soon to be removed anyway. --- openrct2.proj | 1 - 1 file changed, 1 deletion(-) diff --git a/openrct2.proj b/openrct2.proj index 4c0d203dfc..50b38a049c 100644 --- a/openrct2.proj +++ b/openrct2.proj @@ -28,7 +28,6 @@ /D "OPENRCT2_BRANCH=\"$(GIT_BRANCH)\"" $(OPENRCT2_CL_ADDITIONALOPTIONS) /D "OPENRCT2_COMMIT_SHA1=\"$(GIT_COMMIT_SHA1)\"" $(OPENRCT2_CL_ADDITIONALOPTIONS) /D "OPENRCT2_COMMIT_SHA1_SHORT=\"$(GIT_COMMIT_SHA1_SHORT)\"" $(OPENRCT2_CL_ADDITIONALOPTIONS) - /D "USE_BREAKPAD" $(OPENRCT2_CL_ADDITIONALOPTIONS) $(MsBuildThisFileDirectory) $(RootDir)distribution\ From 08295a996f7bba5c6a2ef9c34cad41b3ce43aaf7 Mon Sep 17 00:00:00 2001 From: Ted John Date: Mon, 28 Aug 2017 13:10:28 +0100 Subject: [PATCH 3/3] Update VS requirements in readme.md --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 9f41d63847..6dde8f9d43 100644 --- a/readme.md +++ b/readme.md @@ -72,7 +72,7 @@ OpenRCT2 requires original files of RollerCoaster Tycoon 2 to play. It can be bo ### Windows: - 7 / 8 / 10 -- Visual Studio 2017 (Enterprise / Professional / [Community (Free)](https://www.visualstudio.com/vs/community/)) +- Visual Studio 2017 update 3 (Enterprise / Professional / [Community (Free)](https://www.visualstudio.com/vs/community/)) - Desktop development with C++ - Windows 10 SDK (10.0.14393.0) - [7-Zip](http://www.7-zip.org/) (for deployment only)