fixed compilation on OSX

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

diff --git a/ZideStore/UI-X/ChangeLog b/ZideStore/UI-X/ChangeLog
index 6e1fefc48bb8c862f4d946077fd6a9643f6feda7..14da14a41ab1d73f5c126def2f6ca38ed6d73d7b 100644 (file)
--- a/ZideStore/UI-X/ChangeLog
+++ b/ZideStore/UI-X/ChangeLog
@@ -1,3 +1,7 @@
+2004-06-08  Helge Hess  <helge.hess@opengroupware.org>
+       
+       * */common.h, GNUmakefile.preamble.: fixed for OSX compile
+
 2004-06-08  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * Common/images: added a bunch of images from OGo

diff --git a/ZideStore/UI-X/Common/GNUmakefile.preamble b/ZideStore/UI-X/Common/GNUmakefile.preamble
new file mode 100644 (file)
index 0000000..d8d8447
--- /dev/null
+++ b/ZideStore/UI-X/Common/GNUmakefile.preamble
@@ -0,0 +1,6 @@
+# $Id$
+
+CommonUI_BUNDLE_LIBS += \
+       -lNGObjWeb -lNGScripting \
+       -lNGMime -lNGStreams -lNGExtensions -lEOControl \
+       -lXmlRpc -lDOM -lSaxObjC

diff --git a/ZideStore/UI-X/Common/common.h b/ZideStore/UI-X/Common/common.h
index d179d3084a6aa5176b372d36ab2c181cdacf36b3..093af0b3815e51574b7481f895e9b93285c58622 100644 (file)
--- a/ZideStore/UI-X/Common/common.h
+++ b/ZideStore/UI-X/Common/common.h
@@ -1,7 +1,7 @@
 /*
-  Copyright (C) 2000-2003 SKYRIX Software AG
+  Copyright (C) 2000-2004 SKYRIX Software AG
 
-  This file is part of OGo
+  This file is part of OpenGroupware.org.
 
   OGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
@@ -23,11 +23,10 @@
 #import <Foundation/Foundation.h>
 
 #if LIB_FOUNDATION_LIBRARY
-#  import <Foundation/exceptions/GeneralExceptions.h>
+#  include <Foundation/exceptions/GeneralExceptions.h>
 #elif NeXT_Foundation_LIBRARY || COCOA_Foundation_LIBRARY
-#  import <FoundationExt/NSObjectMacros.h>
-#  import <FoundationExt/NSString+Ext.h>
-#  import <FoundationExt/GeneralExceptions.h>
+#  include <NGExtensions/NGObjectMacros.h>
+#  include <NGExtensions/NSString+Ext.h>
 #endif
 
 #include <NGExtensions/NGExtensions.h>

diff --git a/ZideStore/UI-X/Scheduler/GNUmakefile b/ZideStore/UI-X/Scheduler/GNUmakefile
index 0ddea8bcb19ade272423f84d22b29d759769e9b5..27c47d03c7504e1f0210d8fa4d31e50f9cbfdcd0 100644 (file)
--- a/ZideStore/UI-X/Scheduler/GNUmakefile
+++ b/ZideStore/UI-X/Scheduler/GNUmakefile
@@ -30,7 +30,11 @@ SchedulerUI_RESOURCE_FILES += \
        images/next_week.gif            \
        images/previous_week.gif        \
 
+ifeq ($(FOUNDATION_LIB),apple)
+ZIDESTORE=$(GNUSTEP_USER_ROOT)/Library/Headers/ZideStore12
+else
 ZIDESTORE=$(GNUSTEP_USER_ROOT)/Headers/ZideStore12
+endif
 
 ADDITIONAL_INCLUDE_DIRS += \
        -I. \

diff --git a/ZideStore/UI-X/Scheduler/GNUmakefile.preamble b/ZideStore/UI-X/Scheduler/GNUmakefile.preamble
new file mode 100644 (file)
index 0000000..41f31b8
--- /dev/null
+++ b/ZideStore/UI-X/Scheduler/GNUmakefile.preamble
@@ -0,0 +1,6 @@
+# $Id$
+
+SchedulerUI_BUNDLE_LIBS += \
+       -lNGObjWeb -lNGScripting \
+       -lNGMime -lNGStreams -lNGExtensions -lEOControl \
+       -lXmlRpc -lDOM -lSaxObjC

diff --git a/ZideStore/UI-X/Scheduler/common.h b/ZideStore/UI-X/Scheduler/common.h
index d179d3084a6aa5176b372d36ab2c181cdacf36b3..093af0b3815e51574b7481f895e9b93285c58622 100644 (file)
--- a/ZideStore/UI-X/Scheduler/common.h
+++ b/ZideStore/UI-X/Scheduler/common.h
@@ -1,7 +1,7 @@
 /*
-  Copyright (C) 2000-2003 SKYRIX Software AG
+  Copyright (C) 2000-2004 SKYRIX Software AG
 
-  This file is part of OGo
+  This file is part of OpenGroupware.org.
 
   OGo is free software; you can redistribute it and/or modify it under
   the terms of the GNU Lesser General Public License as published by the
@@ -23,11 +23,10 @@
 #import <Foundation/Foundation.h>
 
 #if LIB_FOUNDATION_LIBRARY
-#  import <Foundation/exceptions/GeneralExceptions.h>
+#  include <Foundation/exceptions/GeneralExceptions.h>
 #elif NeXT_Foundation_LIBRARY || COCOA_Foundation_LIBRARY
-#  import <FoundationExt/NSObjectMacros.h>
-#  import <FoundationExt/NSString+Ext.h>
-#  import <FoundationExt/GeneralExceptions.h>
+#  include <NGExtensions/NGObjectMacros.h>
+#  include <NGExtensions/NSString+Ext.h>
 #endif
 
 #include <NGExtensions/NGExtensions.h>