diff --git a/examples/canvas/main.c b/examples/canvas/main.c
index d241ec4..c376c03 100644
--- a/examples/canvas/main.c
+++ b/examples/canvas/main.c
@@ -27,7 +27,7 @@ mg_font create_font()
 	FILE* fontFile = fopen(fontPathCString, "r");
 	if(!fontFile)
 	{
-		LOG_ERROR("Could not load font file '%s': %s\n", fontPathCString, strerror(errno));
+		log_error("Could not load font file '%s': %s\n", fontPathCString, strerror(errno));
 		return(mg_font_nil());
 	}
 	unsigned char* fontData = 0;
diff --git a/examples/perf_text/main.c b/examples/perf_text/main.c
index 461824a..0baeae6 100644
--- a/examples/perf_text/main.c
+++ b/examples/perf_text/main.c
@@ -69,7 +69,7 @@ mg_font create_font(const char* path)
 	FILE* fontFile = fopen(fontPathCString, "r");
 	if(!fontFile)
 	{
-		LOG_ERROR("Could not load font file '%s'\n", fontPathCString);
+		log_error("Could not load font file '%s'\n", fontPathCString);
 		return(mg_font_nil());
 	}
 	unsigned char* fontData = 0;
diff --git a/examples/smooth_resize/main.c b/examples/smooth_resize/main.c
index 3d1296a..6126eb6 100644
--- a/examples/smooth_resize/main.c
+++ b/examples/smooth_resize/main.c
@@ -29,7 +29,7 @@ mg_font create_font()
 	FILE* fontFile = fopen(fontPathCString, "r");
 	if(!fontFile)
 	{
-		LOG_ERROR("Could not load font file '%s': %s\n", fontPathCString, strerror(errno));
+		log_error("Could not load font file '%s': %s\n", fontPathCString, strerror(errno));
 		return(mg_font_nil());
 	}
 	unsigned char* fontData = 0;
diff --git a/examples/test_app/main.c b/examples/test_app/main.c
index 57e60c5..85e6197 100644
--- a/examples/test_app/main.c
+++ b/examples/test_app/main.c
@@ -52,7 +52,7 @@ int main()
 	free(fontPath);
 	if(!fontFile)
 	{
-		LOG_ERROR("Could not load font file '%s'\n", fontPath);
+		log_error("Could not load font file '%s'\n", fontPath);
 		return(-1);
 	}
 	unsigned char* fontData = 0;
diff --git a/examples/tiger/main.c b/examples/tiger/main.c
index 3c769dd..b71efb1 100644
--- a/examples/tiger/main.c
+++ b/examples/tiger/main.c
@@ -28,7 +28,7 @@ mg_font create_font()
 	FILE* fontFile = fopen(fontPathCString, "r");
 	if(!fontFile)
 	{
-		LOG_ERROR("Could not load font file '%s': %s\n", fontPathCString, strerror(errno));
+		log_error("Could not load font file '%s': %s\n", fontPathCString, strerror(errno));
 		return(mg_font_nil());
 	}
 	unsigned char* fontData = 0;
diff --git a/examples/ui/main.c b/examples/ui/main.c
index 491cb7e..161af0a 100644
--- a/examples/ui/main.c
+++ b/examples/ui/main.c
@@ -159,7 +159,7 @@ mg_font create_font()
 	FILE* fontFile = fopen(fontPathCString, "r");
 	if(!fontFile)
 	{
-		LOG_ERROR("Could not load font file '%s': %s\n", fontPathCString, strerror(errno));
+		log_error("Could not load font file '%s': %s\n", fontPathCString, strerror(errno));
 		return(mg_font_nil());
 	}
 	unsigned char* fontData = 0;
