|
|
@@ -28,7 +28,7 @@
|
|
|
30E8F2212447357500CE2C90 /* DatabaseHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30E8F2202447357500CE2C90 /* DatabaseHelper.swift */; };
|
|
|
30E8F2482449C98600CE2C90 /* UIView+Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30E8F2472449C98600CE2C90 /* UIView+Extensions.swift */; };
|
|
|
30E8F24D2449D30200CE2C90 /* DcColors.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30E8F24C2449D30200CE2C90 /* DcColors.swift */; };
|
|
|
- 7827C88B2A0408A700B8470D /* libdeltachat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7827C88A2A0408A700B8470D /* libdeltachat.a */; };
|
|
|
+ 78072F172A040ED800EB7C98 /* libdeltachat.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 78072F162A040ED800EB7C98 /* libdeltachat.a */; };
|
|
|
7871729629BA495200F110DC /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7871729529BA495200F110DC /* SystemConfiguration.framework */; };
|
|
|
/* End PBXBuildFile section */
|
|
|
|
|
|
@@ -68,6 +68,7 @@
|
|
|
30E8F2202447357500CE2C90 /* DatabaseHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DatabaseHelper.swift; sourceTree = "<group>"; };
|
|
|
30E8F2472449C98600CE2C90 /* UIView+Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "UIView+Extensions.swift"; sourceTree = "<group>"; };
|
|
|
30E8F24C2449D30200CE2C90 /* DcColors.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DcColors.swift; sourceTree = "<group>"; };
|
|
|
+ 78072F162A040ED800EB7C98 /* libdeltachat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdeltachat.a; path = "../deltachat-ios/libraries/libdeltachat.a"; sourceTree = "<group>"; };
|
|
|
7827C8882A04089900B8470D /* libraries */ = {isa = PBXFileReference; lastKnownFileType = folder; name = libraries; path = "../deltachat-ios/libraries"; sourceTree = "<group>"; };
|
|
|
7827C88A2A0408A700B8470D /* libdeltachat.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libdeltachat.a; path = "../deltachat-ios/libraries/deltachat-core-rust/libdeltachat.a"; sourceTree = "<group>"; };
|
|
|
7871729529BA495200F110DC /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = Platforms/MacOSX.platform/Developer/SDKs/MacOSX13.1.sdk/System/Library/Frameworks/SystemConfiguration.framework; sourceTree = DEVELOPER_DIR; };
|
|
|
@@ -78,8 +79,8 @@
|
|
|
isa = PBXFrameworksBuildPhase;
|
|
|
buildActionMask = 2147483647;
|
|
|
files = (
|
|
|
+ 78072F172A040ED800EB7C98 /* libdeltachat.a in Frameworks */,
|
|
|
7871729629BA495200F110DC /* SystemConfiguration.framework in Frameworks */,
|
|
|
- 7827C88B2A0408A700B8470D /* libdeltachat.a in Frameworks */,
|
|
|
);
|
|
|
runOnlyForDeploymentPostprocessing = 0;
|
|
|
};
|
|
|
@@ -152,6 +153,7 @@
|
|
|
isa = PBXGroup;
|
|
|
children = (
|
|
|
7827C88A2A0408A700B8470D /* libdeltachat.a */,
|
|
|
+ 78072F162A040ED800EB7C98 /* libdeltachat.a */,
|
|
|
7827C8882A04089900B8470D /* libraries */,
|
|
|
7871729529BA495200F110DC /* SystemConfiguration.framework */,
|
|
|
30421958243DE61400516852 /* libdeltachat.a */,
|
|
|
@@ -308,7 +310,7 @@
|
|
|
);
|
|
|
runOnlyForDeploymentPostprocessing = 0;
|
|
|
shellPath = /bin/sh;
|
|
|
- shellScript = "export PATH=\"/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin\"\nexport PATH=\"$HOME/.cargo/bin:$PATH\"\n\nFILENAME=\"libdeltachat.a\"\nDIR=\"../deltachat-ios/libraries/deltachat-core-rust\"\n\n# Delete old build, if any.\nrm -f \"${DIR}/${FILENAME}\"\n\nrustc `cat ../rust-toolchain` --version\n\n# ensure all targets are installed\nrustup target add aarch64-apple-ios x86_64-apple-ios --toolchain `cat ../rust-toolchain`\n\n# --xcode-integ determines --release and --targets from Xcode's env vars.\n# Depending your setup, specify the rustup toolchain explicitly.\nRUSTFLAGS=\"-C lto=on -C embed-bitcode=yes\" \\\n cargo +`cat ../rust-toolchain` lipo --xcode-integ --manifest-path \"$DIR/deltachat-ffi/Cargo.toml\"\n\n# cargo-lipo drops result in different folder, depending on the config.\nif [[ $CONFIGURATION = \"Debug\" ]]; then\n SOURCE=\"$DIR/target/universal/debug/${FILENAME}\"\nelse\n SOURCE=\"$DIR/target/universal/release/${FILENAME}\"\nfi\n\n# Copy compiled library to DIR.\nif [ -e \"${SOURCE}\" ]; then\n cp -a \"${SOURCE}\" $DIR\nfi\n";
|
|
|
+ shellScript = "export PATH=\"/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin\"\nexport PATH=\"$HOME/.cargo/bin:$PATH\"\n\nFILENAME=\"libdeltachat.a\"\nDIR=\"../deltachat-ios/libraries\"\n\n# Delete old build, if any.\nrm -f \"${DIR}/${FILENAME}\"\n\nrustc `cat ../rust-toolchain` --version\n\n# ensure all targets are installed\nrustup target add aarch64-apple-ios x86_64-apple-ios --toolchain `cat ../rust-toolchain`\n\n# --xcode-integ determines --release and --targets from Xcode's env vars.\n# Depending your setup, specify the rustup toolchain explicitly.\nRUSTFLAGS=\"-C lto=on -C embed-bitcode=yes\" \\\n cargo +`cat ../rust-toolchain` lipo --xcode-integ --manifest-path \"$DIR/deltachat-core-rust/deltachat-ffi/Cargo.toml\"\n\n# cargo-lipo drops result in different folder, depending on the config.\nif [[ $CONFIGURATION = \"Debug\" ]]; then\n SOURCE=\"$DIR/deltachat-core-rust/target/universal/debug/${FILENAME}\"\nelse\n SOURCE=\"$DIR/deltachat-core-rust/target/universal/release/${FILENAME}\"\nfi\n\n# Copy compiled library to DIR.\nif [ -e \"${SOURCE}\" ]; then\n cp -a \"${SOURCE}\" $DIR\nfi\n";
|
|
|
};
|
|
|
/* End PBXShellScriptBuildPhase section */
|
|
|
|
|
|
@@ -502,7 +504,7 @@
|
|
|
LIBRARY_SEARCH_PATHS = (
|
|
|
"$(inherited)",
|
|
|
"$(PROJECT_DIR)/../deltachat-ios/libraries/deltachat-core-rust/deltachat-ffi",
|
|
|
- "$(PROJECT_DIR)/../deltachat-ios/libraries/deltachat-core-rust/",
|
|
|
+ "$(PROJECT_DIR)/../deltachat-ios/libraries",
|
|
|
);
|
|
|
PRODUCT_BUNDLE_IDENTIFIER = chat.delta.DcCore;
|
|
|
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
|
|
|
@@ -538,7 +540,7 @@
|
|
|
LIBRARY_SEARCH_PATHS = (
|
|
|
"$(inherited)",
|
|
|
"$(PROJECT_DIR)/../deltachat-ios/libraries/deltachat-core-rust/deltachat-ffi",
|
|
|
- "$(PROJECT_DIR)/../deltachat-ios/libraries/deltachat-core-rust/",
|
|
|
+ "$(PROJECT_DIR)/../deltachat-ios/libraries",
|
|
|
);
|
|
|
PRODUCT_BUNDLE_IDENTIFIER = chat.delta.DcCore;
|
|
|
PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)";
|
dignifiedquire