From 8f02ca1df27cd41b54f116f246064d0763b6d0ff Mon Sep 17 00:00:00 2001
From: James Turk <james.p.turk@gmail.com>
Date: Fri, 7 Oct 2016 12:10:10 -0400
Subject: [PATCH] fix clang warning on std::max

---
 GLFT_Font.cpp | 4 ++--
 Makefile      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/GLFT_Font.cpp b/GLFT_Font.cpp
index 929687b..59e7946 100644
--- a/GLFT_Font.cpp
+++ b/GLFT_Font.cpp
@@ -146,8 +146,8 @@ void GLFT_Font::open(const std::string& filename, unsigned int size)
         lineSpace -= widths_[ch];
 
         maxAscent = std::max(face->glyph->bitmap_top, maxAscent);
-        maxDescent = std::max(face->glyph->bitmap.rows -
-                                face->glyph->bitmap_top, maxDescent);
+        maxDescent = std::max((int)face->glyph->bitmap.rows -
+                                (int)face->glyph->bitmap_top, maxDescent);
     }
 
     height_ = maxAscent + maxDescent;   // calculate height_ for text
diff --git a/Makefile b/Makefile
index 42077dc..d04b8c0 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
 UNAME := $(shell uname)
 
-ifeq ($(UNAME), Darwix)
+ifeq ($(UNAME), Darwin)
 	GL := -framework OpenGL
 else
 	GL := -lGL -lXrandr