Fix compiling on Windows with Visual Studio

diff --git a/.gitignore b/.gitignore
index a83a3718f6d30909940dc0c3235c034a03df75c4..2e1e68157ab093f354f3f8a407476d77bcbfc912 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -107,6 +107,10 @@ CMakeDoxy*
 compile_commands.json
 *.apk
 *.zip
+# Visual Studio
+*.vcxproj*
+*.sln
+.vs/
 
 # Optional user provided library folder
 lib/irrlichtmt

diff --git a/README.md b/README.md
index 30cc7fb206749013207b0e507cd7f8e092756ae7..372276b854f8a1b98cc94066c46f62ef7ddbf10f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -327,7 +327,7 @@ It is highly recommended to use vcpkg as package manager.
 
 After you successfully built vcpkg you can easily install the required libraries:
 ```powershell
-vcpkg install zlib zstd curl[winssl] openal-soft libvorbis libogg sqlite3 freetype luajit gmp jsoncpp --triplet x64-windows
+vcpkg install zlib zstd curl[winssl] openal-soft libvorbis libogg libjpeg-turbo sqlite3 freetype luajit gmp jsoncpp opengl-registry --triplet x64-windows
 ```
 
 - **Don't forget about IrrlichtMt.** The easiest way is to clone it to `lib/irrlichtmt` as described in the Linux section.

diff --git a/src/client/imagefilters.cpp b/src/client/imagefilters.cpp
index 97ad094e54453d1dc26a85e9b2295ba7a0269647..b62e336f757a28a66193f60386f3ee1be8442c61 100644 (file)
--- a/src/client/imagefilters.cpp
+++ b/src/client/imagefilters.cpp
@@ -21,6 +21,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #include <cmath>
 #include <cassert>
 #include <vector>
+#include <algorithm>
 
 // Simple 2D bitmap class with just the functionality needed here
 class Bitmap {

diff --git a/src/filesys.cpp b/src/filesys.cpp
index 44f1c88b34fd05b933f01073f0d1ee365e2c35ce..60090c8012b4b3825316b9b33293571ed790da4c 100644 (file)
--- a/src/filesys.cpp
+++ b/src/filesys.cpp
@@ -45,6 +45,7 @@ namespace fs
 #include <windows.h>
 #include <shlwapi.h>
 #include <io.h>
+#include <direct.h>
 
 std::vector<DirListNode> GetDirListing(const std::string &pathstring)
 {