From 0708d9bd94600fcb12638f22618132685a894402 Mon Sep 17 00:00:00 2001
From: Vincent Bénony
Date: Tue, 1 Dec 2015 21:26:25 +0100
Subject: IOS: Forces the create_project tool to use the right browser file for
 iOS

---
 gui/module.mk | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'gui')

diff --git a/gui/module.mk b/gui/module.mk
index e355212620..d4d74b5856 100644
--- a/gui/module.mk
+++ b/gui/module.mk
@@ -32,6 +32,13 @@ MODULE_OBJS := \
 	widgets/scrollbar.o \
 	widgets/tab.o
 
+# Even if it seems redundant, please keep
+# these directives in that order!
+# This is needed by the "create_project" tool, for the OS X / iOS Xcode project
+ifdef IPHONE
+MODULE_OBJS += \
+	browser.o
+else
 ifdef MACOSX
 MODULE_OBJS += \
 	browser_osx.o
@@ -39,6 +46,7 @@ else
 MODULE_OBJS += \
 	browser.o
 endif
+endif
 
 ifdef ENABLE_EVENTRECORDER
 MODULE_OBJS += \
-- 
cgit v1.2.3


From 4ab1382e8b9e6eda601d37cdb3a3d49aacd5715f Mon Sep 17 00:00:00 2001
From: Vincent Bénony
Date: Wed, 2 Dec 2015 14:50:40 +0100
Subject: IOS: Adds my name to the contributors list

---
 gui/credits.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'gui')

diff --git a/gui/credits.h b/gui/credits.h
index 2e66a7065e..ea42a06a94 100644
--- a/gui/credits.h
+++ b/gui/credits.h
@@ -351,8 +351,10 @@ static const char *credits[] = {
 "C1""GPH Devices (GP2X, GP2XWiz & Caanoo)",
 "C0""John Willis",
 "",
-"C1""iPhone",
+"C1""iPhone / iPad",
 "C0""Oystein Eftevaag",
+"A0""Vincent Benony",
+"C0""Vincent B\351nony",
 "",
 "C1""LinuxMoto",
 "C0""Lubomyr Lisen",
-- 
cgit v1.2.3


From 7e7e33aba01435df9d1326bfd9163e29304c67e9 Mon Sep 17 00:00:00 2001
From: Vincent Bénony
Date: Wed, 6 Jan 2016 10:35:04 +0100
Subject: IOS: Adds some explanations about the hack

---
 gui/module.mk | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'gui')

diff --git a/gui/module.mk b/gui/module.mk
index d4d74b5856..fb7c968c34 100644
--- a/gui/module.mk
+++ b/gui/module.mk
@@ -32,9 +32,11 @@ MODULE_OBJS := \
 	widgets/scrollbar.o \
 	widgets/tab.o
 
-# Even if it seems redundant, please keep
-# these directives in that order!
-# This is needed by the "create_project" tool, for the OS X / iOS Xcode project
+# HACK: Even if it seems redundant, please keep these directives in that order!
+# This is needed by the "create_project" tool, for the OS X / iOS Xcode project.
+# The main problem is that the create_project tool scans the files for both OS X, and iOS targets.
+# It must be able to collect all the files for both targets, so that the backend can later filter
+# them for its own targets (in the Xcode terminology)
 ifdef IPHONE
 MODULE_OBJS += \
 	browser.o
-- 
cgit v1.2.3