From 19e542396bc32debab6f53b229166c57d05e4599 Mon Sep 17 00:00:00 2001 From: Ludovic Marcotte Date: Thu, 18 Jul 2013 10:25:39 -0400 Subject: [PATCH] Applied patch from bug #2360 --- UI/MailPartViewers/GNUmakefile | 18 ++++++++++++++++++ UI/MailPartViewers/GNUmakefile.preamble | 7 +++++++ UI/MailerUI/GNUmakefile | 1 + 3 files changed, 26 insertions(+) diff --git a/UI/MailPartViewers/GNUmakefile b/UI/MailPartViewers/GNUmakefile index 745914636..509121b74 100644 --- a/UI/MailPartViewers/GNUmakefile +++ b/UI/MailPartViewers/GNUmakefile @@ -26,6 +26,24 @@ MailPartViewers_OBJC_FILES += \ UIxMailPartICalViewer.m \ \ UIxMailPartICalActions.m \ + ../../SoObjects/Mailer/SOGoMailBodyPart.m \ + ../../SoObjects/Mailer/SOGoHTMLMailBodyPart.m \ + ../../SoObjects/Mailer/SOGoCalendarMailBodyPart.m \ + ../../SoObjects/Mailer/SOGoMailAccounts.m \ + ../../SoObjects/Mailer/SOGoMailBaseObject.m \ + ../../SoObjects/Mailer/SOGoMailAccount.m \ + ../../SoObjects/Mailer/SOGoMailNamespace.m \ + ../../SoObjects/Mailer/SOGoDraftsFolder.m \ + ../../SoObjects/Mailer/SOGoSentFolder.m \ + ../../SoObjects/Mailer/SOGoTrashFolder.m \ + ../../SoObjects/Mailer/SOGoMailFolder.m \ + ../../SoObjects/Mailer/SOGoDraftObject.m \ + ../../SoObjects/Mailer/SOGoMailObject.m \ + ../../SoObjects/Appointments/SOGoEMailAlarmsManager.m \ + ../../SoObjects/Appointments/SOGoAppointmentObject.m \ + ../../SoObjects/Appointments/SOGoComponentOccurence.m \ + ../../SoObjects/Appointments/SOGoAppointmentOccurence.m \ + ../../SoObjects/Appointments/SOGoCalendarComponent.m MailPartViewers_RESOURCE_FILES += \ product.plist \ diff --git a/UI/MailPartViewers/GNUmakefile.preamble b/UI/MailPartViewers/GNUmakefile.preamble index 545cdf46b..15440fbdd 100644 --- a/UI/MailPartViewers/GNUmakefile.preamble +++ b/UI/MailPartViewers/GNUmakefile.preamble @@ -2,3 +2,10 @@ ifeq ($(HAS_LIBRARY_ssl),yes) ADDITIONAL_CPPFLAGS += -DHAVE_OPENSSL=1 BUNDLE_LIBS += -lcrypto endif + +ADDITIONAL_CPPFLAGS += \ + -Wall -DCOMPILE_FOR_GSTEP_MAKE=1 \ + -DUIX_MAILER_MAJOR_VERSION="@\"$(MAJOR_VERSION)\"" \ + -DUIX_MAILER_MINOR_VERSION="@\"$(MINOR_VERSION)\"" \ + -DUIX_MAILER_SUBMINOR_VERSION="@\"$(SUBMINOR_VERSION)\"" + diff --git a/UI/MailerUI/GNUmakefile b/UI/MailerUI/GNUmakefile index dc1fdb9cb..b1932214d 100644 --- a/UI/MailerUI/GNUmakefile +++ b/UI/MailerUI/GNUmakefile @@ -32,6 +32,7 @@ MailerUI_OBJC_FILES += \ UIxMailWindowCloser.m \ \ UIxMailUserRightsEditor.m \ + ../MailPartViewers/UIxMailRenderingContext.m \ UIxMailUserDelegationEditor.m \ # UIxMailEditorAction.m \ # UIxMailReplyAction.m \