From: znek <znek@e4a50df8-12e2-0310-a44c-efbce7f8a7e3>
Date: Wed, 22 Sep 2004 15:36:14 +0000 (+0000)
Subject: Xcode build fixed for linking against libical.framework
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93d48895f0d60ab9905af10c1eac51cbfae6b85a;p=sope

Xcode build fixed for linking against libical.framework

git-svn-id: http://svn.opengroupware.org/SOPE/trunk@161 e4a50df8-12e2-0310-a44c-efbce7f8a7e3
---

diff --git a/sope-ical/iCalSaxDriver/ChangeLog b/sope-ical/iCalSaxDriver/ChangeLog
index 0e03cf88..4e53cc4a 100644
--- a/sope-ical/iCalSaxDriver/ChangeLog
+++ b/sope-ical/iCalSaxDriver/ChangeLog
@@ -1,5 +1,13 @@
 2004-09-22  Marcus Mueller  <znek@mulle-kybernetik.com>
 
+	* v4.3.16
+
+	* iCalSaxDriver.xcode: new definition for Xcode build (XCODE_BUILD)
+
+	* ICalSaxParser.m, NSString+ICal.h, NSCalendarDate+ICal.h,
+	  NSString+ICal.m, NSCalendarDate+ICal.m: use new XCODE_BUILD
+	  definition to correctly include ical.h.
+
 	* iCalSaxDriver.xcode: new Xcode project
 
 2004-09-14  Helge Hess  <helge.hess@skyrix.com>
diff --git a/sope-ical/iCalSaxDriver/ICalSaxParser.m b/sope-ical/iCalSaxDriver/ICalSaxParser.m
index c11cf7e0..6ca2940c 100644
--- a/sope-ical/iCalSaxDriver/ICalSaxParser.m
+++ b/sope-ical/iCalSaxDriver/ICalSaxParser.m
@@ -24,7 +24,11 @@
 #include <SaxObjC/XMLNamespaces.h>
 #include <SaxObjC/SaxAttributes.h>
 #include "common.h"
+#ifdef XCODE_BUILD
+#import <libical/ical.h>
+#else
 #include <ical.h>
+#endif
 
 /*
   OPEN: apply default attributes in conformance to xcal !
diff --git a/sope-ical/iCalSaxDriver/NSCalendarDate+ICal.h b/sope-ical/iCalSaxDriver/NSCalendarDate+ICal.h
index c2056f2a..797c3c52 100644
--- a/sope-ical/iCalSaxDriver/NSCalendarDate+ICal.h
+++ b/sope-ical/iCalSaxDriver/NSCalendarDate+ICal.h
@@ -24,7 +24,11 @@
 #define __ICal2_NSCalendarDate_ICal_H__
 
 #import <Foundation/NSCalendarDate.h>
+#ifdef XCODE_BUILD
+#import <libical/ical.h>
+#else
 #include <ical.h>
+#endif
 
 @class NSTimeZone;
 
diff --git a/sope-ical/iCalSaxDriver/NSCalendarDate+ICal.m b/sope-ical/iCalSaxDriver/NSCalendarDate+ICal.m
index fb7ef4cf..5ba1d70e 100644
--- a/sope-ical/iCalSaxDriver/NSCalendarDate+ICal.m
+++ b/sope-ical/iCalSaxDriver/NSCalendarDate+ICal.m
@@ -22,7 +22,11 @@
 
 #include "NSCalendarDate+ICal.h"
 #include "common.h"
+#ifdef XCODE_BUILD
+#import <libical/ical.h>
+#else
 #include <ical.h>
+#endif
 
 static NSTimeZone *gmt = nil;
 static inline void _setupGMT(void) {
diff --git a/sope-ical/iCalSaxDriver/NSString+ICal.h b/sope-ical/iCalSaxDriver/NSString+ICal.h
index 96bc29c3..ee246c15 100644
--- a/sope-ical/iCalSaxDriver/NSString+ICal.h
+++ b/sope-ical/iCalSaxDriver/NSString+ICal.h
@@ -24,7 +24,11 @@
 #define __ICal2_NSString_ICal_H__
 
 #import <Foundation/NSString.h>
+#ifdef XCODE_BUILD
+#import <libical/ical.h>
+#else
 #include <ical.h>
+#endif
 
 @interface NSString(ICalValue)
 
diff --git a/sope-ical/iCalSaxDriver/NSString+ICal.m b/sope-ical/iCalSaxDriver/NSString+ICal.m
index b56593da..5ef22ed7 100644
--- a/sope-ical/iCalSaxDriver/NSString+ICal.m
+++ b/sope-ical/iCalSaxDriver/NSString+ICal.m
@@ -22,7 +22,11 @@
 
 #include "NSString+ICal.h"
 #include "common.h"
+#ifdef XCODE_BUILD
+#import <libical/ical.h>
+#else
 #include <ical.h>
+#endif
 
 @implementation NSString(ICalCString)
 
diff --git a/sope-ical/iCalSaxDriver/Version b/sope-ical/iCalSaxDriver/Version
index c2d51c16..30986027 100644
--- a/sope-ical/iCalSaxDriver/Version
+++ b/sope-ical/iCalSaxDriver/Version
@@ -1,3 +1,3 @@
 # version
 
-SUBMINOR_VERSION:=15
+SUBMINOR_VERSION:=16
diff --git a/sope-ical/iCalSaxDriver/iCalSaxDriver-Info.plist b/sope-ical/iCalSaxDriver/iCalSaxDriver-Info.plist
index 9b8bd1d4..9cc7c9ed 100644
--- a/sope-ical/iCalSaxDriver/iCalSaxDriver-Info.plist
+++ b/sope-ical/iCalSaxDriver/iCalSaxDriver-Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>4.3.15</string>
+	<string>4.3.16</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>
diff --git a/sope-ical/iCalSaxDriver/iCalSaxDriver.xcode/project.pbxproj b/sope-ical/iCalSaxDriver/iCalSaxDriver.xcode/project.pbxproj
index 0675cbc0..c2828143 100644
--- a/sope-ical/iCalSaxDriver/iCalSaxDriver.xcode/project.pbxproj
+++ b/sope-ical/iCalSaxDriver/iCalSaxDriver.xcode/project.pbxproj
@@ -156,6 +156,7 @@
 				GCC_PRECOMPILE_PREFIX_HEADER = NO;
 				INFOPLIST_FILE = "iCalSaxDriver-Info.plist";
 				INSTALL_PATH = "$(USER_LIBRARY_DIR)/SaxDrivers";
+				OTHER_CFLAGS = "-DXCODE_BUILD=1";
 				PRODUCT_NAME = iCalSaxDriver;
 				WARNING_CFLAGS = "-Wmost";
 				WRAPPER_EXTENSION = sax;