eu07/maszyna
1
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-03-22 15:05:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tmj/master' into sim

Browse Source
This commit is contained in:
milek7
2020-10-18 23:35:14 +02:00
parent 1dc1bd5fcb 4da87e98d9
commit 29f8f91ad8
244 changed files with 54164 additions and 11636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
stdafx.h
View File

@@ -73,6 +73,7 @@
#include <chrono>
#include <optional>
#include <filesystem>
#include <variant>
#include "glad/glad.h"
@@ -107,5 +108,8 @@ int const null_handle = 0;
#define glDebug(x) if (GLAD_GL_GREMEDY_string_marker) glStringMarkerGREMEDY(0, __FILE__ ":" STRINGIZE(__LINE__) ": " x);
#include "imgui/imgui.h"
#include "openglcolor.h"
#endif
#pragma warning( disable : 5033 ) // "register is no longer a supported storage class" but it's all over python headers