Fixed build issues

6 files changed, 32 insertions, 83 deletions

diff --git a/build-mac/mailcore2.xcodeproj/project.pbxproj b/build-mac/mailcore2.xcodeproj/project.pbxproj
index e3d02a20..cdad9459 100644
--- a/build-mac/mailcore2.xcodeproj/project.pbxproj
+++ b/build-mac/mailcore2.xcodeproj/project.pbxproj
@@ -2687,53 +2687,23 @@
 					/usr/include/tidy,
 					/usr/include/libxml2,
 				);
-				"HEADER_SEARCH_PATHS[sdk=iphoneos*]" = (
-					"\"$(SRCROOT)/../Externals/libetpan-ios/include\"",
-					"\"$(SRCROOT)/../Externals/icu4c-ios/include\"",
-					"\"$(SRCROOT)/../Externals/ctemplate-ios/include\"",
-					"\"$(SRCROOT)/../Externals/tidy-html5-ios/include/tidy\"",
-					/usr/include/libxml2,
-				);
-				"HEADER_SEARCH_PATHS[sdk=iphonesimulator*]" = (
-					"\"$(SRCROOT)/../Externals/libetpan-ios/include\"",
-					"\"$(SRCROOT)/../Externals/icu4c-ios/include\"",
-					"\"$(SRCROOT)/../Externals/ctemplate-ios/include\"",
-					"\"$(SRCROOT)/../Externals/tidy-html5-ios/include/tidy\"",
-					/usr/include/libxml2,
-				);
-				"HEADER_SEARCH_PATHS[sdk=macosx*]" = (
-					"\"$(SRCROOT)/../Externals/libetpan/include\"",
-					"\"$(SRCROOT)/../Externals/icu4c/include\"",
-					"\"$(SRCROOT)/../Externals/ctemplate/include\"",
-					/usr/include/tidy,
-					/usr/include/libxml2,
-				);
+				"HEADER_SEARCH_PATHS[sdk=iphoneos*]" = "$(IOS_HEADERS_SEARCH_PATHS)";
+				"HEADER_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(IOS_HEADERS_SEARCH_PATHS)";
+				"HEADER_SEARCH_PATHS[sdk=macosx*]" = "$(OSX_HEADERS_SEARCH_PATHS)";
+				IOS_HEADERS_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan-ios/include\" \"$(SRCROOT)/../Externals/icu4c-ios/include\" \"$(SRCROOT)/../Externals/ctemplate-ios/include\" \"$(SRCROOT)/../Externals/tidy-html5-ios/include/tidy\" /usr/include/libxml2 \"$(SRCROOT)/../submodules/libjson\"";
+				IOS_LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan-ios/lib\" \"$(SRCROOT)/../Externals/icu4c-ios/lib\" \"$(SRCROOT)/../Externals/ctemplate-ios/lib\" \"$(SRCROOT)/../Externals/libsasl-ios/lib\" \"$(SRCROOT)/../Externals/tidy-html5-ios/lib\"";
 				LIBRARY_SEARCH_PATHS = (
 					"\"$(SRCROOT)/../Externals/libetpan/lib\"",
 					"\"$(SRCROOT)/../Externals/icu4c/lib\"",
 					"\"$(SRCROOT)/../Externals/ctemplate/lib\"",
 				);
-				"LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = (
-					"\"$(SRCROOT)/../Externals/libetpan-ios/lib\"",
-					"\"$(SRCROOT)/../Externals/icu4c-ios/lib\"",
-					"\"$(SRCROOT)/../Externals/ctemplate-ios/lib\"",
-					"\"$(SRCROOT)/../Externals/libsasl-ios/lib\"",
-					"\"$(SRCROOT)/../Externals/tidy-html5-ios/lib\"",
-				);
-				"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = (
-					"\"$(SRCROOT)/../Externals/libetpan-ios/lib\"",
-					"\"$(SRCROOT)/../Externals/icu4c-ios/lib\"",
-					"\"$(SRCROOT)/../Externals/ctemplate-ios/lib\"",
-					"\"$(SRCROOT)/../Externals/libsasl-ios/lib\"",
-					"\"$(SRCROOT)/../Externals/tidy-html5-ios/lib\"",
-				);
-				"LIBRARY_SEARCH_PATHS[sdk=macosx*]" = (
-					"\"$(SRCROOT)/../Externals/libetpan/lib\"",
-					"\"$(SRCROOT)/../Externals/icu4c/lib\"",
-					"\"$(SRCROOT)/../Externals/ctemplate/lib\"",
-				);
+				"LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = "$(IOS_LIBRARY_SEARCH_PATHS)";
+				"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(IOS_LIBRARY_SEARCH_PATHS)";
+				"LIBRARY_SEARCH_PATHS[sdk=macosx*]" = "$(OSX_LIBRARY_SEARCH_PATHS)";
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				ONLY_ACTIVE_ARCH = YES;
+				OSX_HEADERS_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan/include\" \"$(SRCROOT)/../Externals/icu4c/include\" \"$(SRCROOT)/../Externals/ctemplate/include\" /usr/include/tidy /usr/include/libxml2 \"$(SRCROOT)/../submodules/libjson\"";
+				OSX_LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan/lib\" \"$(SRCROOT)/../Externals/icu4c/lib\" \"$(SRCROOT)/../Externals/ctemplate/lib\"";
 				SDKROOT = macosx;
 			};
 			name = Debug;
