Merge pull request #134 from thedax/master

Prepare native for Visual Studio 2013.

base/basictypes.h

@@ -3,17 +3,6 @@
 #include <stdint.h>
 #include <stdlib.h>  // for byte swapping
 
-#ifdef _WIN32
-// We need this to compile without hundreds of std::bind errors in Visual Studio 2012
-// since by default VARIADIC_MAX is something low like 3, 4, or 5.
-// It's a good idea to include this file wherever std::bind is being used with more than 3, 4 or 5 args.
-#if _MSC_VER >= 1700
-#undef _VARIADIC_MAX
-#define _VARIADIC_MAX 10
-#endif
-
-#endif
-
 #ifdef _WIN32
 #pragma warning(disable:4244)
 #pragma warning(disable:4996)

ui/viewgroup.cpp

@@ -8,6 +8,8 @@
 #include "ui/viewgroup.h"
 #include "gfx_es2/draw_buffer.h"
 
+#include <algorithm>
+
 namespace UI {
 
 const float ITEM_HEIGHT = 64.f;