Merge branch 'milek-dev' into gfx-work

This commit is contained in:
milek7
2019-04-05 21:17:45 +02:00
3 changed files with 10 additions and 15 deletions

View File

@@ -77,13 +77,6 @@
#include <chrono>
#include <optional>
#ifdef EU07_BUILD_STATIC
#define GLEW_STATIC
#else
#ifdef _WIN32
#define GLFW_DLL
#endif // _windows
#endif // build_static
#include "glad/glad.h"
#define GLFW_INCLUDE_NONE