From a69c85bae764e33f97bf9a008923727d68a20e33 Mon Sep 17 00:00:00 2001 From: Rolf Bjarne Kvinge Date: Fri, 26 May 2017 07:05:03 +0200 Subject: [PATCH] Remove anything related to using mkbundle, since we're not using mkbundle anymore. (#2132) --- Make.config | 1 - mk/quiet.mk | 1 - tools/mmp/resolver.cs | 2 -- 3 files changed, 4 deletions(-) diff --git a/Make.config b/Make.config index f16fc8218c..301d0e14b0 100644 --- a/Make.config +++ b/Make.config @@ -239,7 +239,6 @@ SYSTEM_CSC=$(MONO_PREFIX)/bin/csc /nologo SYSTEM_SN=$(MONO_PREFIX)/bin/sn SYSTEM_MONO=$(MONO_PREFIX)/bin/mono SYSTEM_MONO32=$(MONO_PREFIX)/bin/mono32 -SYSTEM_MKBUNDLE=$(MONO_PREFIX)/bin/mkbundle SYSTEM_XBUILD=$(MONO_PREFIX)/bin/xbuild SYSTEM_RESGEN=$(MONO_PREFIX)/bin/resgen diff --git a/mk/quiet.mk b/mk/quiet.mk index 74403ef624..bb27ed29bb 100644 --- a/mk/quiet.mk +++ b/mk/quiet.mk @@ -10,7 +10,6 @@ Q_GMCS= $(if $(V),,@echo "GMCS $(@F)";) Q_DMCS= $(if $(V),,@echo "DMCS $(@F)";) Q_SMCS= $(if $(V),,@echo "SMCS $(@F)";) Q_PMCS= $(if $(V),,@echo "PMCS $(@F)";) -Q_MKBUNDLE= $(if $(V),,@echo "MKBUNDLE $(@F)";) Q_AS= $(if $(V),,@echo "AS $(@F)";) Q_CC= $(if $(V),,@echo "CC $(@F)";) QT_CC= $(if $(V),,@echo "CC $$(@F)";) diff --git a/tools/mmp/resolver.cs b/tools/mmp/resolver.cs index b35e02868f..482df81b11 100644 --- a/tools/mmp/resolver.cs +++ b/tools/mmp/resolver.cs @@ -31,10 +31,8 @@ using Mono.Cecil; namespace Xamarin.Bundler { public partial class MonoMacResolver : IAssemblyResolver { -#if !MKBUNDLE public static bool IsClassic { get { return Driver.IsClassic; } } public static bool IsUnified { get { return Driver.IsUnified; } } -#endif public string FrameworkDirectory { get; set; } public string RootDirectory { get; set; }