fixed some linking issues on OSX

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@633 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/SoObjects/ChangeLog b/SOGo/SoObjects/ChangeLog
index 163082388711664028862105e5bde1d110ce7d80..f685ff10a16b2577d6445bf1137b3c8fc0799606 100644 (file)
--- a/SOGo/SoObjects/ChangeLog
+++ b/SOGo/SoObjects/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-20  Helge Hess  <helge.hess@opengroupware.org>
+
+       * common.make: link against GDLContentStore instead of OGoContentStore
+
 2005-02-24  Helge Hess  <helge.hess@opengroupware.org>
 
        * common.make (ADDITIONAL_LIB_DIRS): removed SOGoLogic from the linking

diff --git a/SOGo/SoObjects/common.make b/SOGo/SoObjects/common.make
index 9bd89f8c480ddddffaefa67b80674863e8b3ec20..fa42fa194f3dd29cbb6478387244edd629f369e8 100644 (file)
--- a/SOGo/SoObjects/common.make
+++ b/SOGo/SoObjects/common.make
@@ -18,7 +18,7 @@ ADDITIONAL_LIB_DIRS += \
 
 BUNDLE_LIBS += \
        -lSOGo                                  \
-       -lOGoContentStore                       \
+       -lGDLContentStore                       \
        -lGDLAccess                             \
        -lNGObjWeb                              \
        -lNGiCal -lNGMime -lNGLdap              \

diff --git a/SOGo/UI/Scheduler/GNUmakefile.preamble b/SOGo/UI/Scheduler/GNUmakefile.preamble
index efc9130d98e8a3f21498bb3396b15a107496a02f..73c977c3266773edb2c508153e0bcbcbbd95f6c6 100644 (file)
--- a/SOGo/UI/Scheduler/GNUmakefile.preamble
+++ b/SOGo/UI/Scheduler/GNUmakefile.preamble
@@ -2,3 +2,4 @@
 
 ADDITIONAL_INCLUDE_DIRS += \
        -I.. -I../.. -I../../..
+

diff --git a/SOGo/UI/Scheduler/UIxAppointmentProposal.m b/SOGo/UI/Scheduler/UIxAppointmentProposal.m
index 0415de82f2d3d38c8273e00dc8bab7a3b96719b4..9bcb00d8ddb51c1da311f644027557e05d024e47 100644 (file)
--- a/SOGo/UI/Scheduler/UIxAppointmentProposal.m
+++ b/SOGo/UI/Scheduler/UIxAppointmentProposal.m
@@ -327,8 +327,9 @@
     return NO;
   
   /* calculate the interval requested by the user (can be larger) */
-  
+
   aptStartDate = [_slotRange startDate];
+  // TODO: gives warning on MacOSX
   aptEndDate   = [[NSCalendarDate alloc] initWithTimeIntervalSince1970:
                                           [aptStartDate timeIntervalSince1970]
                                         + [self durationAsTimeInterval]];

diff --git a/SOGo/UI/common.make b/SOGo/UI/common.make
index 5615c10e5c5f6cf5da859b2f888e9d553282f479..bdb1b862b27f931d571d2c532b54fe86b10e7ed0 100644 (file)
--- a/SOGo/UI/common.make
+++ b/SOGo/UI/common.make
@@ -39,6 +39,7 @@ BUNDLE_LIBS += \
        -lSOGoUI                                \
        -lSOGo                                  \
        -lOGoContentStore                       \
+       -lGDLContentStore                       \
        -lGDLAccess                             \
        -lNGObjWeb                              \
        -lNGMime -lNGiCal -lNGLdap              \