@@ -2767,52 +2737,22 @@
 					/usr/include/tidy,
 					/usr/include/libxml2,
 				);
-				"HEADER_SEARCH_PATHS[sdk=iphoneos*]" = (
-					"\"$(SRCROOT)/../Externals/libetpan-ios/include\"",
-					"\"$(SRCROOT)/../Externals/icu4c-ios/include\"",
-					"\"$(SRCROOT)/../Externals/ctemplate-ios/include\"",
-					"\"$(SRCROOT)/../Externals/tidy-html5-ios/include/tidy\"",
-					/usr/include/libxml2,
-				);
-				"HEADER_SEARCH_PATHS[sdk=iphonesimulator*]" = (
-					"\"$(SRCROOT)/../Externals/libetpan-ios/include\"",
-					"\"$(SRCROOT)/../Externals/icu4c-ios/include\"",
-					"\"$(SRCROOT)/../Externals/ctemplate-ios/include\"",
-					"\"$(SRCROOT)/../Externals/tidy-html5-ios/include/tidy\"",
-					/usr/include/libxml2,
-				);
-				"HEADER_SEARCH_PATHS[sdk=macosx*]" = (
-					"\"$(SRCROOT)/../Externals/libetpan/include\"",
-					"\"$(SRCROOT)/../Externals/icu4c/include\"",
-					"\"$(SRCROOT)/../Externals/ctemplate/include\"",
-					/usr/include/tidy,
-					/usr/include/libxml2,
-				);
+				"HEADER_SEARCH_PATHS[sdk=iphoneos*]" = "$(IOS_HEADERS_SEARCH_PATHS)";
+				"HEADER_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(IOS_HEADERS_SEARCH_PATHS)";
+				"HEADER_SEARCH_PATHS[sdk=macosx*]" = "$(OSX_HEADERS_SEARCH_PATHS)";
+				IOS_HEADERS_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan-ios/include\" \"$(SRCROOT)/../Externals/icu4c-ios/include\" \"$(SRCROOT)/../Externals/ctemplate-ios/include\" \"$(SRCROOT)/../Externals/tidy-html5-ios/include/tidy\" /usr/include/libxml2 \"$(SRCROOT)/../submodules/libjson\"";
+				IOS_LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan-ios/lib\" \"$(SRCROOT)/../Externals/icu4c-ios/lib\" \"$(SRCROOT)/../Externals/ctemplate-ios/lib\" \"$(SRCROOT)/../Externals/libsasl-ios/lib\" \"$(SRCROOT)/../Externals/tidy-html5-ios/lib\"";
 				LIBRARY_SEARCH_PATHS = (
 					"\"$(SRCROOT)/../Externals/libetpan/lib\"",
 					"\"$(SRCROOT)/../Externals/icu4c/lib\"",
 					"\"$(SRCROOT)/../Externals/ctemplate/lib\"",
 				);
