From 717486b7a20133478cd342d7e4fc35f915386567 Mon Sep 17 00:00:00 2001
From: Pietro Gagliardi <pietro10@mac.com>
Date: Sat, 14 May 2016 23:44:07 -0400
Subject: [PATCH] Fixed some OS X 10.7 build errors.

---
 build/GNUmakefile.example | 2 +-
 build/GNUmakefile.test    | 3 ++-
 darwin/uipriv_darwin.h    | 3 +++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/build/GNUmakefile.example b/build/GNUmakefile.example
index 31be42ca..1219ac74 100644
--- a/build/GNUmakefile.example
+++ b/build/GNUmakefile.example
@@ -33,7 +33,7 @@ ifeq ($(TOOLCHAIN),gcc)
 	LDFLAGS += -L$(OUTDIR) -lui
 	# see build/GNUmakefile.test
 	ifeq ($(OS),darwin)
-		LDFLAGS += -Wl,-rpath,@executable_path
+		LDFLAGS += -Wl,-rpath,@executable_path/
 	else
 		LDFLAGS += -Wl,-rpath,'$$ORIGIN'
 	endif
diff --git a/build/GNUmakefile.test b/build/GNUmakefile.test
index 6b992021..66e1921c 100644
--- a/build/GNUmakefile.test
+++ b/build/GNUmakefile.test
@@ -18,8 +18,9 @@ ifeq ($(TOOLCHAIN),gcc)
 	# tell the dynamic loader to search in the executable path for shared objects
 	# note: OS X's linker complains if we say -rpath= instead of -rpath,
 	# also note that OS X doesn't use $ORIGIN - see http://jorgen.tjer.no/post/2014/05/20/dt-rpath-ld-and-at-rpath-dyld/
+	# the extra slash is needed on OS X 10.7
 	ifeq ($(OS),darwin)
-		LDFLAGS += -Wl,-rpath,@executable_path
+		LDFLAGS += -Wl,-rpath,@executable_path/
 	else
 		LDFLAGS += -Wl,-rpath,'$$ORIGIN'
 	endif
diff --git a/darwin/uipriv_darwin.h b/darwin/uipriv_darwin.h
index effbfbd4..6494e066 100644
--- a/darwin/uipriv_darwin.h
+++ b/darwin/uipriv_darwin.h
@@ -10,6 +10,9 @@
 #error Sorry, libui cannot be compiled with ARC.
 #endif
 
+// 10.7 fixups
+#define NSEventModifierFlags NSUInteger
+
 #define toNSString(str) [NSString stringWithUTF8String:(str)]
 #define fromNSString(str) [(str) UTF8String]