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 0e03cf889b24b5560d5beb749a42ecd9e0103818..4e53cc4ac0e5b8330e3157ba2e81fca6d171f6e4 100644 (file)
--- 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 c11cf7e04d46b77069856e513e227f115570d6f3..6ca2940ce317bf4e5931a353c8e71b1fc603f168 100644 (file)
--- 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 c2056f2a937dac35eaeda3b8f5d2ae99e545e362..797c3c5260bd5eb8595afe8aad0b30a418d945bc 100644 (file)
--- 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 fb7ef4cf481d6328f8dff400351e07210d651331..5ba1d70e3d8524cbacfa25346f8fc0402e0878cd 100644 (file)
--- 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 96bc29c308cf07558db84a2b07e3ff657e21cdf0..ee246c15cbca095fe6a83a695fb4b4d295d52ba9 100644 (file)
--- 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 b56593dab2ab8e609160901bf676fd4ab267e909..5ef22ed77a346b17e547c692a31f2dcda41e9223 100644 (file)
--- 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 c2d51c16ded5e768a416665b5008fba438a75a05..30986027db5373739b686e44c443ef12043cb73a 100644 (file)
--- 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 9b8bd1d4c1227318618110149b8645bf1f43c6b4..9cc7c9edea99740e1d93264a626064dd7730694e 100644 (file)
--- 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 0675cbc00a5ed25ae32e6b143c73487ce785ea88..c2828143b5de35ff4b0ffdb31ff3c4c3ace2721d 100644 (file)
--- 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;