diff --git a/README.md b/README.md index a82f72e..5e0310e 100644 --- a/README.md +++ b/README.md @@ -3,5 +3,5 @@ It's Android's first OpenOffice Document Reader... for iOS! ## Setup 1. run "pod install" -2. run "bash build-simulator.sh" or "bash build-device.sh" +2. run "bash conan/setup-all.sh" 3. open workspace in Xcode diff --git a/conan/patch.sh b/conan/patch.sh deleted file mode 100644 index 28f513d..0000000 --- a/conan/patch.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -set -e - -echo "patch conan generated xcconfig files" - -# patch xcconfig - see https://github.com/conan-io/conan/issues/16526 -sed -i '' -E 's/\]\[arch=arm64\]\[/][/g;t' conan-output/*.xcconfig -sed -i '' -E 's/\]\[arch=x86_64\]\[/][/g;t' conan-output/*.xcconfig - -echo "done" diff --git a/conan/setup-all.sh b/conan/setup-all.sh index ee3063d..49504a9 100644 --- a/conan/setup-all.sh +++ b/conan/setup-all.sh @@ -29,5 +29,3 @@ for arch in "arm64" "x64"; do -o "configuration=${configuration}" done done - -bash conan/patch.sh