diff --git a/mk/windows/clean-all.bat b/mk/windows/clean-all.bat
index ab4cf2986..4580b7bef 100644
--- a/mk/windows/clean-all.bat
+++ b/mk/windows/clean-all.bat
@@ -5,29 +5,39 @@ SET /P AREYOUSURE=Are you sure you want to do this? (y/[n])
IF /I "%AREYOUSURE%" NEQ "y" GOTO END
IF /I "%AREYOUSURE%" NEQ "Y" GOTO END
-cd .\dependencies\src
-CALL :DELETE
-cd ..\..\
+IF EXIST .\dependencies\src (
+ cd .\dependencies\src
+ CALL :DELETE
+ cd ..\..\
+)
-cd .\vs2015-32
-CALL :DELETE
-del /S *.obj
-cd ..\
+IF EXIST .\vs2015-32 (
+ cd .\vs2015-32
+ CALL :DELETE
+ del /S *.obj
+ cd ..\
+)
-cd .\vs2015-64
-CALL :DELETE
-del /S *.obj
-cd ..\
+IF EXIST .\vs2015-64 (
+ cd .\vs2015-64
+ CALL :DELETE
+ del /S *.obj
+ cd ..\
+)
-cd .\vs2017-32
-CALL :DELETE
-del /S *.obj
-cd ..\
+IF EXIST .\vs2017-32 (
+ cd .\vs2017-32
+ CALL :DELETE
+ del /S *.obj
+ cd ..\
+)
-cd .\vs2017-64
-CALL :DELETE
-del /S *.obj
-cd ..\
+IF EXIST .\vs2017-64 (
+ cd .\vs2017-64
+ CALL :DELETE
+ del /S *.obj
+ cd ..\
+)
GOTO END
diff --git a/mk/windows/delete-all-deps.bat b/mk/windows/delete-all-deps.bat
new file mode 100644
index 000000000..7f3f0cbfc
--- /dev/null
+++ b/mk/windows/delete-all-deps.bat
@@ -0,0 +1,11 @@
+@echo off
+setlocal
+echo This will delete /dependencies/openssl and /dependencies/src.
+SET /P AREYOUSURE=Are you sure you want to do this? (y/[n])
+IF /I "%AREYOUSURE%" NEQ "y" GOTO END
+IF /I "%AREYOUSURE%" NEQ "Y" GOTO END
+del /f /s /q .\dependencies\openssl
+del /f /s /q .\dependencies\src
+
+:END
+endlocal
\ No newline at end of file
diff --git a/mk/windows/vs2015-32/glest_game.vcxproj b/mk/windows/vs2015-32/glest_game.vcxproj
index fd22abc21..73e0ef195 100644
--- a/mk/windows/vs2015-32/glest_game.vcxproj
+++ b/mk/windows/vs2015-32/glest_game.vcxproj
@@ -470,7 +470,7 @@
Speed
false
false
- ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\mingw64\include
+ ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\
%(AdditionalUsingDirectories)
NDEBUG;AL_LIBTYPE_STATIC;WIN32;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)
true
diff --git a/mk/windows/vs2015-32/libglest.vcxproj b/mk/windows/vs2015-32/libglest.vcxproj
index 359275a6f..53fa5fc0b 100644
--- a/mk/windows/vs2015-32/libglest.vcxproj
+++ b/mk/windows/vs2015-32/libglest.vcxproj
@@ -394,7 +394,7 @@
true
Speed
true
- ../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../dependencies/src/xerces/src;../dependencies/src/xerces/src/xercesc/xinclude;../dependencies/src/png;../dependencies/src/jpeg;../dependencies/src/sdl2/include;../dependencies/src/openal/include;../../../source/shared_lib/include/sound/openal;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/streflop/libm_flt32_source;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../../../source/shared_lib/include/platform/miniupnpc;../../../source/shared_lib/include/libircclient/include;../../../source/shared_lib/include/feathery_ftp;../dependencies/src/ftgl/src;../dependencies/src/freetype/include/freetype;../dependencies/src/glew/include;../../../source/shared_lib/include/graphics/md5;../../../source/shared_lib/include/streflop/softfloat;../../../source/shared_lib/include/xml/rapidxml;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/compression;../../../source/shared_lib/sources/;../dependencies/src/fribidi/lib;../dependencies/src/fribidi/charset;..\dependencies\src\freetype\include;..\dependencies\src\vorbis\include;..\dependencies\src\ogg\include;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\fribidi;..\dependencies\mingw64\include;..\dependencies\src\fribidi\vs2015-32;..\dependencies\src\fribidi\vs2015-32\lib;%(AdditionalIncludeDirectories)
+ ../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../dependencies/src/xerces/src;../dependencies/src/xerces/src/xercesc/xinclude;../dependencies/src/png;../dependencies/src/jpeg;../dependencies/src/sdl2/include;../dependencies/src/openal/include;../../../source/shared_lib/include/sound/openal;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/streflop/libm_flt32_source;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../../../source/shared_lib/include/platform/miniupnpc;../../../source/shared_lib/include/libircclient/include;../../../source/shared_lib/include/feathery_ftp;../dependencies/src/ftgl/src;../dependencies/src/freetype/include/freetype;../dependencies/src/glew/include;../../../source/shared_lib/include/graphics/md5;../../../source/shared_lib/include/streflop/softfloat;../../../source/shared_lib/include/xml/rapidxml;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/compression;../../../source/shared_lib/sources/;../dependencies/src/fribidi/lib;../dependencies/src/fribidi/charset;..\dependencies\src\freetype\include;..\dependencies\src\vorbis\include;..\dependencies\src\ogg\include;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\fribidi;..\dependencies\;..\dependencies\src\fribidi\vs2015-32;..\dependencies\src\fribidi\vs2015-32\lib;%(AdditionalIncludeDirectories)
NDEBUG;AL_LIBTYPE_STATIC;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_SSE;STREFLOP_RANDOM_GEN_SIZE=32;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;USE_FTGL;FTGL_LIBRARY_STATIC;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;STATICLIB;XERCES_STATIC_LIBRARY;GLEW_STATIC;XML_LIBRARY;ZLIB_WINAPI;HAVE_FRIBIDI;MINIUPNP_STATICLIB;%(PreprocessorDefinitions)
true
Async
@@ -414,7 +414,7 @@
libcurl.lib;glew.lib;freetype.lib;libfribidi.lib;openal32.lib;%(AdditionalDependencies)
- ..\dependencies\src\curl\vs2015-32\Release;..\dependencies\src\glew\vs2015-32\Release;..\dependencies\src\freetype\builds\windows\vs2015-32\Win32\Release;..\dependencies\src\fribidi\vs2015-32\Release\lib\Win32;..\dependencies\src\zlib\vs2015-32\Release;..\dependencies\src\openal\vs2015-32\Release;..\dependencies\openssl-1.1.0f-vs2015\lib;%(AdditionalLibraryDirectories)
+ ..\dependencies\src\curl\vs2015-32\Release;..\dependencies\src\glew\vs2015-32\Release;..\dependencies\src\freetype\builds\windows\vs2015-32\Win32\Release;..\dependencies\src\fribidi\vs2015-32\Release\lib\Win32;..\dependencies\src\zlib\vs2015-32\Release;..\dependencies\src\openal\vs2015-32\Release;..\dependencies\openssl\vs2015\lib;%(AdditionalLibraryDirectories)
MachineX86
diff --git a/mk/windows/vs2015-64/glest_game.vcxproj b/mk/windows/vs2015-64/glest_game.vcxproj
index c18c606e6..7024d6836 100644
--- a/mk/windows/vs2015-64/glest_game.vcxproj
+++ b/mk/windows/vs2015-64/glest_game.vcxproj
@@ -384,7 +384,7 @@
Speed
false
true
- ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\mingw64\include
+ ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\
%(AdditionalUsingDirectories)
NDEBUG;AL_LIBTYPE_STATIC;WIN32;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;USE_STREFLOP;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)
true
diff --git a/mk/windows/vs2015-64/libglest.vcxproj b/mk/windows/vs2015-64/libglest.vcxproj
index b462d5779..9828ddcee 100644
--- a/mk/windows/vs2015-64/libglest.vcxproj
+++ b/mk/windows/vs2015-64/libglest.vcxproj
@@ -304,7 +304,7 @@
true
Speed
true
- ../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../dependencies/src/xerces/src;../dependencies/src/xerces/src/xercesc/xinclude;../dependencies/src/png;../dependencies/src/jpeg;../dependencies/src/sdl2/include;../dependencies/src/openal/include;../../../source/shared_lib/include/sound/openal;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/streflop/libm_flt32_source;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../../../source/shared_lib/include/platform/miniupnpc;../../../source/shared_lib/include/libircclient/include;../../../source/shared_lib/include/feathery_ftp;../dependencies/src/ftgl/src;../dependencies/src/freetype/include/freetype;../dependencies/src/glew/include;../../../source/shared_lib/include/graphics/md5;../../../source/shared_lib/include/streflop/softfloat;../../../source/shared_lib/include/xml/rapidxml;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/compression;../../../source/shared_lib/sources/;../dependencies/src/fribidi/lib;../dependencies/src/fribidi/charset;..\dependencies\src\freetype\include;..\dependencies\src\vorbis\include;..\dependencies\src\ogg\include;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\fribidi;..\dependencies\mingw64\include;..\dependencies\src\fribidi\vs2015-64;..\dependencies\src\fribidi\vs2015-64\lib;%(AdditionalIncludeDirectories)
+ ../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../dependencies/src/xerces/src;../dependencies/src/xerces/src/xercesc/xinclude;../dependencies/src/png;../dependencies/src/jpeg;../dependencies/src/sdl2/include;../dependencies/src/openal/include;../../../source/shared_lib/include/sound/openal;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/streflop/libm_flt32_source;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../../../source/shared_lib/include/platform/miniupnpc;../../../source/shared_lib/include/libircclient/include;../../../source/shared_lib/include/feathery_ftp;../dependencies/src/ftgl/src;../dependencies/src/freetype/include/freetype;../dependencies/src/glew/include;../../../source/shared_lib/include/graphics/md5;../../../source/shared_lib/include/streflop/softfloat;../../../source/shared_lib/include/xml/rapidxml;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/compression;../../../source/shared_lib/sources/;../dependencies/src/fribidi/lib;../dependencies/src/fribidi/charset;..\dependencies\src\freetype\include;..\dependencies\src\vorbis\include;..\dependencies\src\ogg\include;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\fribidi;..\dependencies\include;..\dependencies\src\fribidi\vs2015-64;..\dependencies\src\fribidi\vs2015-64\lib;%(AdditionalIncludeDirectories)
NDEBUG;AL_LIBTYPE_STATIC;WIN32;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;USE_STREFLOP;STREFLOP_SSE;STREFLOP_RANDOM_GEN_SIZE=32;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;USE_FTGL;FTGL_LIBRARY_STATIC;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;STATICLIB;XERCES_STATIC_LIBRARY;GLEW_STATIC;XML_LIBRARY;ZLIB_WINAPI;HAVE_FRIBIDI;MINIUPNP_STATICLIB;%(PreprocessorDefinitions)
true
Async
@@ -324,7 +324,7 @@
libcurl.lib;glew.lib;freetype.lib;libfribidi.lib;openal32.lib;%(AdditionalDependencies)
- ..\dependencies\src\curl\vs2015-64\Release;..\dependencies\src\glew\vs2015-64\Release;..\dependencies\src\freetype\builds\windows\vs2015-64\x64\Release;..\dependencies\src\fribidi\vs2015-64\msvc\lib\x64;..\dependencies\src\zlib\vs2015-64\Release;..\dependencies\src\openal\vs2015-64\Release;..\dependencies\openssl-1.1.0f-vs2015\lib64;%(AdditionalLibraryDirectories)
+ ..\dependencies\src\curl\vs2015-64\Release;..\dependencies\src\glew\vs2015-64\Release;..\dependencies\src\freetype\builds\windows\vs2015-64\x64\Release;..\dependencies\src\fribidi\vs2015-64\msvc\lib\x64;..\dependencies\src\zlib\vs2015-64\Release;..\dependencies\src\openal\vs2015-64\Release;..\dependencies\openssl\vs2015\lib64;%(AdditionalLibraryDirectories)
MachineX64
diff --git a/mk/windows/vs2015-64/libglestx64_obj/Release/libglest.tlog/unsuccessfulbuild b/mk/windows/vs2015-64/libglestx64_obj/Release/libglest.tlog/unsuccessfulbuild
new file mode 100644
index 000000000..e69de29bb
diff --git a/mk/windows/vs2017-32/glest_game.vcxproj b/mk/windows/vs2017-32/glest_game.vcxproj
index 49dcac8ca..edf5e918f 100644
--- a/mk/windows/vs2017-32/glest_game.vcxproj
+++ b/mk/windows/vs2017-32/glest_game.vcxproj
@@ -470,7 +470,7 @@
Speed
false
false
- ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua
+ ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies
%(AdditionalUsingDirectories)
NDEBUG;USE_STREFLOP;WIN32;AL_LIBTYPE_STATIC;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)
true
diff --git a/mk/windows/vs2017-32/libglest.vcxproj b/mk/windows/vs2017-32/libglest.vcxproj
index 2b3b90740..62df110d4 100644
--- a/mk/windows/vs2017-32/libglest.vcxproj
+++ b/mk/windows/vs2017-32/libglest.vcxproj
@@ -397,7 +397,7 @@
true
Speed
true
- ../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../dependencies/src/xerces/src;../dependencies/src/xerces/src/xercesc/xinclude;../dependencies/src/png;../dependencies/src/jpeg;../dependencies/src/sdl2/include;../dependencies/src/openal/include;../../../source/shared_lib/include/sound/openal;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/streflop/libm_flt32_source;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../../../source/shared_lib/include/platform/miniupnpc;../../../source/shared_lib/include/libircclient/include;../../../source/shared_lib/include/feathery_ftp;../dependencies/src/ftgl/src;../dependencies/src/freetype/include/freetype;../dependencies/src/glew/include;../../../source/shared_lib/include/graphics/md5;../../../source/shared_lib/include/streflop/softfloat;../../../source/shared_lib/include/xml/rapidxml;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/platform/win32;../dependencies/src/vlc/include;../../../source/shared_lib/include/compression;../../../source/shared_lib/sources/;../dependencies/src/fribidi/lib;../dependencies/src/fribidi/charset;..\dependencies\src\freetype\include;..\dependencies\src\vorbis\include;..\dependencies\src\ogg\include;..\dependencies\src\lua\src;..\dependencies\src\lua;../dependencies/src/fribidi/;..\dependencies\src\fribidi\vs2017-32;..\dependencies\src\fribidi\vs2017-32\lib;..\dependencies\mingw64\include;%(AdditionalIncludeDirectories)
+ ../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../dependencies/src/xerces/src;../dependencies/src/xerces/src/xercesc/xinclude;../dependencies/src/png;../dependencies/src/jpeg;../dependencies/src/sdl2/include;../dependencies/src/openal/include;../../../source/shared_lib/include/sound/openal;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/streflop/libm_flt32_source;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../../../source/shared_lib/include/platform/miniupnpc;../../../source/shared_lib/include/libircclient/include;../../../source/shared_lib/include/feathery_ftp;../dependencies/src/ftgl/src;../dependencies/src/freetype/include/freetype;../dependencies/src/glew/include;../../../source/shared_lib/include/graphics/md5;../../../source/shared_lib/include/streflop/softfloat;../../../source/shared_lib/include/xml/rapidxml;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/platform/win32;../dependencies/src/vlc/include;../../../source/shared_lib/include/compression;../../../source/shared_lib/sources/;../dependencies/src/fribidi/lib;../dependencies/src/fribidi/charset;..\dependencies\src\freetype\include;..\dependencies\src\vorbis\include;..\dependencies\src\ogg\include;..\dependencies\src\lua\src;..\dependencies\src\lua;../dependencies/src/fribidi/;..\dependencies\src\fribidi\vs2017-32;..\dependencies\src\fribidi\vs2017-32\lib;..\dependencies\;%(AdditionalIncludeDirectories)
NDEBUG;USE_STREFLOP;WIN32;AL_LIBTYPE_STATIC;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;STREFLOP_SSE;STREFLOP_RANDOM_GEN_SIZE=32;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;USE_FTGL;FTGL_LIBRARY_STATIC;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;STATICLIB;XERCES_STATIC_LIBRARY;GLEW_STATIC;XML_LIBRARY;ZLIB_WINAPI;HAVE_FRIBIDI;MINIUPNP_STATICLIB;%(PreprocessorDefinitions)
true
Async
@@ -417,7 +417,7 @@
libcurl.lib;glew.lib;freetype.lib;libfribidi.lib;openal32.lib;%(AdditionalDependencies)
- ..\dependencies\src\curl\vs2017-32\Release;..\dependencies\src\glew\vs2017-32\Release;..\dependencies\src\freetype\builds\windows\vs2017-32\Win32\Release;..\dependencies\src\fribidi\vs2017-32\Release\lib\Win32;..\dependencies\src\zlib\vs2017-32\Release;..\dependencies\src\openal\vs2017-32\Release;..\dependencies\openssl-1.1.0f-vs2017\lib;%(AdditionalLibraryDirectories)
+ ..\dependencies\src\curl\vs2017-32\Release;..\dependencies\src\glew\vs2017-32\Release;..\dependencies\src\freetype\builds\windows\vs2017-32\Win32\Release;..\dependencies\src\fribidi\vs2017-32\Release\lib\Win32;..\dependencies\src\zlib\vs2017-32\Release;..\dependencies\src\openal\vs2017-32\Release;..\dependencies\openssl\vs2017\lib;%(AdditionalLibraryDirectories)
MachineX86
diff --git a/mk/windows/vs2017-64/g3d_viewer.vcxproj b/mk/windows/vs2017-64/g3d_viewer.vcxproj
index 79d884bb0..360bb9df5 100644
--- a/mk/windows/vs2017-64/g3d_viewer.vcxproj
+++ b/mk/windows/vs2017-64/g3d_viewer.vcxproj
@@ -1,5 +1,5 @@
-
+
Release
@@ -21,7 +21,7 @@
Application
Unicode
- v140
+ v141
true
diff --git a/mk/windows/vs2017-64/glest_game.vcxproj b/mk/windows/vs2017-64/glest_game.vcxproj
index ad92f5385..d58662a53 100644
--- a/mk/windows/vs2017-64/glest_game.vcxproj
+++ b/mk/windows/vs2017-64/glest_game.vcxproj
@@ -384,7 +384,7 @@
Speed
false
true
- ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;../dependencies/src/breakpad/src;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\src\breakpad\src\client\windows
+ ../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/platform/win32;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../../../source/shared_lib/include/xml/rapidxml;../../../source/glest_game/ai;../../../source/glest_game/facilities;../../../source/glest_game/game;../../../source/glest_game/global;../../../source/glest_game/graphics;../../../source/glest_game/gui;../../../source/glest_game/main;../../../source/glest_game/menu;../../../source/glest_game/network;../../../source/glest_game/sound;../../../source/glest_game/steam;../../../source/glest_game/steamshim;../../../source/glest_game/type_instances;../../../source/glest_game/types;../../../source/glest_game/world;../dependencies/src/xerces/src;../dependencies/src/sdl2/include;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/sound/openal;../dependencies/src/openal/include;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../dependencies/src/irc/include;../dependencies/src/glew/include;../../../source/shared_lib/include/compression;..\dependencies\src\lua\src;..\dependencies\src\lua;..\dependencies\
%(AdditionalUsingDirectories)
NDEBUG;USE_STREFLOP;WIN32;AL_LIBTYPE_STATIC;_LIB;_WINDOWS;XML_LIBRARY;USE_PCH=1;_CRT_SECURE_NO_WARNINGS;STREFLOP_SSE;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;XERCES_STATIC_LIBRARY;GLEW_STATIC;USE_FREETYPEGL_XXX;STATICLIB;USE_FTGL;FTGL_LIBRARY_STATIC;ZLIB_WINAPI;%(PreprocessorDefinitions)
true
diff --git a/mk/windows/vs2017-64/libglest.vcxproj b/mk/windows/vs2017-64/libglest.vcxproj
index 0bb285015..f61d41759 100644
--- a/mk/windows/vs2017-64/libglest.vcxproj
+++ b/mk/windows/vs2017-64/libglest.vcxproj
@@ -304,7 +304,7 @@
true
Speed
true
- ../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../dependencies/src/xerces/src;../dependencies/src/xerces/src/xercesc/xinclude;../dependencies/src/png;../dependencies/src/jpeg;../dependencies/src/sdl2/include;../dependencies/src/openal/include;../../../source/shared_lib/include/sound/openal;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/streflop/libm_flt32_source;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../../../source/shared_lib/include/platform/miniupnpc;../../../source/shared_lib/include/libircclient/include;../../../source/shared_lib/include/feathery_ftp;../dependencies/src/ftgl/src;../dependencies/src/freetype/include/freetype;../dependencies/src/glew/include;../../../source/shared_lib/include/graphics/md5;../../../source/shared_lib/include/streflop/softfloat;../../../source/shared_lib/include/xml/rapidxml;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/platform/win32;../dependencies/src/vlc/include;../../../source/shared_lib/include/compression;../../../source/shared_lib/sources/;../dependencies/src/fribidi/lib;../dependencies/src/fribidi/charset;..\dependencies\src\freetype\include;..\dependencies\src\vorbis\include;..\dependencies\src\ogg\include;..\dependencies\src\lua\src;..\dependencies\src\lua;../dependencies/src/fribidi/;..\dependencies\src\fribidi\vs2017-64;..\dependencies\src\fribidi\vs2017-64\lib;..\dependencies\mingw64\include;%(AdditionalIncludeDirectories)
+ ../../../source/shared_lib/include;../../../source/shared_lib/include/graphics;../../../source/shared_lib/include/graphics/gl;../../../source/shared_lib/include/platform;../../../source/shared_lib/include/sound;../../../source/shared_lib/include/util;../../../source/shared_lib/include/lua;../../../source/shared_lib/include/xml;../dependencies/src/xerces/src;../dependencies/src/xerces/src/xercesc/xinclude;../dependencies/src/png;../dependencies/src/jpeg;../dependencies/src/sdl2/include;../dependencies/src/openal/include;../../../source/shared_lib/include/sound/openal;../../../source/shared_lib/include/platform/posix;../../../source/shared_lib/include/streflop;../../../source/shared_lib/include/streflop/libm_flt32_source;../../../source/shared_lib/include/platform/common;../dependencies/src/curl/include;../../../source/shared_lib/include/map;../../../source/shared_lib/include/platform/miniupnpc;../../../source/shared_lib/include/libircclient/include;../../../source/shared_lib/include/feathery_ftp;../dependencies/src/ftgl/src;../dependencies/src/freetype/include/freetype;../dependencies/src/glew/include;../../../source/shared_lib/include/graphics/md5;../../../source/shared_lib/include/streflop/softfloat;../../../source/shared_lib/include/xml/rapidxml;../../../source/shared_lib/include/platform/sdl;../../../source/shared_lib/include/platform/win32;../dependencies/src/vlc/include;../../../source/shared_lib/include/compression;../../../source/shared_lib/sources/;../dependencies/src/fribidi/lib;../dependencies/src/fribidi/charset;..\dependencies\src\freetype\include;..\dependencies\src\vorbis\include;..\dependencies\src\ogg\include;..\dependencies\src\lua\src;..\dependencies\src\lua;../dependencies/src/fribidi/;..\dependencies\src\fribidi\vs2017-64;..\dependencies\src\fribidi\vs2017-64\lib;..\dependencies\;%(AdditionalIncludeDirectories)
NDEBUG;USE_STREFLOP;WIN32;AL_LIBTYPE_STATIC;_LIB;_CRT_SECURE_NO_WARNINGS;USE_PCH=1;STREFLOP_SSE;STREFLOP_RANDOM_GEN_SIZE=32;LIBM_COMPILING_FLT32;CURL_STATICLIB;UNICODE;USE_FTGL;FTGL_LIBRARY_STATIC;TA3D_PLATFORM_MSVC;TA3D_PLATFORM_WINDOWS;STATICLIB;XERCES_STATIC_LIBRARY;GLEW_STATIC;XML_LIBRARY;ZLIB_WINAPI;HAVE_FRIBIDI;MINIUPNP_STATICLIB;%(PreprocessorDefinitions)
true
Async
@@ -324,7 +324,7 @@
libcurl.lib;glew.lib;freetype.lib;libfribidi.lib;openal32.lib;%(AdditionalDependencies)
- ..\dependencies\src\curl\vs2017-64\Release;..\dependencies\src\glew\vs2017-64\Release;..\dependencies\src\freetype\builds\windows\vs2017-64\x64\Release;..\dependencies\src\fribidi\vs2017-64\msvc\lib\x64;..\dependencies\src\zlib\vs2017-64\Release;..\dependencies\src\openal\vs2017-64\Release;..\dependencies\openssl-1.1.0f-vs2017\lib64;%(AdditionalLibraryDirectories)
+ ..\dependencies\src\curl\vs2017-64\Release;..\dependencies\src\glew\vs2017-64\Release;..\dependencies\src\freetype\builds\windows\vs2017-64\x64\Release;..\dependencies\src\fribidi\vs2017-64\msvc\lib\x64;..\dependencies\src\zlib\vs2017-64\Release;..\dependencies\src\openal\vs2017-64\Release;..\dependencies\openssl\vs2017\lib64;%(AdditionalLibraryDirectories)
MachineX64
diff --git a/mk/windows/vs2017-64/map_editor.vcxproj b/mk/windows/vs2017-64/map_editor.vcxproj
index ffac00afe..87469aaf4 100644
--- a/mk/windows/vs2017-64/map_editor.vcxproj
+++ b/mk/windows/vs2017-64/map_editor.vcxproj
@@ -1,5 +1,5 @@
-
+
Release
@@ -20,7 +20,7 @@
Application
- v140
+ v141
Unicode
true
diff --git a/source/shared_lib/sources/libircclient/build/source/libircclient/cocoa/IRCClient_Prefix.pch b/source/shared_lib/sources/libircclient/build/source/libircclient/cocoa/IRCClient_Prefix.pch
deleted file mode 100644
index c3fa0f87a..000000000
--- a/source/shared_lib/sources/libircclient/build/source/libircclient/cocoa/IRCClient_Prefix.pch
+++ /dev/null
@@ -1,7 +0,0 @@
-//
-// Prefix header for all source files of the 'IRCClient' target in the 'IRCClient' project.
-//
-
-#ifdef __OBJC__
- #import
-#endif
diff --git a/source/shared_lib/sources/libircclient/cocoa/IRCClient_Prefix.pch b/source/shared_lib/sources/libircclient/cocoa/IRCClient_Prefix.pch
deleted file mode 100644
index c3fa0f87a..000000000
--- a/source/shared_lib/sources/libircclient/cocoa/IRCClient_Prefix.pch
+++ /dev/null
@@ -1,7 +0,0 @@
-//
-// Prefix header for all source files of the 'IRCClient' target in the 'IRCClient' project.
-//
-
-#ifdef __OBJC__
- #import
-#endif