IOS-1484 use lowercase name, moves sequoia dependencies in from Adapter IOS-1484
authorbuff <andreas@pep-project.org>
Tue, 18 Jun 2019 16:09:04 +0200
branchIOS-1484
changeset 3853791883bc572d
parent 3852 7473bcd87097
child 3854 3ac7c313a638
IOS-1484 use lowercase name, moves sequoia dependencies in from Adapter
build-mac/pEpEngine.xcodeproj/project.pbxproj
     1.1 --- a/build-mac/pEpEngine.xcodeproj/project.pbxproj	Tue Jun 18 15:53:49 2019 +0200
     1.2 +++ b/build-mac/pEpEngine.xcodeproj/project.pbxproj	Tue Jun 18 16:09:04 2019 +0200
     1.3 @@ -7,6 +7,10 @@
     1.4  	objects = {
     1.5  
     1.6  /* Begin PBXBuildFile section */
     1.7 +		154917FD22B926700091B6D6 /* libnettle.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154917F922B9266F0091B6D6 /* libnettle.a */; };
     1.8 +		154917FE22B926700091B6D6 /* libsequoia_openpgp_ffi.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154917FA22B926700091B6D6 /* libsequoia_openpgp_ffi.a */; };
     1.9 +		154917FF22B926700091B6D6 /* libhogweed.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154917FB22B926700091B6D6 /* libhogweed.a */; };
    1.10 +		1549180022B926700091B6D6 /* libgmp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 154917FC22B926700091B6D6 /* libgmp.a */; };
    1.11  		159EF42722B6D3E900149C0C /* pgp_sequoia.c in Sources */ = {isa = PBXBuildFile; fileRef = 159EF42422B6D3E900149C0C /* pgp_sequoia.c */; };
    1.12  		159EF42822B6D3E900149C0C /* pgp_sequoia.h in Headers */ = {isa = PBXBuildFile; fileRef = 159EF42522B6D3E900149C0C /* pgp_sequoia.h */; };
    1.13  		159EF42922B6D3E900149C0C /* pgp_sequoia_internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 159EF42622B6D3E900149C0C /* pgp_sequoia_internal.h */; };
    1.14 @@ -215,6 +219,10 @@
    1.15  /* End PBXCopyFilesBuildPhase section */
    1.16  
    1.17  /* Begin PBXFileReference section */
    1.18 +		154917F922B9266F0091B6D6 /* libnettle.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libnettle.a; path = ../../sequoia4ios/build/lib/libnettle.a; sourceTree = "<group>"; };
    1.19 +		154917FA22B926700091B6D6 /* libsequoia_openpgp_ffi.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libsequoia_openpgp_ffi.a; path = ../../sequoia4ios/build/lib/libsequoia_openpgp_ffi.a; sourceTree = "<group>"; };
    1.20 +		154917FB22B926700091B6D6 /* libhogweed.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libhogweed.a; path = ../../sequoia4ios/build/lib/libhogweed.a; sourceTree = "<group>"; };
    1.21 +		154917FC22B926700091B6D6 /* libgmp.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libgmp.a; path = ../../sequoia4ios/build/lib/libgmp.a; sourceTree = "<group>"; };
    1.22  		159EF42422B6D3E900149C0C /* pgp_sequoia.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = pgp_sequoia.c; path = ../src/pgp_sequoia.c; sourceTree = "<group>"; };
    1.23  		159EF42522B6D3E900149C0C /* pgp_sequoia.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pgp_sequoia.h; path = ../src/pgp_sequoia.h; sourceTree = "<group>"; };
    1.24  		159EF42622B6D3E900149C0C /* pgp_sequoia_internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = pgp_sequoia_internal.h; path = ../src/pgp_sequoia_internal.h; sourceTree = "<group>"; };
    1.25 @@ -409,12 +417,35 @@
    1.26  			buildActionMask = 2147483647;
    1.27  			files = (
    1.28  				6400FB8B1B8CA1CF005221E3 /* libetpan-ios.a in Frameworks */,
    1.29 +				1549180022B926700091B6D6 /* libgmp.a in Frameworks */,
    1.30 +				154917FF22B926700091B6D6 /* libhogweed.a in Frameworks */,
    1.31 +				154917FE22B926700091B6D6 /* libsequoia_openpgp_ffi.a in Frameworks */,
    1.32 +				154917FD22B926700091B6D6 /* libnettle.a in Frameworks */,
    1.33  			);
    1.34  			runOnlyForDeploymentPostprocessing = 0;
    1.35  		};
    1.36  /* End PBXFrameworksBuildPhase section */
    1.37  
    1.38  /* Begin PBXGroup section */
    1.39 +		154917EB22B926080091B6D6 /* Frameworks */ = {
    1.40 +			isa = PBXGroup;
    1.41 +			children = (
    1.42 +				154917F422B926420091B6D6 /* sequoia4ios */,
    1.43 +			);
    1.44 +			name = Frameworks;
    1.45 +			sourceTree = "<group>";
    1.46 +		};
    1.47 +		154917F422B926420091B6D6 /* sequoia4ios */ = {
    1.48 +			isa = PBXGroup;
    1.49 +			children = (
    1.50 +				154917FC22B926700091B6D6 /* libgmp.a */,
    1.51 +				154917FB22B926700091B6D6 /* libhogweed.a */,
    1.52 +				154917F922B9266F0091B6D6 /* libnettle.a */,
    1.53 +				154917FA22B926700091B6D6 /* libsequoia_openpgp_ffi.a */,
    1.54 +			);
    1.55 +			name = sequoia4ios;
    1.56 +			sourceTree = "<group>";
    1.57 +		};
    1.58  		6406CE811CE382F400C14D77 /* asn.1 */ = {
    1.59  			isa = PBXGroup;
    1.60  			children = (
    1.61 @@ -557,6 +588,7 @@
    1.62  				644297C01BE11C65002BC73B /* pEpTrustWords */,
    1.63  				64796A401B455AA5004B1C24 /* Products */,
    1.64  				43D47A8A225CC60600E97C5B /* pEpTrustWords-Info.plist */,
    1.65 +				154917EB22B926080091B6D6 /* Frameworks */,
    1.66  			);
    1.67  			sourceTree = "<group>";
    1.68  		};
    1.69 @@ -1058,7 +1090,7 @@
    1.70  					"$(SRCROOT)",
    1.71  					"$(SRCROOT)/../../OpenSSL-for-iPhone/include",
    1.72  					"$(SRCROOT)/../asn.1/",
    1.73 -					"$(PROJECT_DIR)/../../Sequoia4iOS/build/include",
    1.74 +					"$(PROJECT_DIR)/../../sequoia4ios/build/include",
    1.75  				);
    1.76  				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
    1.77  				MTL_ENABLE_DEBUG_INFO = YES;
    1.78 @@ -1114,7 +1146,7 @@
    1.79  					"$(SRCROOT)",
    1.80  					"$(SRCROOT)/../../OpenSSL-for-iPhone/include",
    1.81  					"$(SRCROOT)/../asn.1/",
    1.82 -					"$(PROJECT_DIR)/../../Sequoia4iOS/build/include",
    1.83 +					"$(PROJECT_DIR)/../../sequoia4ios/build/include",
    1.84  				);
    1.85  				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
    1.86  				MTL_ENABLE_DEBUG_INFO = NO;