Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix broken build for the sample projects #656

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix broken build for the sample projects #656

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
efb2a9f
Fix build for Mac OS X
nkanellopoulos Jan 5, 2016
d439549
Fix build for the iOS sample
nkanellopoulos Jan 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Utilities/XMPPSRVResolver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@

#import <Foundation/Foundation.h>

#if !(TARGET_IPHONE_SIMULATOR)
#if TARGET_OS_IPHONE
@import dnssd;
#else
#elif TARGET_IPHONE_SIMULATOR
@import dnssdSimu;
#elif TARGET_OS_MAC
#include <dns_sd.h>
#endif

extern NSString *const XMPPSRVResolverErrorDomain;
Expand Down
2 changes: 1 addition & 1 deletion Xcode/DesktopXMPP/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
<string>com.deusty.${PRODUCT_NAME:identifier}</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Expand Down
15 changes: 12 additions & 3 deletions Xcode/DesktopXMPP/XMPPStream.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1129,7 +1129,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0510;
LastUpgradeCheck = 0720;
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "XMPPStream" */;
compatibilityVersion = "Xcode 3.2";
Expand Down Expand Up @@ -1333,6 +1333,7 @@
"\"$(SRCROOT)/../../Vendor/libidn\"",
);
MACOSX_DEPLOYMENT_TARGET = 10.8;
PRODUCT_BUNDLE_IDENTIFIER = "com.deusty.${PRODUCT_NAME:identifier}";
PRODUCT_NAME = XMPPStream;
WRAPPER_EXTENSION = app;
};
Expand All @@ -1355,6 +1356,7 @@
"\"$(SRCROOT)/../../Vendor/libidn\"",
);
MACOSX_DEPLOYMENT_TARGET = 10.8;
PRODUCT_BUNDLE_IDENTIFIER = "com.deusty.${PRODUCT_NAME:identifier}";
PRODUCT_NAME = XMPPStream;
WRAPPER_EXTENSION = app;
};
Expand All @@ -1363,6 +1365,7 @@
C01FCF4F08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ENABLE_TESTABILITY = YES;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES;
Expand All @@ -1371,7 +1374,10 @@
GCC_WARN_MISSING_PARENTHESES = YES;
GCC_WARN_SHADOW = NO;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = /usr/include/libxml2;
HEADER_SEARCH_PATHS = (
/usr/include/libxml2,
"$SRCROOT/../../Vendor/**",
);
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
};
Expand All @@ -1387,7 +1393,10 @@
GCC_WARN_MISSING_PARENTHESES = YES;
GCC_WARN_SHADOW = NO;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = /usr/include/libxml2;
HEADER_SEARCH_PATHS = (
/usr/include/libxml2,
"$SRCROOT/../../Vendor/**",
);
SDKROOT = macosx;
};
name = Release;
Expand Down
2 changes: 1 addition & 1 deletion Xcode/iPhoneXMPP/iPhoneXMPP-Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<key>CFBundleIconFile</key>
<string></string>
<key>CFBundleIdentifier</key>
<string>com.deusty.oss.xmppframework.${PRODUCT_NAME:rfc1034identifier}</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
Expand Down
25 changes: 24 additions & 1 deletion Xcode/iPhoneXMPP/iPhoneXMPP.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@
28C286E00D94DF7D0034E888 /* RootViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; lineEnding = 0; path = RootViewController.m; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.objc; };
28F335F01007B36200424DE2 /* RootViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = RootViewController.xib; sourceTree = "<group>"; };
29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
4C6D31891C3BE57F007520E9 /* module.modulemap */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = "sourcecode.module-map"; path = module.modulemap; sourceTree = "<group>"; };
631C7B7418E0E7C70015DBDF /* XMPPSCRAMSHA1Authentication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XMPPSCRAMSHA1Authentication.h; sourceTree = "<group>"; };
631C7B7518E0E7C70015DBDF /* XMPPSCRAMSHA1Authentication.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = XMPPSCRAMSHA1Authentication.m; sourceTree = "<group>"; };
8D1107310486CEB800E47090 /* iPhoneXMPP-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "iPhoneXMPP-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -614,6 +615,14 @@
name = Frameworks;
sourceTree = "<group>";
};
4C6D31881C3BE57F007520E9 /* module */ = {
isa = PBXGroup;
children = (
4C6D31891C3BE57F007520E9 /* module.modulemap */,
);
path = module;
sourceTree = "<group>";
};
631C7B7318E0E7C70015DBDF /* SCRAM-SHA-1 */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -669,6 +678,7 @@
DC1F98001152CAF300138A8F /* XMPP */ = {
isa = PBXGroup;
children = (
4C6D31881C3BE57F007520E9 /* module */,
DCE11268140C5798007A2A46 /* XMPPFramework.h */,
DC30E6B8153E09D2001B9E6D /* Authentication */,
DC1F98011152CAFD00138A8F /* Categories */,
Expand Down Expand Up @@ -1174,7 +1184,7 @@
isa = PBXProject;
attributes = {
CLASSPREFIX = XMPP;
LastUpgradeCheck = 0500;
LastUpgradeCheck = 0720;
ORGANIZATIONNAME = XMPPFramework;
};
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "iPhoneXMPP" */;
Expand Down Expand Up @@ -1339,6 +1349,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
Expand All @@ -1351,6 +1362,7 @@
"$(inherited)",
"\"$(SRCROOT)/../../Vendor/libidn\"",
);
PRODUCT_BUNDLE_IDENTIFIER = "com.deusty.oss.xmppframework.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = iPhoneXMPP;
};
name = Debug;
Expand All @@ -1359,6 +1371,7 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
COPY_PHASE_STRIP = YES;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
Expand All @@ -1369,36 +1382,46 @@
"$(inherited)",
"\"$(SRCROOT)/../../Vendor/libidn\"",
);
PRODUCT_BUNDLE_IDENTIFIER = "com.deusty.oss.xmppframework.${PRODUCT_NAME:rfc1034identifier}";
PRODUCT_NAME = iPhoneXMPP;
};
name = Release;
};
C01FCF4F08A954540054247B /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_PREPROCESSOR_DEFINITIONS = DEBUG;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2";
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
MODULEMAP_FILE = "";
MODULEMAP_PRIVATE_FILE = "";
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
USER_HEADER_SEARCH_PATHS = "$SRCROOT/../../module $SRCROOT/../../Vendor/**";
WARNING_CFLAGS = "-Wno-arc-performSelector-leaks";
};
name = Debug;
};
C01FCF5008A954540054247B /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CLANG_ENABLE_MODULES = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
GCC_C_LANGUAGE_STANDARD = c99;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
HEADER_SEARCH_PATHS = "$(SDKROOT)/usr/include/libxml2";
IPHONEOS_DEPLOYMENT_TARGET = 7.0;
MODULEMAP_FILE = "";
MODULEMAP_PRIVATE_FILE = "";
SDKROOT = iphoneos;
USER_HEADER_SEARCH_PATHS = "$SRCROOT/../../module $SRCROOT/../../Vendor/**";
WARNING_CFLAGS = "-Wno-arc-performSelector-leaks";
};
name = Release;
Expand Down
19 changes: 19 additions & 0 deletions Xcode/iPhoneXMPP/module/module.modulemap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
module libxml [system] {
header "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/libxml2/libxml/tree.h"
export *
}

module libxmlSimu [system] {
header "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include/libxml2/libxml/tree.h"
export *
}

module dnssd [system] {
header "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS.sdk/usr/include/dns_sd.h"
export *
}

module dnssdSimu [system] {
header "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk/usr/include/dns_sd.h"
export *
}