diff --git a/ext/stb_sprintf.h b/ext/stb_sprintf.h
new file mode 100644
index 0000000..ca432a6
--- /dev/null
+++ b/ext/stb_sprintf.h
@@ -0,0 +1,1906 @@
+// stb_sprintf - v1.10 - public domain snprintf() implementation
+// originally by Jeff Roberts / RAD Game Tools, 2015/10/20
+// http://github.com/nothings/stb
+//
+// allowed types:  sc uidBboXx p AaGgEef n
+// lengths      :  hh h ll j z t I64 I32 I
+//
+// Contributors:
+//    Fabian "ryg" Giesen (reformatting)
+//    github:aganm (attribute format)
+//
+// Contributors (bugfixes):
+//    github:d26435
+//    github:trex78
+//    github:account-login
+//    Jari Komppa (SI suffixes)
+//    Rohit Nirmal
+//    Marcin Wojdyr
+//    Leonard Ritter
+//    Stefano Zanotti
+//    Adam Allison
+//    Arvid Gerstmann
+//    Markus Kolb
+//
+// LICENSE:
+//
+//   See end of file for license information.
+
+#ifndef STB_SPRINTF_H_INCLUDE
+#define STB_SPRINTF_H_INCLUDE
+
+/*
+Single file sprintf replacement.
+
+Originally written by Jeff Roberts at RAD Game Tools - 2015/10/20.
+Hereby placed in public domain.
+
+This is a full sprintf replacement that supports everything that
+the C runtime sprintfs support, including float/double, 64-bit integers,
+hex floats, field parameters (%*.*d stuff), length reads backs, etc.
+
+Why would you need this if sprintf already exists?  Well, first off,
+it's *much* faster (see below). It's also much smaller than the CRT
+versions code-space-wise. We've also added some simple improvements
+that are super handy (commas in thousands, callbacks at buffer full,
+for example). Finally, the format strings for MSVC and GCC differ
+for 64-bit integers (among other small things), so this lets you use
+the same format strings in cross platform code.
+
+It uses the standard single file trick of being both the header file
+and the source itself. If you just include it normally, you just get
+the header file function definitions. To get the code, you include
+it from a C or C++ file and define STB_SPRINTF_IMPLEMENTATION first.
+
+It only uses va_args macros from the C runtime to do it's work. It
+does cast doubles to S64s and shifts and divides U64s, which does
+drag in CRT code on most platforms.
+
+It compiles to roughly 8K with float support, and 4K without.
+As a comparison, when using MSVC static libs, calling sprintf drags
+in 16K.
+
+API:
+====
+int stbsp_sprintf( char * buf, char const * fmt, ... )
+int stbsp_snprintf( char * buf, int count, char const * fmt, ... )
+  Convert an arg list into a buffer.  stbsp_snprintf always returns
+  a zero-terminated string (unlike regular snprintf).
+
+int stbsp_vsprintf( char * buf, char const * fmt, va_list va )
+int stbsp_vsnprintf( char * buf, int count, char const * fmt, va_list va )
+  Convert a va_list arg list into a buffer.  stbsp_vsnprintf always returns
+  a zero-terminated string (unlike regular snprintf).
+
+int stbsp_vsprintfcb( STBSP_SPRINTFCB * callback, void * user, char * buf, char const * fmt, va_list va )
+    typedef char * STBSP_SPRINTFCB( char const * buf, void * user, int len );
+  Convert into a buffer, calling back every STB_SPRINTF_MIN chars.
+  Your callback can then copy the chars out, print them or whatever.
+  This function is actually the workhorse for everything else.
+  The buffer you pass in must hold at least STB_SPRINTF_MIN characters.
+    // you return the next buffer to use or 0 to stop converting
+
+void stbsp_set_separators( char comma, char period )
+  Set the comma and period characters to use.
+
+FLOATS/DOUBLES:
+===============
+This code uses a internal float->ascii conversion method that uses
+doubles with error correction (double-doubles, for ~105 bits of
+precision).  This conversion is round-trip perfect - that is, an atof
+of the values output here will give you the bit-exact double back.
+
+One difference is that our insignificant digits will be different than
+with MSVC or GCC (but they don't match each other either).  We also
+don't attempt to find the minimum length matching float (pre-MSVC15
+doesn't either).
+
+If you don't need float or doubles at all, define STB_SPRINTF_NOFLOAT
+and you'll save 4K of code space.
+
+64-BIT INTS:
+============
+This library also supports 64-bit integers and you can use MSVC style or
+GCC style indicators (%I64d or %lld).  It supports the C99 specifiers
+for size_t and ptr_diff_t (%jd %zd) as well.
+
+EXTRAS:
+=======
+Like some GCCs, for integers and floats, you can use a ' (single quote)
+specifier and commas will be inserted on the thousands: "%'d" on 12345
+would print 12,345.
+
+For integers and floats, you can use a "$" specifier and the number
+will be converted to float and then divided to get kilo, mega, giga or
+tera and then printed, so "%$d" 1000 is "1.0 k", "%$.2d" 2536000 is
+"2.53 M", etc. For byte values, use two $:s, like "%$$d" to turn
+2536000 to "2.42 Mi". If you prefer JEDEC suffixes to SI ones, use three
+$:s: "%$$$d" -> "2.42 M". To remove the space between the number and the
+suffix, add "_" specifier: "%_$d" -> "2.53M".
+
+In addition to octal and hexadecimal conversions, you can print
+integers in binary: "%b" for 256 would print 100.
+
+PERFORMANCE vs MSVC 2008 32-/64-bit (GCC is even slower than MSVC):
+===================================================================
+"%d" across all 32-bit ints (4.8x/4.0x faster than 32-/64-bit MSVC)
+"%24d" across all 32-bit ints (4.5x/4.2x faster)
+"%x" across all 32-bit ints (4.5x/3.8x faster)
+"%08x" across all 32-bit ints (4.3x/3.8x faster)
+"%f" across e-10 to e+10 floats (7.3x/6.0x faster)
+"%e" across e-10 to e+10 floats (8.1x/6.0x faster)
+"%g" across e-10 to e+10 floats (10.0x/7.1x faster)
+"%f" for values near e-300 (7.9x/6.5x faster)
+"%f" for values near e+300 (10.0x/9.1x faster)
+"%e" for values near e-300 (10.1x/7.0x faster)
+"%e" for values near e+300 (9.2x/6.0x faster)
+"%.320f" for values near e-300 (12.6x/11.2x faster)
+"%a" for random values (8.6x/4.3x faster)
+"%I64d" for 64-bits with 32-bit values (4.8x/3.4x faster)
+"%I64d" for 64-bits > 32-bit values (4.9x/5.5x faster)
+"%s%s%s" for 64 char strings (7.1x/7.3x faster)
+"...512 char string..." ( 35.0x/32.5x faster!)
+*/
+
+#if defined(__clang__)
+ #if defined(__has_feature) && defined(__has_attribute)
+  #if __has_feature(address_sanitizer)
+   #if __has_attribute(__no_sanitize__)
+    #define STBSP__ASAN __attribute__((__no_sanitize__("address")))
+   #elif __has_attribute(__no_sanitize_address__)
+    #define STBSP__ASAN __attribute__((__no_sanitize_address__))
+   #elif __has_attribute(__no_address_safety_analysis__)
+    #define STBSP__ASAN __attribute__((__no_address_safety_analysis__))
+   #endif
+  #endif
+ #endif
+#elif defined(__GNUC__) && (__GNUC__ >= 5 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 8))
+ #if defined(__SANITIZE_ADDRESS__) && __SANITIZE_ADDRESS__
+  #define STBSP__ASAN __attribute__((__no_sanitize_address__))
+ #endif
+#endif
+
+#ifndef STBSP__ASAN
+#define STBSP__ASAN
+#endif
+
+#ifdef STB_SPRINTF_STATIC
+#define STBSP__PUBLICDEC static
+#define STBSP__PUBLICDEF static STBSP__ASAN
+#else
+#ifdef __cplusplus
+#define STBSP__PUBLICDEC extern "C"
+#define STBSP__PUBLICDEF extern "C" STBSP__ASAN
+#else
+#define STBSP__PUBLICDEC extern
+#define STBSP__PUBLICDEF STBSP__ASAN
+#endif
+#endif
+
+#if defined(__has_attribute)
+ #if __has_attribute(format)
+   #define STBSP__ATTRIBUTE_FORMAT(fmt,va) __attribute__((format(printf,fmt,va)))
+ #endif
+#endif
+
+#ifndef STBSP__ATTRIBUTE_FORMAT
+#define STBSP__ATTRIBUTE_FORMAT(fmt,va)
+#endif
+
+#ifdef _MSC_VER
+#define STBSP__NOTUSED(v)  (void)(v)
+#else
+#define STBSP__NOTUSED(v)  (void)sizeof(v)
+#endif
+
+#include <stdarg.h> // for va_arg(), va_list()
+#include <stddef.h> // size_t, ptrdiff_t
+
+#ifndef STB_SPRINTF_MIN
+#define STB_SPRINTF_MIN 512 // how many characters per callback
+#endif
+typedef char *STBSP_SPRINTFCB(const char *buf, void *user, int len);
+
+#ifndef STB_SPRINTF_DECORATE
+#define STB_SPRINTF_DECORATE(name) stbsp_##name // define this before including if you want to change the names
+#endif
+
+STBSP__PUBLICDEC int STB_SPRINTF_DECORATE(vsprintf)(char *buf, char const *fmt, va_list va);
+STBSP__PUBLICDEC int STB_SPRINTF_DECORATE(vsnprintf)(char *buf, int count, char const *fmt, va_list va);
+STBSP__PUBLICDEC int STB_SPRINTF_DECORATE(sprintf)(char *buf, char const *fmt, ...) STBSP__ATTRIBUTE_FORMAT(2,3);
+STBSP__PUBLICDEC int STB_SPRINTF_DECORATE(snprintf)(char *buf, int count, char const *fmt, ...) STBSP__ATTRIBUTE_FORMAT(3,4);
+
+STBSP__PUBLICDEC int STB_SPRINTF_DECORATE(vsprintfcb)(STBSP_SPRINTFCB *callback, void *user, char *buf, char const *fmt, va_list va);
+STBSP__PUBLICDEC void STB_SPRINTF_DECORATE(set_separators)(char comma, char period);
+
+#endif // STB_SPRINTF_H_INCLUDE
+
+#ifdef STB_SPRINTF_IMPLEMENTATION
+
+#define stbsp__uint32 unsigned int
+#define stbsp__int32 signed int
+
+#ifdef _MSC_VER
+#define stbsp__uint64 unsigned __int64
+#define stbsp__int64 signed __int64
+#else
+#define stbsp__uint64 unsigned long long
+#define stbsp__int64 signed long long
+#endif
+#define stbsp__uint16 unsigned short
+
+#ifndef stbsp__uintptr
+#if defined(__ppc64__) || defined(__powerpc64__) || defined(__aarch64__) || defined(_M_X64) || defined(__x86_64__) || defined(__x86_64) || defined(__s390x__)
+#define stbsp__uintptr stbsp__uint64
+#else
+#define stbsp__uintptr stbsp__uint32
+#endif
+#endif
+
+#ifndef STB_SPRINTF_MSVC_MODE // used for MSVC2013 and earlier (MSVC2015 matches GCC)
+#if defined(_MSC_VER) && (_MSC_VER < 1900)
+#define STB_SPRINTF_MSVC_MODE
+#endif
+#endif
+
+#ifdef STB_SPRINTF_NOUNALIGNED // define this before inclusion to force stbsp_sprintf to always use aligned accesses
+#define STBSP__UNALIGNED(code)
+#else
+#define STBSP__UNALIGNED(code) code
+#endif
+
+#ifndef STB_SPRINTF_NOFLOAT
+// internal float utility functions
+static stbsp__int32 stbsp__real_to_str(char const **start, stbsp__uint32 *len, char *out, stbsp__int32 *decimal_pos, double value, stbsp__uint32 frac_digits);
+static stbsp__int32 stbsp__real_to_parts(stbsp__int64 *bits, stbsp__int32 *expo, double value);
+#define STBSP__SPECIAL 0x7000
+#endif
+
+static char stbsp__period = '.';
+static char stbsp__comma = ',';
+static struct
+{
+   short temp; // force next field to be 2-byte aligned
+   char pair[201];
+} stbsp__digitpair =
+{
+  0,
+   "00010203040506070809101112131415161718192021222324"
+   "25262728293031323334353637383940414243444546474849"
+   "50515253545556575859606162636465666768697071727374"
+   "75767778798081828384858687888990919293949596979899"
+};
+
+STBSP__PUBLICDEF void STB_SPRINTF_DECORATE(set_separators)(char pcomma, char pperiod)
+{
+   stbsp__period = pperiod;
+   stbsp__comma = pcomma;
+}
+
+#define STBSP__LEFTJUST 1
+#define STBSP__LEADINGPLUS 2
+#define STBSP__LEADINGSPACE 4
+#define STBSP__LEADING_0X 8
+#define STBSP__LEADINGZERO 16
+#define STBSP__INTMAX 32
+#define STBSP__TRIPLET_COMMA 64
+#define STBSP__NEGATIVE 128
+#define STBSP__METRIC_SUFFIX 256
+#define STBSP__HALFWIDTH 512
+#define STBSP__METRIC_NOSPACE 1024
+#define STBSP__METRIC_1024 2048
+#define STBSP__METRIC_JEDEC 4096
+
+static void stbsp__lead_sign(stbsp__uint32 fl, char *sign)
+{
+   sign[0] = 0;
+   if (fl & STBSP__NEGATIVE) {
+      sign[0] = 1;
+      sign[1] = '-';
+   } else if (fl & STBSP__LEADINGSPACE) {
+      sign[0] = 1;
+      sign[1] = ' ';
+   } else if (fl & STBSP__LEADINGPLUS) {
+      sign[0] = 1;
+      sign[1] = '+';
+   }
+}
+
+static STBSP__ASAN stbsp__uint32 stbsp__strlen_limited(char const *s, stbsp__uint32 limit)
+{
+   char const * sn = s;
+
+   // get up to 4-byte alignment
+   for (;;) {
+      if (((stbsp__uintptr)sn & 3) == 0)
+         break;
+
+      if (!limit || *sn == 0)
+         return (stbsp__uint32)(sn - s);
+
+      ++sn;
+      --limit;
+   }
+
+   // scan over 4 bytes at a time to find terminating 0
+   // this will intentionally scan up to 3 bytes past the end of buffers,
+   // but becase it works 4B aligned, it will never cross page boundaries
+   // (hence the STBSP__ASAN markup; the over-read here is intentional
+   // and harmless)
+   while (limit >= 4) {
+      stbsp__uint32 v = *(stbsp__uint32 *)sn;
+      // bit hack to find if there's a 0 byte in there
+      if ((v - 0x01010101) & (~v) & 0x80808080UL)
+         break;
+
+      sn += 4;
+      limit -= 4;
+   }
+
+   // handle the last few characters to find actual size
+   while (limit && *sn) {
+      ++sn;
+      --limit;
+   }
+
+   return (stbsp__uint32)(sn - s);
+}
+
+STBSP__PUBLICDEF int STB_SPRINTF_DECORATE(vsprintfcb)(STBSP_SPRINTFCB *callback, void *user, char *buf, char const *fmt, va_list va)
+{
+   static char hex[] = "0123456789abcdefxp";
+   static char hexu[] = "0123456789ABCDEFXP";
+   char *bf;
+   char const *f;
+   int tlen = 0;
+
+   bf = buf;
+   f = fmt;
+   for (;;) {
+      stbsp__int32 fw, pr, tz;
+      stbsp__uint32 fl;
+
+      // macros for the callback buffer stuff
+      #define stbsp__chk_cb_bufL(bytes)                        \
+         {                                                     \
+            int len = (int)(bf - buf);                         \
+            if ((len + (bytes)) >= STB_SPRINTF_MIN) {          \
+               tlen += len;                                    \
+               if (0 == (bf = buf = callback(buf, user, len))) \
+                  goto done;                                   \
+            }                                                  \
+         }
+      #define stbsp__chk_cb_buf(bytes)    \
+         {                                \
+            if (callback) {               \
+               stbsp__chk_cb_bufL(bytes); \
+            }                             \
+         }
+      #define stbsp__flush_cb()                      \
+         {                                           \
+            stbsp__chk_cb_bufL(STB_SPRINTF_MIN - 1); \
+         } // flush if there is even one byte in the buffer
+      #define stbsp__cb_buf_clamp(cl, v)                \
+         cl = v;                                        \
+         if (callback) {                                \
+            int lg = STB_SPRINTF_MIN - (int)(bf - buf); \
+            if (cl > lg)                                \
+               cl = lg;                                 \
+         }
+
+      // fast copy everything up to the next % (or end of string)
+      for (;;) {
+         while (((stbsp__uintptr)f) & 3) {
+         schk1:
+            if (f[0] == '%')
+               goto scandd;
+         schk2:
+            if (f[0] == 0)
+               goto endfmt;
+            stbsp__chk_cb_buf(1);
+            *bf++ = f[0];
+            ++f;
+         }
+         for (;;) {
+            // Check if the next 4 bytes contain %(0x25) or end of string.
+            // Using the 'hasless' trick:
+            // https://graphics.stanford.edu/~seander/bithacks.html#HasLessInWord
+            stbsp__uint32 v, c;
+            v = *(stbsp__uint32 *)f;
+            c = (~v) & 0x80808080;
+            if (((v ^ 0x25252525) - 0x01010101) & c)
+               goto schk1;
+            if ((v - 0x01010101) & c)
+               goto schk2;
+            if (callback)
+               if ((STB_SPRINTF_MIN - (int)(bf - buf)) < 4)
+                  goto schk1;
+            #ifdef STB_SPRINTF_NOUNALIGNED
+                if(((stbsp__uintptr)bf) & 3) {
+                    bf[0] = f[0];
+                    bf[1] = f[1];
+                    bf[2] = f[2];
+                    bf[3] = f[3];
+                } else
+            #endif
+            {
+                *(stbsp__uint32 *)bf = v;
+            }
+            bf += 4;
+            f += 4;
+         }
+      }
+   scandd:
+
+      ++f;
+
+      // ok, we have a percent, read the modifiers first
+      fw = 0;
+      pr = -1;
+      fl = 0;
+      tz = 0;
+
+      // flags
+      for (;;) {
+         switch (f[0]) {
+         // if we have left justify
+         case '-':
+            fl |= STBSP__LEFTJUST;
+            ++f;
+            continue;
+         // if we have leading plus
+         case '+':
+            fl |= STBSP__LEADINGPLUS;
+            ++f;
+            continue;
+         // if we have leading space
+         case ' ':
+            fl |= STBSP__LEADINGSPACE;
+            ++f;
+            continue;
+         // if we have leading 0x
+         case '#':
+            fl |= STBSP__LEADING_0X;
+            ++f;
+            continue;
+         // if we have thousand commas
+         case '\'':
+            fl |= STBSP__TRIPLET_COMMA;
+            ++f;
+            continue;
+         // if we have kilo marker (none->kilo->kibi->jedec)
+         case '$':
+            if (fl & STBSP__METRIC_SUFFIX) {
+               if (fl & STBSP__METRIC_1024) {
+                  fl |= STBSP__METRIC_JEDEC;
+               } else {
+                  fl |= STBSP__METRIC_1024;
+               }
+            } else {
+               fl |= STBSP__METRIC_SUFFIX;
+            }
+            ++f;
+            continue;
+         // if we don't want space between metric suffix and number
+         case '_':
+            fl |= STBSP__METRIC_NOSPACE;
+            ++f;
+            continue;
+         // if we have leading zero
+         case '0':
+            fl |= STBSP__LEADINGZERO;
+            ++f;
+            goto flags_done;
+         default: goto flags_done;
+         }
+      }
+   flags_done:
+
+      // get the field width
+      if (f[0] == '*') {
+         fw = va_arg(va, stbsp__uint32);
+         ++f;
+      } else {
+         while ((f[0] >= '0') && (f[0] <= '9')) {
+            fw = fw * 10 + f[0] - '0';
+            f++;
+         }
+      }
+      // get the precision
+      if (f[0] == '.') {
+         ++f;
+         if (f[0] == '*') {
+            pr = va_arg(va, stbsp__uint32);
+            ++f;
+         } else {
+            pr = 0;
+            while ((f[0] >= '0') && (f[0] <= '9')) {
+               pr = pr * 10 + f[0] - '0';
+               f++;
+            }
+         }
+      }
+
+      // handle integer size overrides
+      switch (f[0]) {
+      // are we halfwidth?
+      case 'h':
+         fl |= STBSP__HALFWIDTH;
+         ++f;
+         if (f[0] == 'h')
+            ++f;  // QUARTERWIDTH
+         break;
+      // are we 64-bit (unix style)
+      case 'l':
+         fl |= ((sizeof(long) == 8) ? STBSP__INTMAX : 0);
+         ++f;
+         if (f[0] == 'l') {
+            fl |= STBSP__INTMAX;
+            ++f;
+         }
+         break;
+      // are we 64-bit on intmax? (c99)
+      case 'j':
+         fl |= (sizeof(size_t) == 8) ? STBSP__INTMAX : 0;
+         ++f;
+         break;
+      // are we 64-bit on size_t or ptrdiff_t? (c99)
+      case 'z':
+         fl |= (sizeof(ptrdiff_t) == 8) ? STBSP__INTMAX : 0;
+         ++f;
+         break;
+      case 't':
+         fl |= (sizeof(ptrdiff_t) == 8) ? STBSP__INTMAX : 0;
+         ++f;
+         break;
+      // are we 64-bit (msft style)
+      case 'I':
+         if ((f[1] == '6') && (f[2] == '4')) {
+            fl |= STBSP__INTMAX;
+            f += 3;
+         } else if ((f[1] == '3') && (f[2] == '2')) {
+            f += 3;
+         } else {
+            fl |= ((sizeof(void *) == 8) ? STBSP__INTMAX : 0);
+            ++f;
+         }
+         break;
+      default: break;
+      }
+
+      // handle each replacement
+      switch (f[0]) {
+         #define STBSP__NUMSZ 512 // big enough for e308 (with commas) or e-307
+         char num[STBSP__NUMSZ];
+         char lead[8];
+         char tail[8];
+         char *s;
+         char const *h;
+         stbsp__uint32 l, n, cs;
+         stbsp__uint64 n64;
+#ifndef STB_SPRINTF_NOFLOAT
+         double fv;
+#endif
+         stbsp__int32 dp;
+         char const *sn;
+
+      case 's':
+         // get the string
+         s = va_arg(va, char *);
+         if (s == 0)
+            s = (char *)"null";
+         // get the length, limited to desired precision
+         // always limit to ~0u chars since our counts are 32b
+         l = stbsp__strlen_limited(s, (pr >= 0) ? pr : ~0u);
+         lead[0] = 0;
+         tail[0] = 0;
+         pr = 0;
+         dp = 0;
+         cs = 0;
+         // copy the string in
+         goto scopy;
+
+      case 'c': // char
+         // get the character
+         s = num + STBSP__NUMSZ - 1;
+         *s = (char)va_arg(va, int);
+         l = 1;
+         lead[0] = 0;
+         tail[0] = 0;
+         pr = 0;
+         dp = 0;
+         cs = 0;
+         goto scopy;
+
+      case 'n': // weird write-bytes specifier
+      {
+         int *d = va_arg(va, int *);
+         *d = tlen + (int)(bf - buf);
+      } break;
+
+#ifdef STB_SPRINTF_NOFLOAT
+      case 'A':              // float
+      case 'a':              // hex float
+      case 'G':              // float
+      case 'g':              // float
+      case 'E':              // float
+      case 'e':              // float
+      case 'f':              // float
+         va_arg(va, double); // eat it
+         s = (char *)"No float";
+         l = 8;
+         lead[0] = 0;
+         tail[0] = 0;
+         pr = 0;
+         cs = 0;
+         STBSP__NOTUSED(dp);
+         goto scopy;
+#else
+      case 'A': // hex float
+      case 'a': // hex float
+         h = (f[0] == 'A') ? hexu : hex;
+         fv = va_arg(va, double);
+         if (pr == -1)
+            pr = 6; // default is 6
+         // read the double into a string
+         if (stbsp__real_to_parts((stbsp__int64 *)&n64, &dp, fv))
+            fl |= STBSP__NEGATIVE;
+
+         s = num + 64;
+
+         stbsp__lead_sign(fl, lead);
+
+         if (dp == -1023)
+            dp = (n64) ? -1022 : 0;
+         else
+            n64 |= (((stbsp__uint64)1) << 52);
+         n64 <<= (64 - 56);
+         if (pr < 15)
+            n64 += ((((stbsp__uint64)8) << 56) >> (pr * 4));
+// add leading chars
+
+#ifdef STB_SPRINTF_MSVC_MODE
+         *s++ = '0';
+         *s++ = 'x';
+#else
+         lead[1 + lead[0]] = '0';
+         lead[2 + lead[0]] = 'x';
+         lead[0] += 2;
+#endif
+         *s++ = h[(n64 >> 60) & 15];
+         n64 <<= 4;
+         if (pr)
+            *s++ = stbsp__period;
+         sn = s;
+
+         // print the bits
+         n = pr;
+         if (n > 13)
+            n = 13;
+         if (pr > (stbsp__int32)n)
+            tz = pr - n;
+         pr = 0;
+         while (n--) {
+            *s++ = h[(n64 >> 60) & 15];
+            n64 <<= 4;
+         }
+
+         // print the expo
+         tail[1] = h[17];
+         if (dp < 0) {
+            tail[2] = '-';
+            dp = -dp;
+         } else
+            tail[2] = '+';
+         n = (dp >= 1000) ? 6 : ((dp >= 100) ? 5 : ((dp >= 10) ? 4 : 3));
+         tail[0] = (char)n;
+         for (;;) {
+            tail[n] = '0' + dp % 10;
+            if (n <= 3)
+               break;
+            --n;
+            dp /= 10;
+         }
+
+         dp = (int)(s - sn);
+         l = (int)(s - (num + 64));
+         s = num + 64;
+         cs = 1 + (3 << 24);
+         goto scopy;
+
+      case 'G': // float
+      case 'g': // float
+         h = (f[0] == 'G') ? hexu : hex;
+         fv = va_arg(va, double);
+         if (pr == -1)
+            pr = 6;
+         else if (pr == 0)
+            pr = 1; // default is 6
+         // read the double into a string
+         if (stbsp__real_to_str(&sn, &l, num, &dp, fv, (pr - 1) | 0x80000000))
+            fl |= STBSP__NEGATIVE;
+
+         // clamp the precision and delete extra zeros after clamp
+         n = pr;
+         if (l > (stbsp__uint32)pr)
+            l = pr;
+         while ((l > 1) && (pr) && (sn[l - 1] == '0')) {
+            --pr;
+            --l;
+         }
+
+         // should we use %e
+         if ((dp <= -4) || (dp > (stbsp__int32)n)) {
+            if (pr > (stbsp__int32)l)
+               pr = l - 1;
+            else if (pr)
+               --pr; // when using %e, there is one digit before the decimal
+            goto doexpfromg;
+         }
+         // this is the insane action to get the pr to match %g semantics for %f
+         if (dp > 0) {
+            pr = (dp < (stbsp__int32)l) ? l - dp : 0;
+         } else {
+            pr = -dp + ((pr > (stbsp__int32)l) ? (stbsp__int32) l : pr);
+         }
+         goto dofloatfromg;
+
+      case 'E': // float
+      case 'e': // float
+         h = (f[0] == 'E') ? hexu : hex;
+         fv = va_arg(va, double);
+         if (pr == -1)
+            pr = 6; // default is 6
+         // read the double into a string
+         if (stbsp__real_to_str(&sn, &l, num, &dp, fv, pr | 0x80000000))
+            fl |= STBSP__NEGATIVE;
+      doexpfromg:
+         tail[0] = 0;
+         stbsp__lead_sign(fl, lead);
+         if (dp == STBSP__SPECIAL) {
+            s = (char *)sn;
+            cs = 0;
+            pr = 0;
+            goto scopy;
+         }
+         s = num + 64;
+         // handle leading chars
+         *s++ = sn[0];
+
+         if (pr)
+            *s++ = stbsp__period;
+
+         // handle after decimal
+         if ((l - 1) > (stbsp__uint32)pr)
+            l = pr + 1;
+         for (n = 1; n < l; n++)
+            *s++ = sn[n];
+         // trailing zeros
+         tz = pr - (l - 1);
+         pr = 0;
+         // dump expo
+         tail[1] = h[0xe];
+         dp -= 1;
+         if (dp < 0) {
+            tail[2] = '-';
+            dp = -dp;
+         } else
+            tail[2] = '+';
+#ifdef STB_SPRINTF_MSVC_MODE
+         n = 5;
+#else
+         n = (dp >= 100) ? 5 : 4;
+#endif
+         tail[0] = (char)n;
+         for (;;) {
+            tail[n] = '0' + dp % 10;
+            if (n <= 3)
+               break;
+            --n;
+            dp /= 10;
+         }
+         cs = 1 + (3 << 24); // how many tens
+         goto flt_lead;
+
+      case 'f': // float
+         fv = va_arg(va, double);
+      doafloat:
+         // do kilos
+         if (fl & STBSP__METRIC_SUFFIX) {
+            double divisor;
+            divisor = 1000.0f;
+            if (fl & STBSP__METRIC_1024)
+               divisor = 1024.0;
+            while (fl < 0x4000000) {
+               if ((fv < divisor) && (fv > -divisor))
+                  break;
+               fv /= divisor;
+               fl += 0x1000000;
+            }
+         }
+         if (pr == -1)
+            pr = 6; // default is 6
+         // read the double into a string
+         if (stbsp__real_to_str(&sn, &l, num, &dp, fv, pr))
+            fl |= STBSP__NEGATIVE;
+      dofloatfromg:
+         tail[0] = 0;
+         stbsp__lead_sign(fl, lead);
+         if (dp == STBSP__SPECIAL) {
+            s = (char *)sn;
+            cs = 0;
+            pr = 0;
+            goto scopy;
+         }
+         s = num + 64;
+
+         // handle the three decimal varieties
+         if (dp <= 0) {
+            stbsp__int32 i;
+            // handle 0.000*000xxxx
+            *s++ = '0';
+            if (pr)
+               *s++ = stbsp__period;
+            n = -dp;
+            if ((stbsp__int32)n > pr)
+               n = pr;
+            i = n;
+            while (i) {
+               if ((((stbsp__uintptr)s) & 3) == 0)
+                  break;
+               *s++ = '0';
+               --i;
+            }
+            while (i >= 4) {
+               *(stbsp__uint32 *)s = 0x30303030;
+               s += 4;
+               i -= 4;
+            }
+            while (i) {
+               *s++ = '0';
+               --i;
+            }
+            if ((stbsp__int32)(l + n) > pr)
+               l = pr - n;
+            i = l;
+            while (i) {
+               *s++ = *sn++;
+               --i;
+            }
+            tz = pr - (n + l);
+            cs = 1 + (3 << 24); // how many tens did we write (for commas below)
+         } else {
+            cs = (fl & STBSP__TRIPLET_COMMA) ? ((600 - (stbsp__uint32)dp) % 3) : 0;
+            if ((stbsp__uint32)dp >= l) {
+               // handle xxxx000*000.0
+               n = 0;
+               for (;;) {
+                  if ((fl & STBSP__TRIPLET_COMMA) && (++cs == 4)) {
+                     cs = 0;
+                     *s++ = stbsp__comma;
+                  } else {
+                     *s++ = sn[n];
+                     ++n;
+                     if (n >= l)
+                        break;
+                  }
+               }
+               if (n < (stbsp__uint32)dp) {
+                  n = dp - n;
+                  if ((fl & STBSP__TRIPLET_COMMA) == 0) {
+                     while (n) {
+                        if ((((stbsp__uintptr)s) & 3) == 0)
+                           break;
+                        *s++ = '0';
+                        --n;
+                     }
+                     while (n >= 4) {
+                        *(stbsp__uint32 *)s = 0x30303030;
+                        s += 4;
+                        n -= 4;
+                     }
+                  }
+                  while (n) {
+                     if ((fl & STBSP__TRIPLET_COMMA) && (++cs == 4)) {
+                        cs = 0;
+                        *s++ = stbsp__comma;
+                     } else {
+                        *s++ = '0';
+                        --n;
+                     }
+                  }
+               }
+               cs = (int)(s - (num + 64)) + (3 << 24); // cs is how many tens
+               if (pr) {
+                  *s++ = stbsp__period;
+                  tz = pr;
+               }
+            } else {
+               // handle xxxxx.xxxx000*000
+               n = 0;
+               for (;;) {
+                  if ((fl & STBSP__TRIPLET_COMMA) && (++cs == 4)) {
+                     cs = 0;
+                     *s++ = stbsp__comma;
+                  } else {
+                     *s++ = sn[n];
+                     ++n;
+                     if (n >= (stbsp__uint32)dp)
+                        break;
+                  }
+               }
+               cs = (int)(s - (num + 64)) + (3 << 24); // cs is how many tens
+               if (pr)
+                  *s++ = stbsp__period;
+               if ((l - dp) > (stbsp__uint32)pr)
+                  l = pr + dp;
+               while (n < l) {
+                  *s++ = sn[n];
+                  ++n;
+               }
+               tz = pr - (l - dp);
+            }
+         }
+         pr = 0;
+
+         // handle k,m,g,t
+         if (fl & STBSP__METRIC_SUFFIX) {
+            char idx;
+            idx = 1;
+            if (fl & STBSP__METRIC_NOSPACE)
+               idx = 0;
+            tail[0] = idx;
+            tail[1] = ' ';
+            {
+               if (fl >> 24) { // SI kilo is 'k', JEDEC and SI kibits are 'K'.
+                  if (fl & STBSP__METRIC_1024)
+                     tail[idx + 1] = "_KMGT"[fl >> 24];
+                  else
+                     tail[idx + 1] = "_kMGT"[fl >> 24];
+                  idx++;
+                  // If printing kibits and not in jedec, add the 'i'.
+                  if (fl & STBSP__METRIC_1024 && !(fl & STBSP__METRIC_JEDEC)) {
+                     tail[idx + 1] = 'i';
+                     idx++;
+                  }
+                  tail[0] = idx;
+               }
+            }
+         };
+
+      flt_lead:
+         // get the length that we copied
+         l = (stbsp__uint32)(s - (num + 64));
+         s = num + 64;
+         goto scopy;
+#endif
+
+      case 'B': // upper binary
+      case 'b': // lower binary
+         h = (f[0] == 'B') ? hexu : hex;
+         lead[0] = 0;
+         if (fl & STBSP__LEADING_0X) {
+            lead[0] = 2;
+            lead[1] = '0';
+            lead[2] = h[0xb];
+         }
+         l = (8 << 4) | (1 << 8);
+         goto radixnum;
+
+      case 'o': // octal
+         h = hexu;
+         lead[0] = 0;
+         if (fl & STBSP__LEADING_0X) {
+            lead[0] = 1;
+            lead[1] = '0';
+         }
+         l = (3 << 4) | (3 << 8);
+         goto radixnum;
+
+      case 'p': // pointer
+         fl |= (sizeof(void *) == 8) ? STBSP__INTMAX : 0;
+         pr = sizeof(void *) * 2;
+         fl &= ~STBSP__LEADINGZERO; // 'p' only prints the pointer with zeros
+                                    // fall through - to X
+
+      case 'X': // upper hex
+      case 'x': // lower hex
+         h = (f[0] == 'X') ? hexu : hex;
+         l = (4 << 4) | (4 << 8);
+         lead[0] = 0;
+         if (fl & STBSP__LEADING_0X) {
+            lead[0] = 2;
+            lead[1] = '0';
+            lead[2] = h[16];
+         }
+      radixnum:
+         // get the number
+         if (fl & STBSP__INTMAX)
+            n64 = va_arg(va, stbsp__uint64);
+         else
+            n64 = va_arg(va, stbsp__uint32);
+
+         s = num + STBSP__NUMSZ;
+         dp = 0;
+         // clear tail, and clear leading if value is zero
+         tail[0] = 0;
+         if (n64 == 0) {
+            lead[0] = 0;
+            if (pr == 0) {
+               l = 0;
+               cs = 0;
+               goto scopy;
+            }
+         }
+         // convert to string
+         for (;;) {
+            *--s = h[n64 & ((1 << (l >> 8)) - 1)];
+            n64 >>= (l >> 8);
+            if (!((n64) || ((stbsp__int32)((num + STBSP__NUMSZ) - s) < pr)))
+               break;
+            if (fl & STBSP__TRIPLET_COMMA) {
+               ++l;
+               if ((l & 15) == ((l >> 4) & 15)) {
+                  l &= ~15;
+                  *--s = stbsp__comma;
+               }
+            }
+         };
+         // get the tens and the comma pos
+         cs = (stbsp__uint32)((num + STBSP__NUMSZ) - s) + ((((l >> 4) & 15)) << 24);
+         // get the length that we copied
+         l = (stbsp__uint32)((num + STBSP__NUMSZ) - s);
+         // copy it
+         goto scopy;
+
+      case 'u': // unsigned
+      case 'i':
+      case 'd': // integer
+         // get the integer and abs it
+         if (fl & STBSP__INTMAX) {
+            stbsp__int64 i64 = va_arg(va, stbsp__int64);
+            n64 = (stbsp__uint64)i64;
+            if ((f[0] != 'u') && (i64 < 0)) {
+               n64 = (stbsp__uint64)-i64;
+               fl |= STBSP__NEGATIVE;
+            }
+         } else {
+            stbsp__int32 i = va_arg(va, stbsp__int32);
+            n64 = (stbsp__uint32)i;
+            if ((f[0] != 'u') && (i < 0)) {
+               n64 = (stbsp__uint32)-i;
+               fl |= STBSP__NEGATIVE;
+            }
+         }
+
+#ifndef STB_SPRINTF_NOFLOAT
+         if (fl & STBSP__METRIC_SUFFIX) {
+            if (n64 < 1024)
+               pr = 0;
+            else if (pr == -1)
+               pr = 1;
+            fv = (double)(stbsp__int64)n64;
+            goto doafloat;
+         }
+#endif
+
+         // convert to string
+         s = num + STBSP__NUMSZ;
+         l = 0;
+
+         for (;;) {
+            // do in 32-bit chunks (avoid lots of 64-bit divides even with constant denominators)
+            char *o = s - 8;
+            if (n64 >= 100000000) {
+               n = (stbsp__uint32)(n64 % 100000000);
+               n64 /= 100000000;
+            } else {
+               n = (stbsp__uint32)n64;
+               n64 = 0;
+            }
+            if ((fl & STBSP__TRIPLET_COMMA) == 0) {
+               do {
+                  s -= 2;
+                  *(stbsp__uint16 *)s = *(stbsp__uint16 *)&stbsp__digitpair.pair[(n % 100) * 2];
+                  n /= 100;
+               } while (n);
+            }
+            while (n) {
+               if ((fl & STBSP__TRIPLET_COMMA) && (l++ == 3)) {
+                  l = 0;
+                  *--s = stbsp__comma;
+                  --o;
+               } else {
+                  *--s = (char)(n % 10) + '0';
+                  n /= 10;
+               }
+            }
+            if (n64 == 0) {
+               if ((s[0] == '0') && (s != (num + STBSP__NUMSZ)))
+                  ++s;
+               break;
+            }
+            while (s != o)
+               if ((fl & STBSP__TRIPLET_COMMA) && (l++ == 3)) {
+                  l = 0;
+                  *--s = stbsp__comma;
+                  --o;
+               } else {
+                  *--s = '0';
+               }
+         }
+
+         tail[0] = 0;
+         stbsp__lead_sign(fl, lead);
+
+         // get the length that we copied
+         l = (stbsp__uint32)((num + STBSP__NUMSZ) - s);
+         if (l == 0) {
+            *--s = '0';
+            l = 1;
+         }
+         cs = l + (3 << 24);
+         if (pr < 0)
+            pr = 0;
+
+      scopy:
+         // get fw=leading/trailing space, pr=leading zeros
+         if (pr < (stbsp__int32)l)
+            pr = l;
+         n = pr + lead[0] + tail[0] + tz;
+         if (fw < (stbsp__int32)n)
+            fw = n;
+         fw -= n;
+         pr -= l;
+
+         // handle right justify and leading zeros
+         if ((fl & STBSP__LEFTJUST) == 0) {
+            if (fl & STBSP__LEADINGZERO) // if leading zeros, everything is in pr
+            {
+               pr = (fw > pr) ? fw : pr;
+               fw = 0;
+            } else {
+               fl &= ~STBSP__TRIPLET_COMMA; // if no leading zeros, then no commas
+            }
+         }
+
+         // copy the spaces and/or zeros
+         if (fw + pr) {
+            stbsp__int32 i;
+            stbsp__uint32 c;
+
+            // copy leading spaces (or when doing %8.4d stuff)
+            if ((fl & STBSP__LEFTJUST) == 0)
+               while (fw > 0) {
+                  stbsp__cb_buf_clamp(i, fw);
+                  fw -= i;
+                  while (i) {
+                     if ((((stbsp__uintptr)bf) & 3) == 0)
+                        break;
+                     *bf++ = ' ';
+                     --i;
+                  }
+                  while (i >= 4) {
+                     *(stbsp__uint32 *)bf = 0x20202020;
+                     bf += 4;
+                     i -= 4;
+                  }
+                  while (i) {
+                     *bf++ = ' ';
+                     --i;
+                  }
+                  stbsp__chk_cb_buf(1);
+               }
+
+            // copy leader
+            sn = lead + 1;
+            while (lead[0]) {
+               stbsp__cb_buf_clamp(i, lead[0]);
+               lead[0] -= (char)i;
+               while (i) {
+                  *bf++ = *sn++;
+                  --i;
+               }
+               stbsp__chk_cb_buf(1);
+            }
+
+            // copy leading zeros
+            c = cs >> 24;
+            cs &= 0xffffff;
+            cs = (fl & STBSP__TRIPLET_COMMA) ? ((stbsp__uint32)(c - ((pr + cs) % (c + 1)))) : 0;
+            while (pr > 0) {
+               stbsp__cb_buf_clamp(i, pr);
+               pr -= i;
+               if ((fl & STBSP__TRIPLET_COMMA) == 0) {
+                  while (i) {
+                     if ((((stbsp__uintptr)bf) & 3) == 0)
+                        break;
+                     *bf++ = '0';
+                     --i;
+                  }
+                  while (i >= 4) {
+                     *(stbsp__uint32 *)bf = 0x30303030;
+                     bf += 4;
+                     i -= 4;
+                  }
+               }
+               while (i) {
+                  if ((fl & STBSP__TRIPLET_COMMA) && (cs++ == c)) {
+                     cs = 0;
+                     *bf++ = stbsp__comma;
+                  } else
+                     *bf++ = '0';
+                  --i;
+               }
+               stbsp__chk_cb_buf(1);
+            }
+         }
+
+         // copy leader if there is still one
+         sn = lead + 1;
+         while (lead[0]) {
+            stbsp__int32 i;
+            stbsp__cb_buf_clamp(i, lead[0]);
+            lead[0] -= (char)i;
+            while (i) {
+               *bf++ = *sn++;
+               --i;
+            }
+            stbsp__chk_cb_buf(1);
+         }
+
+         // copy the string
+         n = l;
+         while (n) {
+            stbsp__int32 i;
+            stbsp__cb_buf_clamp(i, n);
+            n -= i;
+            STBSP__UNALIGNED(while (i >= 4) {
+               *(stbsp__uint32 volatile *)bf = *(stbsp__uint32 volatile *)s;
+               bf += 4;
+               s += 4;
+               i -= 4;
+            })
+            while (i) {
+               *bf++ = *s++;
+               --i;
+            }
+            stbsp__chk_cb_buf(1);
+         }
+
+         // copy trailing zeros
+         while (tz) {
+            stbsp__int32 i;
+            stbsp__cb_buf_clamp(i, tz);
+            tz -= i;
+            while (i) {
+               if ((((stbsp__uintptr)bf) & 3) == 0)
+                  break;
+               *bf++ = '0';
+               --i;
+            }
+            while (i >= 4) {
+               *(stbsp__uint32 *)bf = 0x30303030;
+               bf += 4;
+               i -= 4;
+            }
+            while (i) {
+               *bf++ = '0';
+               --i;
+            }
+            stbsp__chk_cb_buf(1);
+         }
+
+         // copy tail if there is one
+         sn = tail + 1;
+         while (tail[0]) {
+            stbsp__int32 i;
+            stbsp__cb_buf_clamp(i, tail[0]);
+            tail[0] -= (char)i;
+            while (i) {
+               *bf++ = *sn++;
+               --i;
+            }
+            stbsp__chk_cb_buf(1);
+         }
+
+         // handle the left justify
+         if (fl & STBSP__LEFTJUST)
+            if (fw > 0) {
+               while (fw) {
+                  stbsp__int32 i;
+                  stbsp__cb_buf_clamp(i, fw);
+                  fw -= i;
+                  while (i) {
+                     if ((((stbsp__uintptr)bf) & 3) == 0)
+                        break;
+                     *bf++ = ' ';
+                     --i;
+                  }
+                  while (i >= 4) {
+                     *(stbsp__uint32 *)bf = 0x20202020;
+                     bf += 4;
+                     i -= 4;
+                  }
+                  while (i--)
+                     *bf++ = ' ';
+                  stbsp__chk_cb_buf(1);
+               }
+            }
+         break;
+
+      default: // unknown, just copy code
+         s = num + STBSP__NUMSZ - 1;
+         *s = f[0];
+         l = 1;
+         fw = fl = 0;
+         lead[0] = 0;
+         tail[0] = 0;
+         pr = 0;
+         dp = 0;
+         cs = 0;
+         goto scopy;
+      }
+      ++f;
+   }
+endfmt:
+
+   if (!callback)
+      *bf = 0;
+   else
+      stbsp__flush_cb();
+
+done:
+   return tlen + (int)(bf - buf);
+}
+
+// cleanup
+#undef STBSP__LEFTJUST
+#undef STBSP__LEADINGPLUS
+#undef STBSP__LEADINGSPACE
+#undef STBSP__LEADING_0X
+#undef STBSP__LEADINGZERO
+#undef STBSP__INTMAX
+#undef STBSP__TRIPLET_COMMA
+#undef STBSP__NEGATIVE
+#undef STBSP__METRIC_SUFFIX
+#undef STBSP__NUMSZ
+#undef stbsp__chk_cb_bufL
+#undef stbsp__chk_cb_buf
+#undef stbsp__flush_cb
+#undef stbsp__cb_buf_clamp
+
+// ============================================================================
+//   wrapper functions
+
+STBSP__PUBLICDEF int STB_SPRINTF_DECORATE(sprintf)(char *buf, char const *fmt, ...)
+{
+   int result;
+   va_list va;
+   va_start(va, fmt);
+   result = STB_SPRINTF_DECORATE(vsprintfcb)(0, 0, buf, fmt, va);
+   va_end(va);
+   return result;
+}
+
+typedef struct stbsp__context {
+   char *buf;
+   int count;
+   int length;
+   char tmp[STB_SPRINTF_MIN];
+} stbsp__context;
+
+static char *stbsp__clamp_callback(const char *buf, void *user, int len)
+{
+   stbsp__context *c = (stbsp__context *)user;
+   c->length += len;
+
+   if (len > c->count)
+      len = c->count;
+
+   if (len) {
+      if (buf != c->buf) {
+         const char *s, *se;
+         char *d;
+         d = c->buf;
+         s = buf;
+         se = buf + len;
+         do {
+            *d++ = *s++;
+         } while (s < se);
+      }
+      c->buf += len;
+      c->count -= len;
+   }
+
+   if (c->count <= 0)
+      return c->tmp;
+   return (c->count >= STB_SPRINTF_MIN) ? c->buf : c->tmp; // go direct into buffer if you can
+}
+
+static char * stbsp__count_clamp_callback( const char * buf, void * user, int len )
+{
+   stbsp__context * c = (stbsp__context*)user;
+   (void) sizeof(buf);
+
+   c->length += len;
+   return c->tmp; // go direct into buffer if you can
+}
+
+STBSP__PUBLICDEF int STB_SPRINTF_DECORATE( vsnprintf )( char * buf, int count, char const * fmt, va_list va )
+{
+   stbsp__context c;
+
+   if ( (count == 0) && !buf )
+   {
+      c.length = 0;
+
+      STB_SPRINTF_DECORATE( vsprintfcb )( stbsp__count_clamp_callback, &c, c.tmp, fmt, va );
+   }
+   else
+   {
+      int l;
+
+      c.buf = buf;
+      c.count = count;
+      c.length = 0;
+
+      STB_SPRINTF_DECORATE( vsprintfcb )( stbsp__clamp_callback, &c, stbsp__clamp_callback(0,&c,0), fmt, va );
+
+      // zero-terminate
+      l = (int)( c.buf - buf );
+      if ( l >= count ) // should never be greater, only equal (or less) than count
+         l = count - 1;
+      buf[l] = 0;
+   }
+
+   return c.length;
+}
+
+STBSP__PUBLICDEF int STB_SPRINTF_DECORATE(snprintf)(char *buf, int count, char const *fmt, ...)
+{
+   int result;
+   va_list va;
+   va_start(va, fmt);
+
+   result = STB_SPRINTF_DECORATE(vsnprintf)(buf, count, fmt, va);
+   va_end(va);
+
+   return result;
+}
+
+STBSP__PUBLICDEF int STB_SPRINTF_DECORATE(vsprintf)(char *buf, char const *fmt, va_list va)
+{
+   return STB_SPRINTF_DECORATE(vsprintfcb)(0, 0, buf, fmt, va);
+}
+
+// =======================================================================
+//   low level float utility functions
+
+#ifndef STB_SPRINTF_NOFLOAT
+
+// copies d to bits w/ strict aliasing (this compiles to nothing on /Ox)
+#define STBSP__COPYFP(dest, src)                   \
+   {                                               \
+      int cn;                                      \
+      for (cn = 0; cn < 8; cn++)                   \
+         ((char *)&dest)[cn] = ((char *)&src)[cn]; \
+   }
+
+// get float info
+static stbsp__int32 stbsp__real_to_parts(stbsp__int64 *bits, stbsp__int32 *expo, double value)
+{
+   double d;
+   stbsp__int64 b = 0;
+
+   // load value and round at the frac_digits
+   d = value;
+
+   STBSP__COPYFP(b, d);
+
+   *bits = b & ((((stbsp__uint64)1) << 52) - 1);
+   *expo = (stbsp__int32)(((b >> 52) & 2047) - 1023);
+
+   return (stbsp__int32)((stbsp__uint64) b >> 63);
+}
+
+static double const stbsp__bot[23] = {
+   1e+000, 1e+001, 1e+002, 1e+003, 1e+004, 1e+005, 1e+006, 1e+007, 1e+008, 1e+009, 1e+010, 1e+011,
+   1e+012, 1e+013, 1e+014, 1e+015, 1e+016, 1e+017, 1e+018, 1e+019, 1e+020, 1e+021, 1e+022
+};
+static double const stbsp__negbot[22] = {
+   1e-001, 1e-002, 1e-003, 1e-004, 1e-005, 1e-006, 1e-007, 1e-008, 1e-009, 1e-010, 1e-011,
+   1e-012, 1e-013, 1e-014, 1e-015, 1e-016, 1e-017, 1e-018, 1e-019, 1e-020, 1e-021, 1e-022
+};
+static double const stbsp__negboterr[22] = {
+   -5.551115123125783e-018,  -2.0816681711721684e-019, -2.0816681711721686e-020, -4.7921736023859299e-021, -8.1803053914031305e-022, 4.5251888174113741e-023,
+   4.5251888174113739e-024,  -2.0922560830128471e-025, -6.2281591457779853e-026, -3.6432197315497743e-027, 6.0503030718060191e-028,  2.0113352370744385e-029,
+   -3.0373745563400371e-030, 1.1806906454401013e-032,  -7.7705399876661076e-032, 2.0902213275965398e-033,  -7.1542424054621921e-034, -7.1542424054621926e-035,
+   2.4754073164739869e-036,  5.4846728545790429e-037,  9.2462547772103625e-038,  -4.8596774326570872e-039
+};
+static double const stbsp__top[13] = {
+   1e+023, 1e+046, 1e+069, 1e+092, 1e+115, 1e+138, 1e+161, 1e+184, 1e+207, 1e+230, 1e+253, 1e+276, 1e+299
+};
+static double const stbsp__negtop[13] = {
+   1e-023, 1e-046, 1e-069, 1e-092, 1e-115, 1e-138, 1e-161, 1e-184, 1e-207, 1e-230, 1e-253, 1e-276, 1e-299
+};
+static double const stbsp__toperr[13] = {
+   8388608,
+   6.8601809640529717e+028,
+   -7.253143638152921e+052,
+   -4.3377296974619174e+075,
+   -1.5559416129466825e+098,
+   -3.2841562489204913e+121,
+   -3.7745893248228135e+144,
+   -1.7356668416969134e+167,
+   -3.8893577551088374e+190,
+   -9.9566444326005119e+213,
+   6.3641293062232429e+236,
+   -5.2069140800249813e+259,
+   -5.2504760255204387e+282
+};
+static double const stbsp__negtoperr[13] = {
+   3.9565301985100693e-040,  -2.299904345391321e-063,  3.6506201437945798e-086,  1.1875228833981544e-109,
+   -5.0644902316928607e-132, -6.7156837247865426e-155, -2.812077463003139e-178,  -5.7778912386589953e-201,
+   7.4997100559334532e-224,  -4.6439668915134491e-247, -6.3691100762962136e-270, -9.436808465446358e-293,
+   8.0970921678014997e-317
+};
+
+#if defined(_MSC_VER) && (_MSC_VER <= 1200)
+static stbsp__uint64 const stbsp__powten[20] = {
+   1,
+   10,
+   100,
+   1000,
+   10000,
+   100000,
+   1000000,
+   10000000,
+   100000000,
+   1000000000,
+   10000000000,
+   100000000000,
+   1000000000000,
+   10000000000000,
+   100000000000000,
+   1000000000000000,
+   10000000000000000,
+   100000000000000000,
+   1000000000000000000,
+   10000000000000000000U
+};
+#define stbsp__tento19th ((stbsp__uint64)1000000000000000000)
+#else
+static stbsp__uint64 const stbsp__powten[20] = {
+   1,
+   10,
+   100,
+   1000,
+   10000,
+   100000,
+   1000000,
+   10000000,
+   100000000,
+   1000000000,
+   10000000000ULL,
+   100000000000ULL,
+   1000000000000ULL,
+   10000000000000ULL,
+   100000000000000ULL,
+   1000000000000000ULL,
+   10000000000000000ULL,
+   100000000000000000ULL,
+   1000000000000000000ULL,
+   10000000000000000000ULL
+};
+#define stbsp__tento19th (1000000000000000000ULL)
+#endif
+
+#define stbsp__ddmulthi(oh, ol, xh, yh)                            \
+   {                                                               \
+      double ahi = 0, alo, bhi = 0, blo;                           \
+      stbsp__int64 bt;                                             \
+      oh = xh * yh;                                                \
+      STBSP__COPYFP(bt, xh);                                       \
+      bt &= ((~(stbsp__uint64)0) << 27);                           \
+      STBSP__COPYFP(ahi, bt);                                      \
+      alo = xh - ahi;                                              \
+      STBSP__COPYFP(bt, yh);                                       \
+      bt &= ((~(stbsp__uint64)0) << 27);                           \
+      STBSP__COPYFP(bhi, bt);                                      \
+      blo = yh - bhi;                                              \
+      ol = ((ahi * bhi - oh) + ahi * blo + alo * bhi) + alo * blo; \
+   }
+
+#define stbsp__ddtoS64(ob, xh, xl)          \
+   {                                        \
+      double ahi = 0, alo, vh, t;           \
+      ob = (stbsp__int64)xh;                \
+      vh = (double)ob;                      \
+      ahi = (xh - vh);                      \
+      t = (ahi - xh);                       \
+      alo = (xh - (ahi - t)) - (vh + t);    \
+      ob += (stbsp__int64)(ahi + alo + xl); \
+   }
+
+#define stbsp__ddrenorm(oh, ol) \
+   {                            \
+      double s;                 \
+      s = oh + ol;              \
+      ol = ol - (s - oh);       \
+      oh = s;                   \
+   }
+
+#define stbsp__ddmultlo(oh, ol, xh, xl, yh, yl) ol = ol + (xh * yl + xl * yh);
+
+#define stbsp__ddmultlos(oh, ol, xh, yl) ol = ol + (xh * yl);
+
+static void stbsp__raise_to_power10(double *ohi, double *olo, double d, stbsp__int32 power) // power can be -323 to +350
+{
+   double ph, pl;
+   if ((power >= 0) && (power <= 22)) {
+      stbsp__ddmulthi(ph, pl, d, stbsp__bot[power]);
+   } else {
+      stbsp__int32 e, et, eb;
+      double p2h, p2l;
+
+      e = power;
+      if (power < 0)
+         e = -e;
+      et = (e * 0x2c9) >> 14; /* %23 */
+      if (et > 13)
+         et = 13;
+      eb = e - (et * 23);
+
+      ph = d;
+      pl = 0.0;
+      if (power < 0) {
+         if (eb) {
+            --eb;
+            stbsp__ddmulthi(ph, pl, d, stbsp__negbot[eb]);
+            stbsp__ddmultlos(ph, pl, d, stbsp__negboterr[eb]);
+         }
+         if (et) {
+            stbsp__ddrenorm(ph, pl);
+            --et;
+            stbsp__ddmulthi(p2h, p2l, ph, stbsp__negtop[et]);
+            stbsp__ddmultlo(p2h, p2l, ph, pl, stbsp__negtop[et], stbsp__negtoperr[et]);
+            ph = p2h;
+            pl = p2l;
+         }
+      } else {
+         if (eb) {
+            e = eb;
+            if (eb > 22)
+               eb = 22;
+            e -= eb;
+            stbsp__ddmulthi(ph, pl, d, stbsp__bot[eb]);
+            if (e) {
+               stbsp__ddrenorm(ph, pl);
+               stbsp__ddmulthi(p2h, p2l, ph, stbsp__bot[e]);
+               stbsp__ddmultlos(p2h, p2l, stbsp__bot[e], pl);
+               ph = p2h;
+               pl = p2l;
+            }
+         }
+         if (et) {
+            stbsp__ddrenorm(ph, pl);
+            --et;
+            stbsp__ddmulthi(p2h, p2l, ph, stbsp__top[et]);
+            stbsp__ddmultlo(p2h, p2l, ph, pl, stbsp__top[et], stbsp__toperr[et]);
+            ph = p2h;
+            pl = p2l;
+         }
+      }
+   }
+   stbsp__ddrenorm(ph, pl);
+   *ohi = ph;
+   *olo = pl;
+}
+
+// given a float value, returns the significant bits in bits, and the position of the
+//   decimal point in decimal_pos.  +/-INF and NAN are specified by special values
+//   returned in the decimal_pos parameter.
+// frac_digits is absolute normally, but if you want from first significant digits (got %g and %e), or in 0x80000000
+static stbsp__int32 stbsp__real_to_str(char const **start, stbsp__uint32 *len, char *out, stbsp__int32 *decimal_pos, double value, stbsp__uint32 frac_digits)
+{
+   double d;
+   stbsp__int64 bits = 0;
+   stbsp__int32 expo, e, ng, tens;
+
+   d = value;
+   STBSP__COPYFP(bits, d);
+   expo = (stbsp__int32)((bits >> 52) & 2047);
+   ng = (stbsp__int32)((stbsp__uint64) bits >> 63);
+   if (ng)
+      d = -d;
+
+   if (expo == 2047) // is nan or inf?
+   {
+      *start = (bits & ((((stbsp__uint64)1) << 52) - 1)) ? "NaN" : "Inf";
+      *decimal_pos = STBSP__SPECIAL;
+      *len = 3;
+      return ng;
+   }
+
+   if (expo == 0) // is zero or denormal
+   {
+      if (((stbsp__uint64) bits << 1) == 0) // do zero
+      {
+         *decimal_pos = 1;
+         *start = out;
+         out[0] = '0';
+         *len = 1;
+         return ng;
+      }
+      // find the right expo for denormals
+      {
+         stbsp__int64 v = ((stbsp__uint64)1) << 51;
+         while ((bits & v) == 0) {
+            --expo;
+            v >>= 1;
+         }
+      }
+   }
+
+   // find the decimal exponent as well as the decimal bits of the value
+   {
+      double ph, pl;
+
+      // log10 estimate - very specifically tweaked to hit or undershoot by no more than 1 of log10 of all expos 1..2046
+      tens = expo - 1023;
+      tens = (tens < 0) ? ((tens * 617) / 2048) : (((tens * 1233) / 4096) + 1);
+
+      // move the significant bits into position and stick them into an int
+      stbsp__raise_to_power10(&ph, &pl, d, 18 - tens);
+
+      // get full as much precision from double-double as possible
+      stbsp__ddtoS64(bits, ph, pl);
+
+      // check if we undershot
+      if (((stbsp__uint64)bits) >= stbsp__tento19th)
+         ++tens;
+   }
+
+   // now do the rounding in integer land
+   frac_digits = (frac_digits & 0x80000000) ? ((frac_digits & 0x7ffffff) + 1) : (tens + frac_digits);
+   if ((frac_digits < 24)) {
+      stbsp__uint32 dg = 1;
+      if ((stbsp__uint64)bits >= stbsp__powten[9])
+         dg = 10;
+      while ((stbsp__uint64)bits >= stbsp__powten[dg]) {
+         ++dg;
+         if (dg == 20)
+            goto noround;
+      }
+      if (frac_digits < dg) {
+         stbsp__uint64 r;
+         // add 0.5 at the right position and round
+         e = dg - frac_digits;
+         if ((stbsp__uint32)e >= 24)
+            goto noround;
+         r = stbsp__powten[e];
+         bits = bits + (r / 2);
+         if ((stbsp__uint64)bits >= stbsp__powten[dg])
+            ++tens;
+         bits /= r;
+      }
+   noround:;
+   }
+
+   // kill long trailing runs of zeros
+   if (bits) {
+      stbsp__uint32 n;
+      for (;;) {
+         if (bits <= 0xffffffff)
+            break;
+         if (bits % 1000)
+            goto donez;
+         bits /= 1000;
+      }
+      n = (stbsp__uint32)bits;
+      while ((n % 1000) == 0)
+         n /= 1000;
+      bits = n;
+   donez:;
+   }
+
+   // convert to string
+   out += 64;
+   e = 0;
+   for (;;) {
+      stbsp__uint32 n;
+      char *o = out - 8;
+      // do the conversion in chunks of U32s (avoid most 64-bit divides, worth it, constant denomiators be damned)
+      if (bits >= 100000000) {
+         n = (stbsp__uint32)(bits % 100000000);
+         bits /= 100000000;
+      } else {
+         n = (stbsp__uint32)bits;
+         bits = 0;
+      }
+      while (n) {
+         out -= 2;
+         *(stbsp__uint16 *)out = *(stbsp__uint16 *)&stbsp__digitpair.pair[(n % 100) * 2];
+         n /= 100;
+         e += 2;
+      }
+      if (bits == 0) {
+         if ((e) && (out[0] == '0')) {
+            ++out;
+            --e;
+         }
+         break;
+      }
+      while (out != o) {
+         *--out = '0';
+         ++e;
+      }
+   }
+
+   *decimal_pos = tens;
+   *start = out;
+   *len = e;
+   return ng;
+}
+
+#undef stbsp__ddmulthi
+#undef stbsp__ddrenorm
+#undef stbsp__ddmultlo
+#undef stbsp__ddmultlos
+#undef STBSP__SPECIAL
+#undef STBSP__COPYFP
+
+#endif // STB_SPRINTF_NOFLOAT
+
+// clean up
+#undef stbsp__uint16
+#undef stbsp__uint32
+#undef stbsp__int32
+#undef stbsp__uint64
+#undef stbsp__int64
+#undef STBSP__UNALIGNED
+
+#endif // STB_SPRINTF_IMPLEMENTATION
+
+/*
+------------------------------------------------------------------------------
+This software is available under 2 licenses -- choose whichever you prefer.
+------------------------------------------------------------------------------
+ALTERNATIVE A - MIT License
+Copyright (c) 2017 Sean Barrett
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+------------------------------------------------------------------------------
+ALTERNATIVE B - Public Domain (www.unlicense.org)
+This is free and unencumbered software released into the public domain.
+Anyone is free to copy, modify, publish, use, compile, sell, or distribute this
+software, either in source code form or as a compiled binary, for any purpose,
+commercial or non-commercial, and by any means.
+In jurisdictions that recognize copyright laws, the author or authors of this
+software dedicate any and all copyright interest in the software to the public
+domain. We make this dedication for the benefit of the public at large and to
+the detriment of our heirs and successors. We intend this dedication to be an
+overt act of relinquishment in perpetuity of all present and future rights to
+this software under copyright law.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+------------------------------------------------------------------------------
+*/
diff --git a/src/gl_canvas.c b/src/gl_canvas.c
index 08d63cf..a03ed6f 100644
--- a/src/gl_canvas.c
+++ b/src/gl_canvas.c
@@ -349,7 +349,7 @@ static int mg_gl_canvas_compile_compute_program_named(const char* name, const ch
 			char buffer[256];
 			int size = 0;
 			glGetProgramInfoLog(program, 256, &size, buffer);
-			LOG_ERROR("Shader link error (%s): %.*s\n", name, size, buffer);
+			log_error("Shader link error (%s): %.*s\n", name, size, buffer);
 
 			res = -1;
 		}
