From ea511b780a60b4ae5dcd12d931787619bf8854e9 Mon Sep 17 00:00:00 2001 From: Marco Matthies <71844+marcom@users.noreply.github.com> Date: Sat, 1 Jul 2023 20:40:29 +0200 Subject: [PATCH 1/2] Fix compilation on windows-mingw32 --- src/utilities.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/utilities.cpp b/src/utilities.cpp index 5238a5b..f5e54a8 100644 --- a/src/utilities.cpp +++ b/src/utilities.cpp @@ -43,7 +43,7 @@ #include #include -#if not defined(_MSC_VER) +#if not (defined(_MSC_VER) || defined(__MINGW32__)) #include #include #endif @@ -68,9 +68,9 @@ std::string get_version_nr() // -------------------------------------------------------------------- -#ifdef _MSC_VER +#if defined(_MSC_VER) || defined(__MINGW32__) } -#include +#include #include #include From 1873f53c62d3103fe720ff0fd2f6ecc50267dc8f Mon Sep 17 00:00:00 2001 From: Marco Matthies <71844+marcom@users.noreply.github.com> Date: Mon, 3 Jul 2023 11:23:46 +0200 Subject: [PATCH 2/2] Better check for windows compile target --- src/utilities.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/utilities.cpp b/src/utilities.cpp index f5e54a8..3aecc32 100644 --- a/src/utilities.cpp +++ b/src/utilities.cpp @@ -43,7 +43,7 @@ #include #include -#if not (defined(_MSC_VER) || defined(__MINGW32__)) +#if not defined(_WIN32) #include #include #endif @@ -68,7 +68,7 @@ std::string get_version_nr() // -------------------------------------------------------------------- -#if defined(_MSC_VER) || defined(__MINGW32__) +#if defined(_WIN32) } #include #include