From 2869ca5fd8c8520dcc6ead82d388711b92963a72 Mon Sep 17 00:00:00 2001 From: Matt Sylvia Date: Wed, 12 Jul 2017 17:18:06 -0400 Subject: [PATCH] Branching for d15-3-xcode9 --- .gitmodules | 58 ++++++++++++++++++++--------------------- external/Xamarin.MacDev | 2 +- mk/xamarin.mk | 2 +- 3 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.gitmodules b/.gitmodules index 10ea0bbf967..ce37419ebbe 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,34 +1,34 @@ +[submodule "external/fsharp"] + path = external/fsharp + url = ../../fsharp/fsharp.git + branch = master +[submodule "external/guiunit"] + path = external/guiunit + url = ../../mono/guiunit.git +[submodule "external/linker"] + path = external/linker + url = ../../mono/linker.git [submodule "external/llvm"] - path = external/llvm - url = ../../mono/llvm.git - branch = master + path = external/llvm + url = ../../mono/llvm.git + branch = master [submodule "external/mono"] - path = external/mono - url = ../../mono/mono.git - branch = 2017-04 -[submodule "external/fsharp"] - path = external/fsharp - url = ../../fsharp/fsharp.git - branch = master + path = external/mono + url = ../../mono/mono.git + branch = 2017-04 [submodule "external/MonoTouch.Dialog"] - path = external/MonoTouch.Dialog - url = ../../migueldeicaza/MonoTouch.Dialog.git - branch = master -[submodule "external/Touch.Unit"] - path = external/Touch.Unit - url = ../../spouliot/Touch.Unit.git - branch = master + path = external/MonoTouch.Dialog + url = ../../migueldeicaza/MonoTouch.Dialog.git + branch = master [submodule "external/opentk"] - path = external/opentk - url = ../../mono/opentk.git - branch = master + path = external/opentk + url = ../../mono/opentk.git + branch = master +[submodule "external/Touch.Unit"] + path = external/Touch.Unit + url = ../../spouliot/Touch.Unit.git + branch = master [submodule "external/Xamarin.MacDev"] - path = external/Xamarin.MacDev - url = ../../xamarin/Xamarin.MacDev - branch = d15-3 -[submodule "external/guiunit"] - path = external/guiunit - url = ../../mono/guiunit.git -[submodule "external/linker"] - path = external/linker - url = ../../mono/linker.git + path = external/Xamarin.MacDev + url = ../../xamarin/Xamarin.MacDev + branch = d15-3-xcode9 diff --git a/external/Xamarin.MacDev b/external/Xamarin.MacDev index b29fb342438..ed5a1b80ed8 160000 --- a/external/Xamarin.MacDev +++ b/external/Xamarin.MacDev @@ -1 +1 @@ -Subproject commit b29fb3424385cbaf708f03a895eabbadd5f0fb62 +Subproject commit ed5a1b80ed81006165e69e3a8b1f864bb51bb5e8 diff --git a/mk/xamarin.mk b/mk/xamarin.mk index 98e40ebf951..b09c8ce742c 100644 --- a/mk/xamarin.mk +++ b/mk/xamarin.mk @@ -1,5 +1,5 @@ ifdef ENABLE_XAMARIN -NEEDED_MACCORE_VERSION := 16f7b4ca4b5c0766ae8e257080ad8d9f28a1a4e1 +NEEDED_MACCORE_VERSION := 1e99df5120e5230601eee99e701552d29e084258 NEEDED_MACCORE_BRANCH := xcode9 MACCORE_DIRECTORY := maccore