Fix build_crypto.sh & Add Archs

Author: Andrey Matoshko

BitcoinKit.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -1157,8 +1157,8 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 147494DB201F9A29006D1CF8 /* Build configuration list for PBXNativeTarget "BitcoinKit" */;
 			buildPhases = (
-				292B636820E7BF7000F5040A /* SwiftLint */,
 				1482B628202954CC0098B612 /* Build Libraries */,
+				292B636820E7BF7000F5040A /* SwiftLint */,
 				147494C2201F9A29006D1CF8 /* Sources */,
 				147494C3201F9A29006D1CF8 /* Frameworks */,
 				147494C4201F9A29006D1CF8 /* Headers */,
@@ -1253,6 +1253,7 @@
 /* Begin PBXShellScriptBuildPhase section */
 		1482B628202954CC0098B612 /* Build Libraries */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -1264,7 +1265,6 @@
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "if [ ! -d \"$SRCROOT/Libraries/secp256k1/lib\" ] || [ ! -d \"$SRCROOT/Libraries/openssl/lib\" ]; then\n  env -i PATH=$PATH sh \"$SRCROOT/setup/build_libraries.sh\"\nfi\n";
-			showEnvVarsInLog = 0;
 		};
 		292B636820E7BF7000F5040A /* SwiftLint */ = {
 			isa = PBXShellScriptBuildPhase;

setup/build_crypto.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -ex
 
-SCRIPT_DIR="`pwd`/`dirname $0`"
+SCRIPT_DIR="`dirname $0`"
 OPENSSL_VERSION=1.0.2n
 
 TDIR=`mktemp -d`
@@ -17,12 +17,18 @@ cd openssl-$OPENSSL_VERSION
 sh "$SCRIPT_DIR/build_crypto_impl.sh" iphoneos arm64
 sh "$SCRIPT_DIR/build_crypto_impl.sh" iphoneos armv7s
 sh "$SCRIPT_DIR/build_crypto_impl.sh" iphoneos armv7
+sh "$SCRIPT_DIR/build_crypto_impl.sh" iphonesimulator i386
+sh "$SCRIPT_DIR/build_crypto_impl.sh" iphonesimulator x86_64
+
+
 
 
 mkdir -p "$SCRIPT_DIR/../Libraries/openssl/lib"
 xcrun lipo -create .build/iphoneos/arm64/libcrypto.a \
                    .build/iphoneos/armv7s/libcrypto.a \
                    .build/iphoneos/armv7/libcrypto.a \
+                   .build/iphonesimulator/x86_64/libcrypto.a \
+                   .build/iphonesimulator/i386/libcrypto.a \
                    -o "$SCRIPT_DIR/../Libraries/openssl/lib/libcrypto.a"
 cp -rf $TDIR/openssl-$OPENSSL_VERSION/include "$SCRIPT_DIR/../Libraries/openssl/"