@@ -391,7 +391,7 @@ int mg_gl_canvas_compile_render_program_named(const char* progName,
 			char buffer[256];
 			int size = 0;
 			glGetProgramInfoLog(program, 256, &size, buffer);
-			LOG_ERROR("Shader link error (%s): %.*s\n", progName, size, buffer);
+			log_error("Shader link error (%s): %.*s\n", progName, size, buffer);
 			res = -1;
  		}
  		else
diff --git a/src/graphics.c b/src/graphics.c
index 554d91d..5c95c28 100644
--- a/src/graphics.c
+++ b/src/graphics.c
@@ -16,7 +16,7 @@
 #define STB_IMAGE_IMPLEMENTATION
 #include"stb_image.h"
 
-#include"debug_log.h"
+#include"platform_log.h"
 #include"graphics_internal.h"
 
 typedef struct mg_glyph_map_entry
@@ -618,7 +618,7 @@ void mg_matrix_stack_push(mg_canvas_data* canvas, mg_mat2x3 transform)
 {
 	if(canvas->matrixStackSize >= MG_MATRIX_STACK_MAX_DEPTH)
 	{
-		LOG_ERROR("matrix stack overflow\n");
+		log_error("matrix stack overflow\n");
 	}
 	else
 	{
@@ -631,7 +631,7 @@ void mg_matrix_stack_pop(mg_canvas_data* canvas)
 {
 	if(canvas->matrixStackSize == 0)
 	{
-		LOG_ERROR("matrix stack underflow\n");
+		log_error("matrix stack underflow\n");
 	}
 	else
 	{
@@ -656,7 +656,7 @@ void mg_clip_stack_push(mg_canvas_data* canvas, mp_rect clip)
 {
 	if(canvas->clipStackSize >= MG_CLIP_STACK_MAX_DEPTH)
 	{
-		LOG_ERROR("clip stack overflow\n");
+		log_error("clip stack overflow\n");
 	}
 	else
 	{
@@ -669,7 +669,7 @@ void mg_clip_stack_pop(mg_canvas_data* canvas)
 {
 	if(canvas->clipStackSize == 0)
 	{
-		LOG_ERROR("clip stack underflow\n");
+		log_error("clip stack underflow\n");
 	}
 	else
 	{
@@ -2772,7 +2772,7 @@ void mg_flush_commands(int primitiveCount, mg_primitive* primitives, mg_path_elt
 	{
 		if(nextIndex >= primitiveCount)
 		{
-			LOG_ERROR("invalid location '%i' in graphics command buffer would cause an overrun\n", nextIndex);
+			log_error("invalid location '%i' in graphics command buffer would cause an overrun\n", nextIndex);
 			break;
 		}
 		mg_primitive* primitive = &(primitives[nextIndex]);
@@ -2812,7 +2812,7 @@ void mg_flush_commands(int primitiveCount, mg_primitive* primitives, mg_path_elt
 				}
 				else if(primitive->jump >= primitiveCount)
 				{
-					LOG_ERROR("invalid jump location '%i' in graphics command buffer\n", primitive->jump);
+					log_error("invalid jump location '%i' in graphics command buffer\n", primitive->jump);
 					goto exit_command_loop;
 				}
 				else
@@ -3231,7 +3231,7 @@ mp_rect mg_glyph_outlines_from_font_data(mg_font_data* fontData, str32 glyphIndi
 
 		if(!glyphIndex || glyphIndex >= fontData->glyphCount)
 		{
-			LOG_WARNING("code point is not present in font ranges\n");
+			log_warning("code point is not present in font ranges\n");
 			//NOTE(martin): try to find the replacement character
 			glyphIndex = mg_font_get_glyph_index_from_font_data(fontData, 0xfffd);
 			if(!glyphIndex)
diff --git a/src/milepost.c b/src/milepost.c
index f5b3b9f..dd4dddb 100644
--- a/src/milepost.c
+++ b/src/milepost.c
@@ -7,21 +7,13 @@
 *
 *****************************************************************/
 
-//---------------------------------------------------------------
-// utilities implementations
-//---------------------------------------------------------------
-#include"util/debug_log.c"
-#include"util/memory.c"
-#include"util/strings.c"
-#include"util/utf8.c"
-#include"util/hash.c"
-#include"util/ringbuffer.c"
-
 //---------------------------------------------------------------
 // platform implementations
 //---------------------------------------------------------------
 #include"platform.h"
 
+#include"platform/std_log.c"
+
 #if defined(PLATFORM_WIN64)
 	#include"platform/win32_memory.c"
 	#include"platform/win32_clock.c"
@@ -47,6 +39,15 @@
 	#error "Unsupported platform"
 #endif
 
+//---------------------------------------------------------------
+// utilities implementations
+//---------------------------------------------------------------
+#include"util/memory.c"
+#include"util/strings.c"
+#include"util/utf8.c"
+#include"util/hash.c"
+#include"util/ringbuffer.c"
+
 //---------------------------------------------------------------
 // app/graphics layer
 //---------------------------------------------------------------
diff --git a/src/milepost.h b/src/milepost.h
index 04b4823..616797d 100644
--- a/src/milepost.h
+++ b/src/milepost.h
@@ -15,7 +15,7 @@
 #include"platform.h"
 #include"typedefs.h"
 #include"macro_helpers.h"
-#include"debug_log.h"
+#include"platform_log.h"
 #include"lists.h"
 #include"memory.h"
 #include"strings.h"
diff --git a/src/mp_app.c b/src/mp_app.c
index 6d4895b..fd475dd 100644
--- a/src/mp_app.c
+++ b/src/mp_app.c
@@ -99,7 +99,7 @@ void mp_queue_event(mp_event* event)
 {
 	if(ringbuffer_write_available(&__mpApp.eventQueue) < sizeof(mp_event))
 	{
-		LOG_ERROR("event queue full\n");
+		log_error("event queue full\n");
 	}
 	else
 	{
@@ -223,7 +223,7 @@ static void mp_update_text(utf32 codepoint)
 	}
 	else
 	{
-		LOG_WARNING("too many input codepoints per frame, dropping input");
+		log_warning("too many input codepoints per frame, dropping input");
 	}
 }
 
diff --git a/src/mtl_renderer.m b/src/mtl_renderer.m
index a16095d..4c3f738 100644
--- a/src/mtl_renderer.m
+++ b/src/mtl_renderer.m
@@ -80,7 +80,7 @@ void mg_mtl_print_log(int bufferIndex, id<MTLBuffer> logBuffer, id<MTLBuffer> lo
 
 	if(size)
 	{
-		LOG_INFO("Log from buffer %i:\n", bufferIndex);
+		log_info("Log from buffer %i:\n", bufferIndex);
 
 		int index = 0;
 		while(index < size)
@@ -1160,7 +1160,7 @@ mg_canvas_backend* mg_mtl_canvas_create(mg_surface surface)
 			if(err != nil)
 			{
 				const char* errStr = [[err localizedDescription] UTF8String];
-				LOG_ERROR("error : %s\n", errStr);
+				log_error("error : %s\n", errStr);
 				return(0);
 			}
 			id<MTLFunction> pathFunction = [library newFunctionWithName:@"mtl_path_setup"];
diff --git a/src/osx_app.m b/src/osx_app.m
index 52ea740..7957594 100644
--- a/src/osx_app.m
+++ b/src/osx_app.m
@@ -16,7 +16,7 @@
 #include"ringbuffer.h"
 #include"memory.h"
 #include"macro_helpers.h"
-#include"debug_log.h"
+#include"platform_log.h"
 #include"platform_clock.h"
 #include"graphics_internal.h"
 
@@ -269,14 +269,14 @@ static void mp_update_keyboard_layout()
 	__mpApp.osx.kbLayoutInputSource = TISCopyCurrentKeyboardLayoutInputSource();
 	if(!__mpApp.osx.kbLayoutInputSource)
 	{
-		LOG_ERROR("Failed to load keyboard layout input source");
+		log_error("Failed to load keyboard layout input source");
 	}
 
 	__mpApp.osx.kbLayoutUnicodeData = TISGetInputSourceProperty(__mpApp.osx.kbLayoutInputSource,
 	                                                            kTISPropertyUnicodeKeyLayoutData);
 	if(!__mpApp.osx.kbLayoutUnicodeData)
 	{
-		LOG_ERROR("Failed to load keyboard layout unicode data");
+		log_error("Failed to load keyboard layout unicode data");
 	}
 
 	memset(__mpApp.keyLabels, 0, sizeof(mp_key_utf8)*MP_KEY_COUNT);
@@ -1352,7 +1352,7 @@ mp_window mp_window_create(mp_rect contentRect, const char* title, mp_window_sty
 	mp_window_data* window = mp_window_alloc();
 	if(!window)
 	{
-		LOG_ERROR("Could not allocate window data\n");
+		log_error("Could not allocate window data\n");
 		return((mp_window){0});
 	}
 
@@ -1833,14 +1833,14 @@ mp_view mp_view_create(mp_window windowHandle, mp_rect frame)
 	mp_window_data* window = mp_window_ptr_from_handle(windowHandle);
 	if(!window)
 	{
-		LOG_ERROR("Can't create view for nil window\n");
+		log_error("Can't create view for nil window\n");
 		return(mp_view_nil());
 	}
 
 	mp_view_data* view = mp_view_alloc();
 	if(!view)
 	{
-		LOG_ERROR("Could not allocate view data\n");
+		log_error("Could not allocate view data\n");
 		return(mp_view_nil());
 	}
 
diff --git a/src/platform/orca_log.c b/src/platform/orca_log.c
new file mode 100644
index 0000000..905f10e
--- /dev/null
+++ b/src/platform/orca_log.c
@@ -0,0 +1,74 @@
+/************************************************************//**
+*
+*	@file: orca_log.c
+*	@author: Martin Fouilleul
+*	@date: 18/04/2023
+*
+*****************************************************************/
+#include"platform_log.c"
+#include"util/memory.h"
+#include"util/strings.h"
+
+typedef enum
+{
+	ORCA_LOG_OUTPUT_CONSOLE,
+	ORCA_LOG_OUTPUT_FILE
+} orca_log_output_kind;
+
+typedef struct log_output
+{
+	orca_log_output_kind kind;
+	//TODO: file output
+} log_output;
+
+static log_output _logDefaultOutput = {.kind = ORCA_LOG_OUTPUT_CONSOLE};
+log_output* LOG_DEFAULT_OUTPUT = &_logDefaultOutput;
+
+extern void orca_log_entry(log_level level,
+                           int fileLen,
+                           const char* file,
+                           int functionLen,
+                           const char* function,
+                           int line,
+                           int msgLen,
+                           const char* msg);
+
+typedef struct orca_log_context
+{
+	mem_arena* arena;
+	str8_list list;
+} orca_log_context;
+
+char* log_stbsp_callback(char const* buf, void* user, int len)
+{
+	orca_log_context* ctx = (orca_log_context*)user;
+
+	str8 string = str8_push_buffer(ctx->arena, len, (char*)buf);
+	str8_list_push(ctx->arena, &ctx->list, string);
+
+	return((char*)buf);
+}
+
+void platform_log_entry(log_output* output,
+                        log_level level,
+                        str8 function,
+                        str8 file,
+                        int line,
+                        const char* fmt,
+                        va_list ap)
+{
+	mem_arena* scratch = mem_scratch();
+	mem_arena_marker marker = mem_arena_mark(scratch);
+
+	orca_log_context ctx = {.arena = scratch,
+		                       .list = {0}};
+
+	char buf[STB_SPRINTF_MIN];
+	stbsp_vsprintfcb(log_stbsp_callback, &ctx, buf, fmt, ap);
+
+	str8 string = str8_list_join(scratch, ctx.list);
+
+	orca_log_entry(level, str8_ip(function), str8_ip(file), line, str8_ip(string));
+
+	mem_arena_clear_to(scratch, marker);
+}
diff --git a/src/platform/orca_strings.c b/src/platform/orca_strings.c
new file mode 100644
index 0000000..ac89942
--- /dev/null
+++ b/src/platform/orca_strings.c
@@ -0,0 +1,101 @@
+/************************************************************//**
+*
+*	@file: orca_strings.c
+*	@author: Martin Fouilleul
+*	@date: 18/04/2023
+*
+*****************************************************************/
+#include"platform_strings.h"
+
+#define STB_SPRINTF_IMPLEMENTATION
+#include"ext/stb_sprintf.h"
+
+size_t strlen(const char *s)
+{
+	size_t len = 0;
+	while(s[len] != '\0')
+	{
+		len++;
+	}
+	return(len);
+}
+
+int strcmp(const char *s1, const char *s2)
+{
+	size_t i = 0;
+	while(s1[i] != '\0' && s1[i] == s2[i])
+	{
+		i++;
+	}
+	int res = 0;
+	if(s1[i] != s2[i])
+	{
+		if(s1[i] == '\0')
+		{
+			res = -1;
+		}
+		else if(s2[i] == '\0')
+		{
+			res = 1;
+		}
+		else
+		{
+			res = (unsigned char)s1[i] - (unsigned char)s2[i];
+		}
+	}
+	return(res);
+}
+
+int strncmp(const char *s1, const char *s2, size_t n)
+{
+	size_t i = 0;
+	while(i < n && s1[i] != '\0' && s1[i] == s2[i])
+	{
+		i++;
+	}
+	int res = 0;
+	if(s1[i] != s2[i])
+	{
+		if(s1[i] == '\0')
+		{
+			res = -1;
+		}
+		else if(s2[i] == '\0')
+		{
+			res = 1;
+		}
+		else
+		{
+			res = (unsigned char)s1[i] - (unsigned char)s2[i];
+		}
+	}
+	return(res);
+}
+
+char* strcpy(char *restrict s1, const char *restrict s2)
+{
+	size_t i = 0;
+	while(s2[i] != '\0')
+	{
+		s1[i] = s2[i];
+		i++;
+	}
+	s1[i] = '\0';
+	return(s1);
+}
+
+char* strncpy(char *restrict s1, const char *restrict s2, size_t len)
+{
+	size_t i = 0;
+	while(i < len && s2[i] != '\0')
+	{
+		s1[i] = s2[i];
+		i++;
+	}
+	while(i < len)
+	{
+		s1[i] = 0;
+		i++;
+	}
+	return(s1);
+}
diff --git a/src/platform/osx_clock.c b/src/platform/osx_clock.c
index b6dd0ee..f27fdcd 100644
--- a/src/platform/osx_clock.c
+++ b/src/platform/osx_clock.c
@@ -78,7 +78,7 @@ void mp_clock_init()
 
 	if(sysctl(mib, 2, &tv, &size, 0, 0) == -1)
 	{
-		LOG_ERROR("can't read boot time\n");
+		log_error("can't read boot time\n");
 	}
 	//NOTE(martin): convert boot date to timestamp
 	__initialTimestamp__ =   (((u64)tv.tv_sec + CLK_JAN_1970) << 32)
diff --git a/src/platform/platform_log.c b/src/platform/platform_log.c
new file mode 100644
index 0000000..c80f63b
--- /dev/null
+++ b/src/platform/platform_log.c
@@ -0,0 +1,56 @@
+/************************************************************//**
+*
+*	@file: platform_log.c
+*	@author: Martin Fouilleul
+*	@date: 18/04/2023
+*
+*****************************************************************/
+#include"platform_log.h"
+
+typedef struct log_config
+{
+	log_output* output;
+	log_level level;
+} log_config;
+
+//TODO: make default output a compile-time constant to avoid check in log_entry()?
+static log_config __logConfig = {0, LOG_LEVEL_INFO};
+
+void log_set_output(log_output* output)
+{
+	__logConfig.output = output;
+}
+
+void log_set_level(log_level level)
+{
+	__logConfig.level = level;
+}
+
+void platform_log_entry(log_output* output,
+                        log_level level,
+                        str8 function,
+                        str8 file,
+                        int line,
+                        const char* fmt,
+                        va_list ap);
+
+void log_entry(log_level level,
+               str8 function,
+               str8 file,
+               int line,
+               const char* fmt,
+               ...)
+{
+	if(!__logConfig.output)
+	{
+		__logConfig.output = LOG_DEFAULT_OUTPUT;
+	}
+
+	if(level <= __logConfig.level)
+	{
+		va_list ap;
+		va_start(ap, fmt);
+		platform_log_entry(__logConfig.output, level, function, file, line, fmt, ap);
+		va_end(ap);
+	}
+}
diff --git a/src/platform/platform_log.h b/src/platform/platform_log.h
new file mode 100644
index 0000000..c7ba4da
--- /dev/null
+++ b/src/platform/platform_log.h
@@ -0,0 +1,58 @@
+/************************************************************//**
+*
+*	@file: platform_log.h
+*	@author: Martin Fouilleul
+*	@date: 18/04/2023
+*
+*****************************************************************/
+#ifndef __PLATFORM_LOG_H_
+#define __PLATFORM_LOG_H_
+
+#include"platform.h"
+#include"strings.h"
+
+typedef enum { LOG_LEVEL_ERROR,
+               LOG_LEVEL_WARNING,
+               LOG_LEVEL_INFO,
+               LOG_LEVEL_COUNT } log_level;
+
+typedef struct log_output log_output;
+
+extern log_output* LOG_DEFAULT_OUTPUT;
+
+MP_API void log_set_level(log_level level);
+MP_API void log_set_output(log_output* output);
+MP_API void log_entry(log_level level,
+                      str8 function,
+                      str8 file,
+                      int line,
+                      const char* fmt,
+                      ...);
+
+#define log_generic(level, msg, ...) log_entry(level, STR8(__FUNCTION__), STR8(__FILE__), __LINE__, msg, ##__VA_ARGS__)
+
+#define log_error(msg, ...) log_generic(LOG_LEVEL_ERROR, msg, ##__VA_ARGS__)
+
+#ifndef LOG_COMPILE_WARNING
+	#define LOG_COMPILE_WARNING 1
+#endif
+
+#ifndef LOG_COMPILE_INFO
+	#define LOG_COMPILE_INFO 1
+#endif
+
+#if LOG_COMPILE_WARNING || LOG_COMPILE_INFO
+	#define log_warning(msg, ...) log_generic(LOG_LEVEL_WARNING, msg, ##__VA_ARGS__)
+
+	#if LOG_COMPILE_INFO
+		#define log_info(msg, ...) log_generic(LOG_LEVEL_INFO, msg, ##__VA_ARGS__ )
+	#else
+		#define log_info(msg, ...)
+	#endif
+#else
+	#define log_warning(msg, ...)
+	#define log_info(msg, ...)
+#endif
+
+
+#endif //__PLATFORM_LOG_H_
diff --git a/src/platform/platform_strings.h b/src/platform/platform_strings.h
new file mode 100644
index 0000000..96259cb
--- /dev/null
+++ b/src/platform/platform_strings.h
@@ -0,0 +1,28 @@
+/************************************************************//**
+*
+*	@file: platform_strings.h
+*	@author: Martin Fouilleul
+*	@date: 18/04/2023
+*
+*****************************************************************/
+#ifndef __PLATFORM_STRINGS_H_
+#define __PLATFORM_STRINGS_H_
+
+#include"platform.h"
+#include"platform_varg.h"
+
+#if PLATFORM_ORCA
+	#include"ext/stb_sprintf.h"
+
+	size_t strlen(const char *s);
+	int strcmp(const char *s1, const char *s2);
+	char* strcpy(char *restrict s1, const char *restrict s2);
+
+	#define vsnprintf stbsp_vsnprintf
+
+#else
+	#include<string.h>
+	#include<stdio.h>
+#endif
+
+#endif //__PLATFORM_STRINGS_H_
diff --git a/src/platform/platform_varg.h b/src/platform/platform_varg.h
index 5c2c713..89f94a2 100644
--- a/src/platform/platform_varg.h
+++ b/src/platform/platform_varg.h
@@ -11,6 +11,7 @@
 #include"platform.h"
 
 #if PLATFORM_ORCA
+	#define va_list __builtin_va_list
 	#define va_start __builtin_va_start
 	#define va_arg __builtin_va_arg
 	#define va_copy __builtin_va_copy
diff --git a/src/platform/posix_socket.c b/src/platform/posix_socket.c
index 0698a5e..5cef503 100644
--- a/src/platform/posix_socket.c
+++ b/src/platform/posix_socket.c
@@ -17,7 +17,7 @@
 #include<stdlib.h>	// malloc()/free()
 
 #include"platform_socket.h"
-#include"debug_log.h"
+#include"platform_log.h"
 
 typedef struct in_addr in_addr;
 typedef struct sockaddr_in sockaddr_in;
@@ -457,19 +457,19 @@ net_ip SocketGetDefaultExternalIP()
 	platform_socket* sock = SocketOpen(SOCK_UDP);
 	if(!sock)
 	{
-		LOG_ERROR("can't create socket");
+		log_error("can't create socket");
 		return(0);
 	}
 
 	if(SocketConnect(sock, &addr) != 0)
 	{
-		LOG_ERROR("can't connect socket: %s\n", SocketGetLastErrorMessage());
-		LOG_WARNING("try loopback interface\n");
+		log_error("can't connect socket: %s\n", SocketGetLastErrorMessage());
+		log_warning("try loopback interface\n");
 
 		addr.ip = HostToNetIP(SOCK_IP_LOOPBACK);
 		if(SocketConnect(sock, &addr) != 0)
 		{
-			LOG_ERROR("can't connect socket: %s\n", SocketGetLastErrorMessage());
+			log_error("can't connect socket: %s\n", SocketGetLastErrorMessage());
 			SocketClose(sock);
 			return(0);
 		}
diff --git a/src/platform/std_log.c b/src/platform/std_log.c
new file mode 100644
index 0000000..a654220
--- /dev/null
+++ b/src/platform/std_log.c
@@ -0,0 +1,74 @@
+/************************************************************//**
+*
+*	@file: std_log.c
+*	@author: Martin Fouilleul
+*	@date: 18/04/2023
+*
+*****************************************************************/
+#include<stdio.h>
+#include"platform_log.c"
+
+#if PLATFORM_WIN32 || PLATFORM_WIN64
+	#include<io.h>
+	#define isatty _isatty
+	#define fileno _fileno
+#elif PLATFORM_MACOS || PLATFORM_LINUX
+	#include<unistd.h>
+#endif
+
+static const char* LOG_HEADINGS[LOG_LEVEL_COUNT] = {
+	"Error",
+	"Warning",
+	"Info"};
+
+static const char* LOG_FORMATS[LOG_LEVEL_COUNT] = {
+	"\033[38;5;9m\033[1m",
+	"\033[38;5;13m\033[1m",
+	"\033[38;5;10m\033[1m"};
+
+static const char* LOG_FORMAT_STOP = "\033[m";
+
+typedef struct log_output
+{
+	FILE* f;
+} log_output;
+
+static log_output _logDefaultOutput = {0};
+log_output* LOG_DEFAULT_OUTPUT = &_logDefaultOutput;
+
+void platform_log_entry(log_output* output,
+                        log_level level,
+                        str8 function,
+                        str8 file,
+                        int line,
+                        const char* fmt,
+                        va_list ap)
+{
+	if(output == LOG_DEFAULT_OUTPUT && output->f == 0)
+	{
+		output->f = stdout;
+	}
+
+	int fd = fileno(output->f);
+	if(isatty(fd))
+	{
+		fprintf(output->f,
+		        "%s%s:%s %.*s() in %.*s:%i: ",
+		        LOG_FORMATS[level],
+		        LOG_HEADINGS[level],
+		        LOG_FORMAT_STOP,
+		        str8_ip(function),
+		        str8_ip(file),
+		        line);
+	}
+	else
+	{
+		fprintf(output->f,
+		        "%s: %.*s() in %.*s:%i: ",
+		        LOG_HEADINGS[level],
+		        str8_ip(function),
+		        str8_ip(file),
+		        line);
+	}
+	vfprintf(output->f, fmt, ap);
+}
diff --git a/src/platform/unix_rng.c b/src/platform/unix_rng.c
index 7302f95..1415bf6 100644
--- a/src/platform/unix_rng.c
+++ b/src/platform/unix_rng.c
@@ -10,7 +10,7 @@
 #include<stdio.h>
 #include<stdlib.h>
 
-#include"debug_log.h"
+#include"platform_log.h"
 #include"typedefs.h"
 
 int RandomSeedFromDevice()
@@ -18,7 +18,7 @@ int RandomSeedFromDevice()
 	FILE* urandom = fopen("/dev/urandom", "r");
 	if(!urandom)
 	{
-		LOG_ERROR("can't open /dev/urandom\n");
+		log_error("can't open /dev/urandom\n");
 		return(-1);
 	}
 
@@ -31,7 +31,7 @@ int RandomSeedFromDevice()
 	int size = fread(seed.buff, 1, 4, urandom);
 	if(size != 4)
 	{
-		LOG_ERROR("couldn't read from /dev/urandom\n");
+		log_error("couldn't read from /dev/urandom\n");
 		return(-1);
 	}
 
diff --git a/src/ui.c b/src/ui.c
index 1582300..547633a 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -126,7 +126,7 @@ void ui_stack_pop(ui_stack_elt** stack)
 	}
 	else
 	{
-		LOG_ERROR("ui stack underflow\n");
+		log_error("ui stack underflow\n");
 	}
 }
 
@@ -470,7 +470,7 @@ ui_box* ui_box_make_str8(str8 string, ui_flags flags)
 	else
 	{
 		//maybe this should be a warning that we're trying to make the box twice in the same frame?
-		LOG_WARNING("trying to make ui box '%.*s' multiple times in the same frame\n", (int)box->string.len, box->string.ptr);
+		log_warning("trying to make ui box '%.*s' multiple times in the same frame\n", (int)box->string.len, box->string.ptr);
 	}
 
 	//NOTE: setup per-frame state
diff --git a/src/util/debug_log.c b/src/util/debug_log.c
deleted file mode 100644
index 5958231..0000000
--- a/src/util/debug_log.c
+++ /dev/null
@@ -1,156 +0,0 @@
-/************************************************************//**
-*
-*	@file: debug_log.c
-*	@author: Martin Fouilleul
-*	@date: 22/10/2020
-*	@revision:
-*
-*****************************************************************/
-#include"debug_log.h"
-#include"platform_varg.h"
-
-static const char* LOG_HEADINGS[LOG_LEVEL_COUNT] = {
-	"Error",
-	"Warning",
-	"Info"};
-
-static const char* LOG_FORMATS[LOG_LEVEL_COUNT] = {
-	"\033[38;5;9m\033[1m",
-	"\033[38;5;13m\033[1m",
-	"\033[38;5;10m\033[1m"};
-
-static const char* LOG_FORMAT_STOP = "\033[m";
-
-typedef struct log_config
-{
-	log_output output;
-	log_level level;
-	bool enableVTColor;
-
-} log_config;
-
-#if PLATFORM_ORCA
-	#define LOG_DEFAULT_OUTPUT (log_output){.kind = ORCA_LOG_OUTPUT_CONSOLE}
-	#define LOG_DEFAULT_ENABLE_VT_COLOR true
-#else
-	#define LOG_DEFAULT_OUTPUT 0
-	#define LOG_DEFAULT_ENABLE_VT_COLOR true
-#endif
-
-static log_config __logConfig = {.output = LOG_DEFAULT_OUTPUT,
-                                  .level = LOG_DEFAULT_LEVEL,
-                                  .enableVTColor = LOG_DEFAULT_ENABLE_VT_COLOR};
-
-void log_set_output(log_output output)
-{
-	__logConfig.output = output;
-}
-
-void log_set_level(log_level level)
-{
-	__logConfig.level = level;
-}
-
-void log_enable_vt_color(bool enable)
-{
-	__logConfig.enableVTColor = enable;
-}
-
-#if PLATFORM_ORCA
-
-#define STB_SPRINTF_IMPLEMENTATION
-#include"ext/stb_sprintf.h"
-
-typedef int orca_log_mode;
-enum {ORCA_LOG_BEGIN, ORCA_LOG_APPEND};
-
-extern void orca_log_entry(log_level level,
-                           int fileLen,
-                           const char* file,
-                           int functionLen,
-                           const char* function,
-                           int line);
-
-extern void orca_log_append(int msgLen, const char* msg);
-
-char* log_stbsp_callback(char const* buf, void* user, int len)
-{
-	orca_log_append(len, buf);
-	return((char*)buf);
-}
-
-
-//TODO: later, move this to orca_strings in milepost
-size_t strlen(const char *s)
-{
-        size_t len = 0;
-        while(s[len] != '\0')
-        {
-                len++;
-        }
-        return(len);
-}
-
-void log_generic(log_level level,
-                 const char* functionName,
-                 const char* fileName,
-                 u32 line,
-                 const char* msg,
-                 ...)
-{
-	if(level <= __logConfig.level)
-	{
-		orca_log_entry(level, strlen(functionName), functionName, strlen(fileName), fileName, line);
-
-		char buf[STB_SPRINTF_MIN];
-
-		va_list ap;
-		va_start(ap, msg);
-		stbsp_vsprintfcb(log_stbsp_callback, 0, buf, msg, ap);
-		va_end(ap);
-	}
-}
-
-#else
-
-void log_generic(log_level level,
-                 const char* functionName,
-                 const char* fileName,
-                 u32 line,
-                 const char* msg,
-                 ...)
-{
-	if(__logConfig.output == 0)
-	{
-		__logConfig.output = stdout;
-	}
-
-	if(level <= __logConfig.level)
-	{
-		if(__logConfig.enableVTColor)
-		{
-			fprintf(__logConfig.output,
-			        "%s%s:%s %s() in %s:%i: ",
-			        LOG_FORMATS[level],
-			        LOG_HEADINGS[level],
-			        LOG_FORMAT_STOP,
-			        functionName,
-			        fileName,
-			        line);
-		}
-		else
-		{
-			fprintf(__logConfig.output,
-			        "%s: %s() in %s:%i: ",
-			        LOG_HEADINGS[level],
-			        functionName,
-			        fileName,
-			        line);
-		}
-		va_list ap;
-		va_start(ap, msg);
-		vfprintf(__logConfig.output, msg, ap);
-		va_end(ap);
-	}
-}
-#endif
diff --git a/src/util/debug_log.h b/src/util/debug_log.h
deleted file mode 100644
index e6f6bf7..0000000
--- a/src/util/debug_log.h
+++ /dev/null
@@ -1,80 +0,0 @@
-/************************************************************//**
-*
-*	@file: debug_log.h
-*	@author: Martin Fouilleul
-*	@date: 05/04/2019
-*	@revision:
-*
-*****************************************************************/
-#ifndef __DEBUG_LOG_H_
-#define __DEBUG_LOG_H_
-
-#include"platform.h"
-#include"typedefs.h"
-#include"macro_helpers.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-//NOTE(martin): the default logging level can be adjusted by defining LOG_DEFAULT_LEVEL.
-//              It can be adjusted at runtime with log_set_level()
-#ifndef LOG_DEFAULT_LEVEL
-	#define LOG_DEFAULT_LEVEL LOG_LEVEL_WARNING
-#endif
-
-typedef enum { LOG_LEVEL_ERROR,
-               LOG_LEVEL_WARNING,
-               LOG_LEVEL_INFO,
-               LOG_LEVEL_COUNT } log_level;
-
-#ifdef PLATFORM_ORCA
-	typedef enum
-	{
-		ORCA_LOG_OUTPUT_CONSOLE,
-		ORCA_LOG_OUTPUT_FILE
-	} orca_log_output_kind;
-
-	typedef struct log_output
-	{
-		orca_log_output_kind kind;
-		//TODO: file
-	} log_output;
-
-#else
-	#include<stdio.h>
-	typedef FILE* log_output;
-#endif
-
-MP_API void log_set_level(log_level level);
-MP_API void log_set_output(log_output output);
-MP_API void log_enable_vt_color(bool enable);
-
-MP_API void log_generic(log_level level,
-                        const char* functionName,
-                        const char* fileName,
-                        u32 line,
-                        const char* msg,
-                        ...);
-
-//NOTE(martin): warnings, messages, and debug info can be enabled in debug mode by defining LOG_COMPILE_XXX, XXX being the max desired log level
-//              error logging is always compiled
-#define LOG_ERROR(msg, ...) log_generic(LOG_LEVEL_ERROR, __FUNCTION__, __FILE__, __LINE__, msg, ##__VA_ARGS__ )
-
-#if defined(LOG_COMPILE_WARNING) || defined(LOG_COMPILE_INFO)
-	#define LOG_WARNING(msg, ...) log_generic(LOG_LEVEL_WARNING, __FUNCTION__, __FILE__, __LINE__, msg, ##__VA_ARGS__ )
-
-	#if defined(LOG_COMPILE_INFO)
-		#define LOG_INFO(msg, ...) log_generic(LOG_LEVEL_INFO, __FUNCTION__, __FILE__, __LINE__, msg, ##__VA_ARGS__ )
-	#else
-		#define LOG_INFO(msg, ...)
-	#endif
-#else
-	#define LOG_WARNING(msg, ...)
-	#define LOG_INFO(msg, ...)
-#endif
-
-#ifdef __cplusplus
-} // extern "C"
-#endif
-
-#endif //__DEBUG_LOG_H_
diff --git a/src/util/memory.c b/src/util/memory.c
index 1cc19c4..a6586fa 100644
--- a/src/util/memory.c
+++ b/src/util/memory.c
@@ -115,6 +115,23 @@ void mem_arena_clear(mem_arena* arena)
 	arena->currentChunk = list_first_entry(&arena->chunks, mem_arena_chunk, listElt);
 }
 
+mem_arena_marker mem_arena_mark(mem_arena* arena)
+{
+	mem_arena_marker marker = {.chunk = arena->currentChunk,
+	                           .offset = arena->currentChunk->offset};
+	#if DEBUG
+		marker.arena = arena;
+	#endif
+	return(marker);
+}
+
+void mem_arena_clear_to(mem_arena* arena, mem_arena_marker marker)
+{
+	DEBUG_ASSERT(arena == marker.arena);
+	arena->currentChunk = marker.chunk;
+	arena->currentChunk->offset = marker.offset;
+}
+
 //--------------------------------------------------------------------------------
 //NOTE(martin): memory pool
 //--------------------------------------------------------------------------------
diff --git a/src/util/memory.h b/src/util/memory.h
index 1659942..7ef6d63 100644
--- a/src/util/memory.h
+++ b/src/util/memory.h
@@ -38,6 +38,15 @@ typedef struct mem_arena
 
 } mem_arena;
 
+typedef struct mem_arena_marker
+{
+	#if DEBUG
+		mem_arena* arena;
+	#endif
+	mem_arena_chunk* chunk;
+	u64 offset;
+} mem_arena_marker;
+
 typedef struct mem_arena_options
 {
 	mem_base_allocator* base;
@@ -50,6 +59,8 @@ MP_API void mem_arena_release(mem_arena* arena);
 
 MP_API void* mem_arena_alloc(mem_arena* arena, u64 size);
 MP_API void mem_arena_clear(mem_arena* arena);
+MP_API mem_arena_marker mem_arena_mark(mem_arena* arena);
+MP_API void mem_arena_clear_to(mem_arena* arena, mem_arena_marker marker);
 
 #define mem_arena_alloc_type(arena, type) ((type*)mem_arena_alloc(arena, sizeof(type)))
 #define mem_arena_alloc_array(arena, type, count) ((type*)mem_arena_alloc(arena, sizeof(type)*(count)))
diff --git a/src/util/strings.c b/src/util/strings.c
index 1702f1d..0fbbf8f 100644
--- a/src/util/strings.c
+++ b/src/util/strings.c
@@ -6,8 +6,6 @@
 *	@revision:
 *
 *****************************************************************/
-#include<string.h>	// strlen(), strcpy(), etc.
-#include<stdarg.h>	// va_list() etc.
 #include"macro_helpers.h"
 #include"strings.h"
 
diff --git a/src/util/strings.h b/src/util/strings.h
index 31ef4ec..cbb4b47 100644
--- a/src/util/strings.h
+++ b/src/util/strings.h
@@ -9,10 +9,11 @@
 #ifndef __STRINGS_H_
 #define __STRINGS_H_
 
-#include<string.h> // strlen
 #include"typedefs.h"
 #include"lists.h"
 #include"memory.h"
+#include"platform_strings.h"
+#include"platform_varg.h"
 
 #ifdef __cplusplus
 extern "C" {