From b18c1ec68392979fd12483a5d68acca4e1c42221 Mon Sep 17 00:00:00 2001
From: Tor Andersson <tor.andersson@artifex.com>
Date: Thu, 4 May 2017 15:41:30 +0200
Subject: Fix macOS build.

---
 Makefile  | 12 ++++++------
 Makerules |  8 ++++----
 Makethird |  5 ++---
 3 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/Makefile b/Makefile
index 6b6728b9..efd7d1f7 100644
--- a/Makefile
+++ b/Makefile
@@ -91,12 +91,6 @@ $(OUT)/%.a :
 $(OUT)/%.exe: $(OUT)/%.o | $(ALL_DIR)
 	$(LINK_CMD)
 
-$(OUT)/%.o : %.c | $(ALL_DIR)
-	$(CC_CMD)
-
-$(OUT)/%.o : %.cpp | $(ALL_DIR)
-	$(CXX_CMD)
-
 $(OUT)/source/helpers/%.o : source/helpers/%.c | $(ALL_DIR)
 	$(CC_CMD) $(PTHREAD_CFLAGS) -DHAVE_PTHREAD
 
@@ -115,6 +109,12 @@ $(OUT)/platform/x11/curl/%.o : platform/x11/%.c | $(ALL_DIR)
 $(OUT)/platform/gl/%.o : platform/gl/%.c | $(ALL_DIR)
 	$(CC_CMD) $(GLFW_CFLAGS)
 
+$(OUT)/%.o : %.c | $(ALL_DIR)
+	$(CC_CMD)
+
+$(OUT)/%.o : %.cpp | $(ALL_DIR)
+	$(CXX_CMD)
+
 .PRECIOUS : $(OUT)/%.o # Keep intermediates from chained rules
 
 # --- File lists ---
diff --git a/Makerules b/Makerules
index b7adae60..62288241 100644
--- a/Makerules
+++ b/Makerules
@@ -104,10 +104,10 @@ SYS_JBIG2DEC_LIBS := -ljbig2dec
 SYS_LIBJPEG_LIBS := -ljpeg
 SYS_ZLIB_LIBS := -lz
 
-CC := xcrun cc
-AR := xcrun ar
-LD := xcrun ld
-RANLIB_CMD := xcrun ranlib $@
+CC = xcrun cc
+AR = xcrun ar
+LD = xcrun ld
+RANLIB_CMD = xcrun ranlib $@
 
 # Linux uses pkg-config for system libraries.
 else ifeq "$(OS)" "Linux"
diff --git a/Makethird b/Makethird
index 7ac23105..b5ae6a65 100644
--- a/Makethird
+++ b/Makethird
@@ -622,15 +622,14 @@ GLFW_OUT := $(OUT)/thirdparty/glfw
 ifeq "$(OS)" "MACOS"
 
 GLFW_SRC := \
-	cocoa_time.c \
 	cocoa_init.m \
+	cocoa_joystick.m \
 	cocoa_monitor.m \
+	cocoa_time.c \
 	cocoa_window.m \
 	context.c \
 	init.c \
 	input.c \
-	iokit_joystick.m \
-	mach_time.m \
 	monitor.c \
 	nsgl_context.m \
 	posix_tls.c \
-- 
cgit v1.2.3