From 1ca1f0fa7de36d62017d8d4d728a9b9f072b8918 Mon Sep 17 00:00:00 2001 From: John Preston Date: Thu, 31 Oct 2024 23:19:19 +0400 Subject: [PATCH] Revert "Always rely on __has_include()" This reverts commit e0e4a7bec6916ea4e223707a83593fc42ad8550b. Didn't work for me, gave errors when building. --- Telegram/Resources/winrc/Telegram.rc | 14 ++++++++++---- Telegram/Resources/winrc/Updater.rc | 14 ++++++++++---- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/Telegram/Resources/winrc/Telegram.rc b/Telegram/Resources/winrc/Telegram.rc index 2e6d03f48..adfa817e1 100644 --- a/Telegram/Resources/winrc/Telegram.rc +++ b/Telegram/Resources/winrc/Telegram.rc @@ -6,11 +6,17 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#if defined(__has_include) && __has_include() - #include +#if defined(__MINGW64__) || defined(__MINGW32__) + // MinGW-w64, MinGW + #if defined(__has_include) && __has_include() + #include + #else + #include + #include + #endif #else - #include - #include + // MSVC, Windows SDK + #include #endif ///////////////////////////////////////////////////////////////////////////// diff --git a/Telegram/Resources/winrc/Updater.rc b/Telegram/Resources/winrc/Updater.rc index 6fd861b92..f9a116f81 100644 --- a/Telegram/Resources/winrc/Updater.rc +++ b/Telegram/Resources/winrc/Updater.rc @@ -6,11 +6,17 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#if defined(__has_include) && __has_include() - #include +#if defined(__MINGW64__) || defined(__MINGW32__) + // MinGW-w64, MinGW + #if defined(__has_include) && __has_include() + #include + #else + #include + #include + #endif #else - #include - #include + // MSVC, Windows SDK + #include #endif /////////////////////////////////////////////////////////////////////////////