diff options
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | src/client/imagefilters.cpp | 1 | ||||
| -rw-r--r-- | src/filesys.cpp | 1 |
4 files changed, 7 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index a83a3718f..2e1e68157 100644 --- 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 @@ -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 97ad094e5..b62e336f7 100644 --- 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 44f1c88b3..60090c801 100644 --- 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) { |