From 92dcf3cab5439dc4ad4ead8973b4d3792a67865f Mon Sep 17 00:00:00 2001
From: ilya-fedin <fedin-ilja2010@ya.ru>
Date: Mon, 16 Aug 2021 06:35:10 +0400
Subject: [PATCH] Fix Windows action (#210)

---
 .github/workflows/win.yml | 21 ++++++++++++---------
 Telegram/CMakeLists.txt   |  8 ++++++++
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/win.yml b/.github/workflows/win.yml
index 0d245d34e..3f96dae47 100644
--- a/.github/workflows/win.yml
+++ b/.github/workflows/win.yml
@@ -469,26 +469,29 @@ jobs:
       - name: Kotatogram Desktop build.
         if: env.ONLY_CACHE == 'false'
         run: |
-          cd %REPO_NAME%\Telegram
-          
-          call configure.bat ^
+          cd %REPO_NAME%
+          call vcvarsall.bat x86 %SDK%
+
+          cmake -B build . ^
           -G Ninja ^
+          -D CMAKE_BUILD_TYPE=Debug ^
+          -D CMAKE_C_COMPILER=cl ^
+          -D CMAKE_CXX_COMPILER=cl ^
           -D TDESKTOP_API_TEST=ON ^
           -D DESKTOP_APP_USE_PACKAGED=OFF ^
           -D DESKTOP_APP_DISABLE_AUTOUPDATE=ON ^
           -D DESKTOP_APP_DISABLE_CRASH_REPORTS=ON ^
           -D DESKTOP_APP_NO_PDB=ON ^
           %TDESKTOP_BUILD_DEFINE% ^
-          -DCMAKE_SYSTEM_VERSION=%SDK%
+          -DCMAKE_SYSTEM_VERSION=%SDK% ^
+          -DCMAKE_VS_WINDOWS_TARGET_PLATFORM_VERSION=%SDK%
 
-          call vcvars32.bat
-          cd ..\out
-          msbuild Telegram.sln /nologo /p:Configuration=Debug,Platform=Win32
+          cmake --build build
 
       - name: Move artifact.
         if: env.UPLOAD_ARTIFACT == 'true'
         run: |
-          cd %REPO_NAME%\out\Debug
+          cd %REPO_NAME%\build\bin
           mkdir artifact
           move Kotatogram.exe artifact/
       - uses: actions/upload-artifact@master
@@ -496,4 +499,4 @@ jobs:
         if: env.UPLOAD_ARTIFACT == 'true'
         with:
           name: ${{ env.ARTIFACT_NAME }}
-          path: ${{ env.REPO_NAME }}\out\Debug\artifact\
+          path: ${{ env.REPO_NAME }}\build\bin\artifact\
diff --git a/Telegram/CMakeLists.txt b/Telegram/CMakeLists.txt
index 211753337..4475f5a6d 100644
--- a/Telegram/CMakeLists.txt
+++ b/Telegram/CMakeLists.txt
@@ -1398,6 +1398,10 @@ endif()
 set_target_properties(Telegram PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${output_folder})
 
 if (WIN32)
+    target_link_libraries(Telegram
+    PRIVATE
+        delayimp
+    )
     target_link_options(Telegram
     PRIVATE
         /DELAYLOAD:secur32.dll
@@ -1453,6 +1457,10 @@ if ((NOT DESKTOP_APP_DISABLE_AUTOUPDATE OR APPLE) AND NOT build_macstore AND NOT
         )
         target_include_directories(Updater PRIVATE ${lib_base_loc})
         if (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+            target_link_libraries(Updater
+            PRIVATE
+                delayimp
+            )
             target_link_options(Updater
             PRIVATE
                 /DELAYLOAD:user32.dll