From 88b4dd769db2b53e8ed1b2d633bcda189b52c262 Mon Sep 17 00:00:00 2001 From: helge Date: Fri, 15 Jul 2005 00:08:17 +0000 Subject: [PATCH] fixed OSX compilation git-svn-id: http://svn.opengroupware.org/SOGo/trunk@767 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/Main/ChangeLog | 4 ++++ SOGo/Main/GNUmakefile.preamble | 26 +++++++++++++++++--------- SOGo/Main/Version | 2 +- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/SOGo/Main/ChangeLog b/SOGo/Main/ChangeLog index 62201d31..0c919a20 100644 --- a/SOGo/Main/ChangeLog +++ b/SOGo/Main/ChangeLog @@ -1,3 +1,7 @@ +2005-07-15 Helge Hess + + * GNUmakefile.preamble: fixed Cocoa compilation (v0.9.34) + 2005-07-14 Helge Hess * moved SOGoUser and SOGoAuthenticator to libSOGo (v0.9.33) diff --git a/SOGo/Main/GNUmakefile.preamble b/SOGo/Main/GNUmakefile.preamble index 04ad9e9c..dc434140 100644 --- a/SOGo/Main/GNUmakefile.preamble +++ b/SOGo/Main/GNUmakefile.preamble @@ -11,22 +11,30 @@ ADDITIONAL_INCLUDE_DIRS += \ ADDITIONAL_LIB_DIRS += \ -L../SoObjects/SOGo/$(GNUSTEP_OBJ_DIR)/ \ - -L../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ \ - -L../../SOGoLogic/$(GNUSTEP_OBJ_DIR)/ \ + -L../OGoContentStore/$(GNUSTEP_OBJ_DIR)/ SYSTEM_LIB_DIR += -L/usr/local/lib -L/usr/lib MainUI_BUNDLE_LIBS += \ - -lNGObjWeb \ - -lNGMime \ + -lSOGo \ + -lOGoContentStore \ + -lGDLContentStore \ + -lGDLAccess \ + -lNGiCal \ + -lNGObjWeb \ + -lNGMime -lNGLdap \ -lNGStreams -lNGExtensions -lEOControl \ -lDOM -lXmlRpc -lSaxObjC $(SOGOD)_TOOL_LIBS += \ - -lWEExtensions \ - -lNGObjWeb \ - -lNGMime \ + -lSOGo \ + -lOGoContentStore \ + -lGDLContentStore \ + -lGDLAccess \ + -lWEExtensions \ + -lNGiCal \ + -lNGObjWeb \ + -lNGMime -lNGLdap \ -lNGStreams -lNGExtensions -lEOControl \ - -lDOM -lXmlRpc -lSaxObjC -lSOGo \ - -lOGoContentStore + -lDOM -lXmlRpc -lSaxObjC diff --git a/SOGo/Main/Version b/SOGo/Main/Version index 376a1ba7..d32d5503 100644 --- a/SOGo/Main/Version +++ b/SOGo/Main/Version @@ -1,6 +1,6 @@ # Version file -SUBMINOR_VERSION:=33 +SUBMINOR_VERSION:=34 # v0.9.32 requires libSOGo v0.9.57 # v0.9.24 requires libWEExtensions v4.5.67 -- 2.39.5