diff --git a/Directory.Build.props b/Directory.Build.props
index 07e5305c5..5a27c8b90 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -5,6 +5,7 @@
iPhone Distribution
True
True
+ -gcc_flags "-L$(ProjectDir)../../lib/ios -largon2 -force_load $(ProjectDir)../../lib/ios/libargon2.a"
diff --git a/src/App/App.csproj b/src/App/App.csproj
index f71e873e7..dc29cf125 100644
--- a/src/App/App.csproj
+++ b/src/App/App.csproj
@@ -56,10 +56,12 @@
iPhone Developer
Platforms\iOS\Entitlements.plist
true
-
+
+
+ $(Argon2IdLoadMtouchExtraArgs)
- -gcc_flags "-L$(ProjectDir)../../lib/ios -largon2 -force_load $(ProjectDir)../../lib/ios/libargon2.a"
+ $(Argon2IdLoadMtouchExtraArgs)
false
@@ -67,7 +69,7 @@
$(ReleaseCodesignKey)
Platforms\iOS\Entitlements.plist
true
- -gcc_flags "-L$(ProjectDir)../../lib/ios -largon2 -force_load $(ProjectDir)../../lib/ios/libargon2.a"
+ $(Argon2IdLoadMtouchExtraArgs)
diff --git a/src/iOS.Autofill/iOS.Autofill.csproj b/src/iOS.Autofill/iOS.Autofill.csproj
index 9322e97c4..66b6afdf2 100644
--- a/src/iOS.Autofill/iOS.Autofill.csproj
+++ b/src/iOS.Autofill/iOS.Autofill.csproj
@@ -26,14 +26,12 @@
iPhone Developer
Entitlements.plist
true
-
-
-
+
+
+ $(Argon2IdLoadMtouchExtraArgs)
- -gcc_flags "-L$(ProjectDir)../../lib/ios -largon2 -force_load $(ProjectDir)../../lib/ios/libargon2.a"
+ $(Argon2IdLoadMtouchExtraArgs)
false
@@ -41,7 +39,7 @@
$(ReleaseCodesignKey)
Entitlements.plist
true
- -gcc_flags "-L$(ProjectDir)../../lib/ios -largon2 -force_load $(ProjectDir)../../lib/ios/libargon2.a"
+ $(Argon2IdLoadMtouchExtraArgs)
diff --git a/src/iOS.Extension/iOS.Extension.csproj b/src/iOS.Extension/iOS.Extension.csproj
index 870ac757a..d855ffde9 100644
--- a/src/iOS.Extension/iOS.Extension.csproj
+++ b/src/iOS.Extension/iOS.Extension.csproj
@@ -27,8 +27,11 @@
all
+
+ $(Argon2IdLoadMtouchExtraArgs)
+
- -gcc_flags "-L$(ProjectDir)../../lib/ios -largon2 -force_load $(ProjectDir)../../lib/ios/libargon2.a"
+ $(Argon2IdLoadMtouchExtraArgs)
false
@@ -36,7 +39,7 @@
$(ReleaseCodesignKey)
Entitlements.plist
true
- -gcc_flags "-L$(ProjectDir)../../lib/ios -largon2 -force_load $(ProjectDir)../../lib/ios/libargon2.a"
+ $(Argon2IdLoadMtouchExtraArgs)
diff --git a/src/iOS.ShareExtension/iOS.ShareExtension.csproj b/src/iOS.ShareExtension/iOS.ShareExtension.csproj
index 8a3689aca..5394ae9ae 100644
--- a/src/iOS.ShareExtension/iOS.ShareExtension.csproj
+++ b/src/iOS.ShareExtension/iOS.ShareExtension.csproj
@@ -25,12 +25,12 @@
iPhone Developer
Entitlements.plist
all
-
-
-
+
+
+ $(Argon2IdLoadMtouchExtraArgs)
- -gcc_flags "-L$(ProjectDir)../../lib/ios -largon2 -force_load $(ProjectDir)../../lib/ios/libargon2.a"
+ $(Argon2IdLoadMtouchExtraArgs)
false
@@ -38,7 +38,7 @@
$(ReleaseCodesignKey)
Entitlements.plist
true
- -gcc_flags "-L$(ProjectDir)../../lib/ios -largon2 -force_load $(ProjectDir)../../lib/ios/libargon2.a"
+ $(Argon2IdLoadMtouchExtraArgs)