eu07/maszyna
16
0
Fork 0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-21 17:09:19 +02:00
Code Issues 123 Wiki Activity

Merge branch 'tmj-dev' into milek-dev

Browse Source
This commit is contained in:
milek7
2018-09-16 22:48:53 +02:00
parent e938466c90 e881092ca0
commit d9687a4e1f
126 changed files with 40430 additions and 6134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
stdafx.h
View File

@@ -35,6 +35,7 @@
// stl
#include <cstddef>
#include <cstdlib>
#include <cstdio>
#include <cassert>
#include <cstdint>
#include <iostream>
@@ -84,10 +85,7 @@
#include "GL/wglew.h"
#endif
#define GLFW_INCLUDE_GLU
#ifndef __ANDROID__
#include <GLFW/glfw3.h>
#endif
#define GLM_ENABLE_EXPERIMENTAL
#define GLM_FORCE_CTOR_INIT
@@ -104,4 +102,14 @@
#define STRINGIZE_DETAIL(x) #x
#define STRINGIZE(x) STRINGIZE_DETAIL(x)
#define glDebug(x) if (GLEW_GREMEDY_string_marker) glStringMarkerGREMEDY(0, __FILE__ ":" STRINGIZE(__LINE__) ": " x);
#ifdef DBG_NEW
#pragma push_macro("new")
#undef new
#include "imgui/imgui.h"
#pragma pop_macro("new")
#else
#include "imgui/imgui.h"
#endif
#endif