From 2834628fa87d1fa73e718faf1f683e7ad228b9dd Mon Sep 17 00:00:00 2001 From: Andrea Cavalli Date: Sun, 11 Oct 2020 13:09:47 +0200 Subject: [PATCH] Update generate_td_tools.sh and fix-tdlib-tdutils-windows-cmake.sed --- scripts/generate_td_tools.sh | 6 +++++- src/main/replacements/fix-tdlib-tdutils-windows-cmake.sed | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/generate_td_tools.sh b/scripts/generate_td_tools.sh index c742934..e5182f5 100755 --- a/scripts/generate_td_tools.sh +++ b/scripts/generate_td_tools.sh @@ -48,7 +48,11 @@ cp -r implementations/${IMPLEMENTATION_NAME} ./generated/implementation echo "Patching implementation files..." #Fix bug: https://github.com/tdlib/td/issues/1238 if [[ "$IMPLEMENTATION_NAME" = "tdlib" ]]; then - sed -f "src/main/replacements/fix-tdlib-tdutils-windows-cmake.sed" -i ./generated/implementation/tdutils/CMakeLists.txt + if [[ "$OPERATING_SYSTEM_NAME" = "osx" ]]; then + sed -f "src/main/replacements/fix-tdlib-tdutils-windows-cmake.sed" -i "" ./generated/implementation/tdutils/CMakeLists.txt + else + sed -f "src/main/replacements/fix-tdlib-tdutils-windows-cmake.sed" -i"" ./generated/implementation/tdutils/CMakeLists.txt + fi fi # Configure cmake diff --git a/src/main/replacements/fix-tdlib-tdutils-windows-cmake.sed b/src/main/replacements/fix-tdlib-tdutils-windows-cmake.sed index e5190f0..f6b62a6 100644 --- a/src/main/replacements/fix-tdlib-tdutils-windows-cmake.sed +++ b/src/main/replacements/fix-tdlib-tdutils-windows-cmake.sed @@ -1 +1 @@ -s/tdutils PRIVATE shell32/tdutils PRIVATE shell32 crypto32/ +s/shell32/shell32 crypto32/