diff --git a/openrct2.common.props b/openrct2.common.props
index 4cf86002a9..4b1c5fdd09 100644
--- a/openrct2.common.props
+++ b/openrct2.common.props
@@ -51,7 +51,7 @@
C4549: 'operator': operator before comma has no effect; did you intend 'operator'?
C4555: expression has no effect; expected expression with side-effect
-->
- __AVX2__;__SSE4_1__;OPENGL_NO_LINK;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;CURL_STATICLIB;SDL_MAIN_HANDLED;_WINSOCK_DEPRECATED_NO_WARNINGS;ZIP_STATIC;%(PreprocessorDefinitions)
+ __AVX2__;__SSE4_1__;OPENGL_NO_LINK;_CRT_SECURE_NO_WARNINGS;_USE_MATH_DEFINES;CURL_STATICLIB;SDL_MAIN_HANDLED;_WINSOCK_DEPRECATED_NO_WARNINGS;%(PreprocessorDefinitions)
MultiThreaded
true
true
@@ -59,8 +59,6 @@
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)
@@ -73,6 +71,7 @@
true
+ bz2d.lib;discord-rpc.lib;freetyped.lib;jansson_d.lib;libcurl.lib;libeay32.lib;libpng16d.lib;libspeexdsp.lib;SDL2d.lib;ssleay32.lib;zip.lib;zlibd.lib
@@ -90,14 +89,16 @@
true
true
true
+ bz2.lib;discord-rpc.lib;freetype.lib;jansson.lib;libcurl.lib;libeay32.lib;libpng16.lib;libspeexdsp.lib;SDL2.lib;ssleay32.lib;zip.lib;zlib.lib
- $(SolutionDir)src;$(SolutionDir)lib\include;$(SolutionDir)lib\include\sdl2;$(IncludePath)
- $(SolutionDir)lib;$(LibraryPath)
+ $(SolutionDir)src;$(SolutionDir)lib\$(Platform)\include;$(SolutionDir)lib\$(Platform)\include\sdl2;$(IncludePath)
+ $(SolutionDir)lib\$(Platform)\debug\lib;$(LibraryPath)
+ $(SolutionDir)lib\$(Platform)\lib;$(LibraryPath)
diff --git a/openrct2.proj b/openrct2.proj
index 6653583927..38a7ae1806 100644
--- a/openrct2.proj
+++ b/openrct2.proj
@@ -21,7 +21,7 @@
0.1.2
-$(GIT_BRANCH)-$(GIT_COMMIT_SHA1_SHORT)
- 14
+ 15
/D "OPENRCT2_BUILD_SERVER=\"$(BUILD_SERVER)\"" $(OPENRCT2_CL_ADDITIONALOPTIONS)
@@ -62,8 +62,10 @@
$(RootDir).dependencies
- https://github.com/OpenRCT2/Dependencies/releases/download/v$(TargetLibsVersion)/openrct2-libs-vs2017.zip
- f9bee9fa8ae8c5f12ca3c603ef2aa3fc179e48fc
+ https://ci.appveyor.com/api/buildjobs/a920w9mx7jeykp7t/artifacts/vcpkg%2Finstalled%2Fx86-windows-static-winssl%2Fopenrct2-libs-x86-windows-static-winssl.zip
+ 97c968398147fd95060ed4c0e1da5135bf63844b
+ https://ci.appveyor.com/api/buildjobs/m4wprt56o0e97gqf/artifacts/vcpkg%2Finstalled%2Fx64-windows-static-winssl%2Fopenrct2-libs-x64-windows-static-winssl.zip
+ 02a1d43b0431b662562b91e1e12e8c2229622b42
1.8.0
https://github.com/google/googletest/archive/release-1.8.0.zip
667f873ab7a4d246062565fad32fb6d8e203ee73
@@ -121,7 +123,7 @@
Url="$(LibsUrl)"
Sha1="$(LibsSha1)"
CheckFile="$(DependenciesCheckFile)"
- OutputDirectory="$(RootDir)lib" />
+ OutputDirectory="$(RootDir)lib\$(Platform)" />
+#include
#include "../Context.h"
#include "../core/Console.hpp"
#include "../core/String.hpp"