Merge branch 'master' into zscript

This commit is contained in:
Christoph Oelckers 2016-11-23 14:39:14 +01:00
commit d1f5d916c2
19 changed files with 64 additions and 96 deletions

View file

@ -72,7 +72,7 @@ FRenderer *Renderer;
IMPLEMENT_CLASS(DCanvas, true, false, false, false)
IMPLEMENT_CLASS(DFrameBuffer, true, false, false, false)
#if defined(_DEBUG) && defined(_M_IX86)
#if defined(_DEBUG) && defined(_M_IX86) && !defined(__MINGW32__)
#define DBGBREAK { __asm int 3 }
#else
#define DBGBREAK