sigonasr2/olcPixelGameEngine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Version 1.22

Browse Source 
Added guards for std::filesystem warnings
This commit is contained in:
Javidx9 2020-01-05 13:11:31 +00:00 committed by GitHub
parent a72d296c14
commit 9a7fe04f3e
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
olcPixelGameEngine.h
View File

@ -2,7 +2,7 @@
olcPixelGameEngine.h
+-------------------------------------------------------------+
| OneLoneCoder Pixel Game Engine v1.21 |
| OneLoneCoder Pixel Game Engine v1.22 |
| "Like the command prompt console one, but not..." - javidx9 |
+-------------------------------------------------------------+
@ -144,7 +144,7 @@
Author
~~~~~~
David Barr, aka javidx9, ©OneLoneCoder 2018, 2019
David Barr, aka javidx9, ©OneLoneCoder 2018, 2019
*/
//////////////////////////////////////////////////////////////////////////////////////////
@ -246,14 +246,28 @@
#include <functional>
#include <algorithm>
#if __cplusplus >= 201703L
// C++17 onwards
#include <filesystem>
namespace _gfs = std::filesystem;
#else
// Older "Modern" C++ :P
#include <experimental/filesystem>
namespace _gfs = std::experimental::filesystem::v1;
#if defined(_WIN32)
#if _MSVC_LANG >= 201703L // Thanks @slavka
// C++17 onwards
#include <filesystem>
namespace _gfs = std::filesystem;
#else
// Older "Modern" C++ :P
#include <experimental/filesystem>
namespace _gfs = std::experimental::filesystem::v1;
#endif
#endif
#if defined(_linux_) || defined(__MINGW32__)
#if __cplusplus >= 201703L
// C++17 onwards
#include <filesystem>
namespace _gfs = std::filesystem;
#else
// Older "Modern" C++ :P
#include <experimental/filesystem>
namespace _gfs = std::experimental::filesystem::v1;
#endif
#endif
#undef min