From c42e118832c23781b3f287887459d9829147fb9a Mon Sep 17 00:00:00 2001
From: Nguyen Anh Quynh <aquynh@gmail.com>
Date: Mon, 19 Dec 2016 22:07:38 +0800
Subject: [PATCH] on MacOS, compile in Universal format by default

---
 Makefile | 3 +++
 make.sh  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/Makefile b/Makefile
index d86e4937..46300981 100644
--- a/Makefile
+++ b/Makefile
@@ -58,6 +58,9 @@ UNICORN_CFLAGS += -fPIC
 # Verbose output?
 V ?= 0
 
+# on MacOS, compile in Universal format by default
+MACOS_UNIVERSAL ?= yes
+
 ifeq ($(UNICORN_DEBUG),yes)
 CFLAGS += -g
 else
diff --git a/make.sh b/make.sh
index ed6706ea..967c983e 100755
--- a/make.sh
+++ b/make.sh
@@ -102,6 +102,7 @@ case "$1" in
   "install" ) install;;
   "uninstall" ) uninstall;;
   "macos-universal" ) MACOS_UNIVERSAL=yes ${MAKE};;
+  "macos-universal-no" ) MACOS_UNIVERSAL=no ${MAKE};;
   "cross-win32" ) build_cross i686-w64-mingw32;;
   "cross-win64" ) build_cross x86_64-w64-mingw32;;
   "cross-android" ) CROSS=arm-linux-androideabi ${MAKE};;