-				"LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = (
-					"\"$(SRCROOT)/../Externals/libetpan-ios/lib\"",
-					"\"$(SRCROOT)/../Externals/icu4c-ios/lib\"",
-					"\"$(SRCROOT)/../Externals/ctemplate-ios/lib\"",
-					"\"$(SRCROOT)/../Externals/libsasl-ios/lib\"",
-					"\"$(SRCROOT)/../Externals/tidy-html5-ios/lib\"",
-				);
-				"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = (
-					"\"$(SRCROOT)/../Externals/libetpan-ios/lib\"",
-					"\"$(SRCROOT)/../Externals/icu4c-ios/lib\"",
-					"\"$(SRCROOT)/../Externals/ctemplate-ios/lib\"",
-					"\"$(SRCROOT)/../Externals/libsasl-ios/lib\"",
-					"\"$(SRCROOT)/../Externals/tidy-html5-ios/lib\"",
-				);
-				"LIBRARY_SEARCH_PATHS[sdk=macosx*]" = (
-					"\"$(SRCROOT)/../Externals/libetpan/lib\"",
-					"\"$(SRCROOT)/../Externals/icu4c/lib\"",
-					"\"$(SRCROOT)/../Externals/ctemplate/lib\"",
-				);
+				"LIBRARY_SEARCH_PATHS[sdk=iphoneos*]" = "$(IOS_LIBRARY_SEARCH_PATHS)";
+				"LIBRARY_SEARCH_PATHS[sdk=iphonesimulator*]" = "$(IOS_LIBRARY_SEARCH_PATHS)";
+				"LIBRARY_SEARCH_PATHS[sdk=macosx*]" = "$(OSX_LIBRARY_SEARCH_PATHS)";
 				MACOSX_DEPLOYMENT_TARGET = 10.8;
+				OSX_HEADERS_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan/include\" \"$(SRCROOT)/../Externals/icu4c/include\" \"$(SRCROOT)/../Externals/ctemplate/include\" /usr/include/tidy /usr/include/libxml2 \"$(SRCROOT)/../submodules/libjson\"";
+				OSX_LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../Externals/libetpan/lib\" \"$(SRCROOT)/../Externals/icu4c/lib\" \"$(SRCROOT)/../Externals/ctemplate/lib\"";
 				SDKROOT = macosx;
 			};
 			name = Release;
diff --git a/example/ios/iOS UI Test/iOS UI Test/MasterViewController.h b/example/ios/iOS UI Test/iOS UI Test/MasterViewController.h
index da63eb60..9910ba6d 100644
--- a/example/ios/iOS UI Test/iOS UI Test/MasterViewController.h
+++ b/example/ios/iOS UI Test/iOS UI Test/MasterViewController.h
@@ -8,8 +8,6 @@
 
 #import <UIKit/UIKit.h>
 #import "SettingsViewController.h"
-//#import <mailcore/mailcore.h>
-
 
 @interface MasterViewController : UITableViewController <SettingsViewControllerDelegate>
 
diff --git a/example/ios/iOS UI Test/iOS UI Test/SettingsViewController.h b/example/ios/iOS UI Test/iOS UI Test/SettingsViewController.h
index 37fd2af4..2c6cd2ef 100644
--- a/example/ios/iOS UI Test/iOS UI Test/SettingsViewController.h
+++ b/example/ios/iOS UI Test/iOS UI Test/SettingsViewController.h
@@ -7,7 +7,6 @@
 //
 
 #import <UIKit/UIKit.h>
-#import <mailcore/mailcore.h>
 
 extern NSString * const UsernameKey;
 extern NSString * const PasswordKey;
diff --git a/src/core/basetypes/MCJSON.h b/src/core/basetypes/MCJSON.h
index 4f4ba761..77100991 100644
--- a/src/core/basetypes/MCJSON.h
+++ b/src/core/basetypes/MCJSON.h
@@ -16,6 +16,8 @@
 #include <MailCore/MCString.h>
 #include <MailCore/MCData.h>
 
+#ifdef __cplusplus
+
 namespace mailcore {
 
     class Null;
@@ -47,4 +49,6 @@ namespace mailcore {
     
 }
 
+#endif
+
 #endif /* defined(__hermes__MCJSON__) */
diff --git a/src/core/basetypes/MCMD5.h b/src/core/basetypes/MCMD5.h
index 4821f90a..1d2f76b1 100644
--- a/src/core/basetypes/MCMD5.h
+++ b/src/core/basetypes/MCMD5.h
@@ -12,9 +12,13 @@
 #include <MailCore/MCData.h>
 #include <MailCore/MCString.h>
 
+#ifdef __cplusplus
+
 namespace mailcore {
     Data * md5Data(Data * data);
     String * md5String(Data * data);
 }
 
 #endif
+
+#endif
diff --git a/src/core/basetypes/MCNull.h b/src/core/basetypes/MCNull.h
index 345b5fd7..9a8f994d 100644
--- a/src/core/basetypes/MCNull.h
+++ b/src/core/basetypes/MCNull.h
@@ -11,6 +11,8 @@
 
 #include <MailCore/MCObject.h>
 
+#ifdef __cplusplus
+
 namespace mailcore {
     
     class Null : public Object {
@@ -21,3 +23,5 @@ namespace mailcore {
 }
 
 #endif
+
+#endif