IOSAD-103 merge in default (xcode script and include path changes) IOSAD-103
authorDirk Zimmermann <dirk@pep-project.org>
Fri, 05 Oct 2018 13:46:49 +0200
branchIOSAD-103
changeset 3015ff8ca007ef19
parent 3009 2f4afc6fb3a4
parent 3010 9e792279cd0e
child 3028 8ce59b8fe7e7
IOSAD-103 merge in default (xcode script and include path changes)
build-mac/pEpEngine.xcodeproj/project.pbxproj
     1.1 --- a/build-mac/pEpEngine.xcodeproj/project.pbxproj	Fri Oct 05 11:53:18 2018 +0200
     1.2 +++ b/build-mac/pEpEngine.xcodeproj/project.pbxproj	Fri Oct 05 13:46:49 2018 +0200
     1.3 @@ -14,6 +14,8 @@
     1.4  		43370834203C075A004E6547 /* sqlite3.h in Headers */ = {isa = PBXBuildFile; fileRef = 43370832203C075A004E6547 /* sqlite3.h */; };
     1.5  		4354FF651D6EDF300033069C /* sync_impl.c in Sources */ = {isa = PBXBuildFile; fileRef = 4354FF641D6EDF300033069C /* sync_impl.c */; };
     1.6  		438C439B2167582500C7425B /* sync_api.h in Headers */ = {isa = PBXBuildFile; fileRef = 438C43962167582400C7425B /* sync_api.h */; };
     1.7 +		438C43B52167752C00C7425B /* labeled_int_list.h in Headers */ = {isa = PBXBuildFile; fileRef = 438C43AF2167752C00C7425B /* labeled_int_list.h */; };
     1.8 +		438C43B62167752C00C7425B /* labeled_int_list.c in Sources */ = {isa = PBXBuildFile; fileRef = 438C43B42167752C00C7425B /* labeled_int_list.c */; };
     1.9  		43F6921D1F164A47009418F5 /* resource_id.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F6921C1F164A47009418F5 /* resource_id.c */; };
    1.10  		43F73BF02166269200AB4524 /* PString.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73BEB2166269200AB4524 /* PString.c */; };
    1.11  		43F73BF2216626E100AB4524 /* Sync_func.c in Sources */ = {isa = PBXBuildFile; fileRef = 43F73BF1216626E100AB4524 /* Sync_func.c */; };
    1.12 @@ -204,6 +206,8 @@
    1.13  		43370832203C075A004E6547 /* sqlite3.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sqlite3.h; path = ../src/sqlite3.h; sourceTree = "<group>"; };
    1.14  		4354FF641D6EDF300033069C /* sync_impl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = sync_impl.c; path = ../src/sync_impl.c; sourceTree = "<group>"; };
    1.15  		438C43962167582400C7425B /* sync_api.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = sync_api.h; path = ../src/sync_api.h; sourceTree = "<group>"; };
    1.16 +		438C43AF2167752C00C7425B /* labeled_int_list.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = labeled_int_list.h; path = ../src/labeled_int_list.h; sourceTree = "<group>"; };
    1.17 +		438C43B42167752C00C7425B /* labeled_int_list.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = labeled_int_list.c; path = ../src/labeled_int_list.c; sourceTree = "<group>"; };
    1.18  		43F6921C1F164A47009418F5 /* resource_id.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = resource_id.c; path = ../src/resource_id.c; sourceTree = "<group>"; };
    1.19  		43F73BEB2166269200AB4524 /* PString.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = PString.c; path = ../asn.1/PString.c; sourceTree = "<group>"; };
    1.20  		43F73BF1216626E100AB4524 /* Sync_func.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = Sync_func.c; path = ../src/Sync_func.c; sourceTree = "<group>"; };
    1.21 @@ -521,6 +525,8 @@
    1.22  		64A8264B1B455C5600EECAF0 /* srcref */ = {
    1.23  			isa = PBXGroup;
    1.24  			children = (
    1.25 +				438C43B42167752C00C7425B /* labeled_int_list.c */,
    1.26 +				438C43AF2167752C00C7425B /* labeled_int_list.h */,
    1.27  				438C43962167582400C7425B /* sync_api.h */,
    1.28  				43F73C0A2166282C00AB4524 /* growing_buf.c */,
    1.29  				43F73C052166282C00AB4524 /* key_reset.c */,
    1.30 @@ -601,6 +607,7 @@
    1.31  				646C40F21D510CD800C63EFF /* asn_SET_OF.h in Headers */,
    1.32  				646C41311D510CD800C63EFF /* PrintableString.h in Headers */,
    1.33  				646C40F51D510CD800C63EFF /* Beacon.h in Headers */,
    1.34 +				438C43B52167752C00C7425B /* labeled_int_list.h in Headers */,
    1.35  				646C40F71D510CD800C63EFF /* ber_decoder.h in Headers */,
    1.36  				646C41351D510CD800C63EFF /* UTF8String.h in Headers */,
    1.37  				646C40EC1D510CD800C63EFF /* asn_codecs_prim.h in Headers */,
    1.38 @@ -824,6 +831,7 @@
    1.39  				646C41301D510CD800C63EFF /* PrintableString.c in Sources */,
    1.40  				64A8267B1B455D0800EECAF0 /* etpan_mime.c in Sources */,
    1.41  				64A8267A1B455D0800EECAF0 /* email.c in Sources */,
    1.42 +				438C43B62167752C00C7425B /* labeled_int_list.c in Sources */,
    1.43  				646C41261D510CD800C63EFF /* OCTET_STRING.c in Sources */,
    1.44  				646C41141D510CD800C63EFF /* Hash.c in Sources */,
    1.45  				43F73BF02166269200AB4524 /* PString.c in Sources */,
    1.46 @@ -1056,6 +1064,7 @@
    1.47  		64796A541B455AA5004B1C24 /* Debug */ = {
    1.48  			isa = XCBuildConfiguration;
    1.49  			buildSettings = {
    1.50 +				HEADER_SEARCH_PATHS = "$(inherited)";
    1.51  				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
    1.52  				LIBRARY_SEARCH_PATHS = (
    1.53  					"$(inherited)",
    1.54 @@ -1066,12 +1075,14 @@
    1.55  				OTHER_LDFLAGS = "-ObjC";
    1.56  				PRODUCT_NAME = "$(TARGET_NAME)";
    1.57  				SKIP_INSTALL = YES;
    1.58 +				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../src $(PROJECT_DIR) $(PROJECT_DIR)/../../netpgp-et/include/ $(PROJECT_DIR)/../../netpgp-et/src/ $(PROJECT_DIR)/../../OpenSSL-for-iPhone/include $(PROJECT_DIR)/../asn.1/ $(inherited)";
    1.59  			};
    1.60  			name = Debug;
    1.61  		};
    1.62  		64796A551B455AA5004B1C24 /* Release */ = {
    1.63  			isa = XCBuildConfiguration;
    1.64  			buildSettings = {
    1.65 +				HEADER_SEARCH_PATHS = "$(inherited)";
    1.66  				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
    1.67  				LIBRARY_SEARCH_PATHS = (
    1.68  					"$(inherited)",
    1.69 @@ -1081,6 +1092,7 @@
    1.70  				OTHER_LDFLAGS = "-ObjC";
    1.71  				PRODUCT_NAME = "$(TARGET_NAME)";
    1.72  				SKIP_INSTALL = YES;
    1.73 +				USER_HEADER_SEARCH_PATHS = "$(PROJECT_DIR)/../src $(PROJECT_DIR) $(PROJECT_DIR)/../../netpgp-et/include/ $(PROJECT_DIR)/../../netpgp-et/src/ $(PROJECT_DIR)/../../OpenSSL-for-iPhone/include $(PROJECT_DIR)/../asn.1/ $(inherited)";
    1.74  			};
    1.75  			name = Release;
    1.76  		};