From 75a3e638eac65f0df9c01d619461766ad404ed11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Tue, 17 Jul 2018 19:19:53 +0200 Subject: [PATCH] Update MSVC libraries to v18 to re-enable breakpad --- openrct2.proj | 9 +++++---- src/openrct2/platform/Crash.cpp | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/openrct2.proj b/openrct2.proj index 922ce37dd6..48fd830883 100644 --- a/openrct2.proj +++ b/openrct2.proj @@ -30,6 +30,7 @@ /D "OPENRCT2_COMMIT_SHA1=\"$(GIT_COMMIT_SHA1)\"" $(OPENRCT2_CL_ADDITIONALOPTIONS) /D "OPENRCT2_COMMIT_SHA1_SHORT=\"$(GIT_COMMIT_SHA1_SHORT)\"" $(OPENRCT2_CL_ADDITIONALOPTIONS) /D "OPENRCT2_VERSION_TAG=\"$(GIT_DESCRIBE)\"" $(OPENRCT2_CL_ADDITIONALOPTIONS) + /D "USE_BREAKPAD" $(OPENRCT2_CL_ADDITIONALOPTIONS) $(MsBuildThisFileDirectory) $(RootDir)distribution\ @@ -64,10 +65,10 @@ $(RootDir).dependencies - https://github.com/OpenRCT2/Dependencies/releases/download/v17/openrct2-libs-v17-x86-windows-static-winssl.zip - 4f9fb5feebe4a4ed461b2a545b2fd1c91ef6527b - https://github.com/OpenRCT2/Dependencies/releases/download/v17/openrct2-libs-v17-x64-windows-static-winssl.zip - 5aab386f9eeaad102b330fcddea2b4cc9e3c7067 + https://github.com/OpenRCT2/Dependencies/releases/download/v18/openrct2-libs-v18-x86-windows-static-winssl.zip + 5266545ca3034f9718729c7841d0352ed866db39 + https://github.com/OpenRCT2/Dependencies/releases/download/v18/openrct2-libs-v18-x64-windows-static-winssl.zip + 4a122221e000b26067c8a4d06d2f053f27fe3f39 1.8.0 https://github.com/google/googletest/archive/release-1.8.0.zip 667f873ab7a4d246062565fad32fb6d8e203ee73 diff --git a/src/openrct2/platform/Crash.cpp b/src/openrct2/platform/Crash.cpp index d08ed00605..635eaa49a3 100644 --- a/src/openrct2/platform/Crash.cpp +++ b/src/openrct2/platform/Crash.cpp @@ -15,7 +15,7 @@ # if defined(_WIN32) # include -# include +# include # include # else # error Breakpad support not implemented yet for this platform