diff options
| author | João Valverde <j@v6e.pt> | 2023-02-06 16:09:54 +0000 |
|---|---|---|
| committer | João Valverde <j@v6e.pt> | 2023-02-06 19:39:33 +0000 |
| commit | 7c156d9ac4264672984252e351e8e0fe753838af (patch) | |
| tree | 11111dbef397b7a2bafb227efbc41b7ecf8cbe95 /ui | |
| parent | 66bd99f1a837473bf250ed48e127516c2d838f44 (diff) | |
Add a #define HAVE_MSYSTEM and use it
In certain situations using __MINGW64__ is not correct.
We want to have the condition apply using MinGW-w64 but also
using MSYS2, which the __MINGW64__ condition alone does not
capture.
Add a HAVE_MSYSTEM C define and use it where appropriate.
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/qt/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/qt/main.cpp b/ui/qt/main.cpp index b551032ad5..cb46c110fd 100644 --- a/ui/qt/main.cpp +++ b/ui/qt/main.cpp @@ -342,7 +342,7 @@ check_and_warn_user_startup() } #endif -#if defined(_WIN32) && !defined(__MINGW64__) +#if defined(_WIN32) && !defined(HAVE_MSYSTEM) // Try to avoid library search path collisions. QCoreApplication will // search QT_INSTALL_PREFIX/plugins for platform DLLs before searching // the application directory. If @@ -650,7 +650,7 @@ int main(int argc, char *qt_argv[]) commandline_early_options(argc, argv); -#if defined(_WIN32) && !defined(__MINGW64__) +#if defined(_WIN32) && !defined(HAVE_MSYSTEM) win32_reset_library_path(); #endif |