diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3c48d0d..b605b5a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -21,12 +21,14 @@ jobs: steps: - name: Checkout - uses: actions/checkout@v2 + uses: actions/checkout@v5 with: fetch-depth: 0 - name: Install Developer Command Prompt for Microsoft Visual C++ uses: ilammy/msvc-dev-cmd@v1 + with: + arch: amd64 - name: Install Qt uses: jurplel/install-qt-action@v4 diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index b62ddd4..7592cd7 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -31,7 +31,6 @@ target_compile_definitions(libweaver PRIVATE LIBWEAVER_LIBRARY) if (NOT MSVC) target_compile_options(libweaver PRIVATE -Werror -Wall -Wextra -Wno-unused-parameter) endif() -target_compile_definitions(libweaver PRIVATE $<$:NOMINMAX>) set_target_properties(libweaver PROPERTIES CXX_STANDARD 98 CXX_STANDARD_REQUIRED ON diff --git a/lib/file.cpp b/lib/file.cpp index 54ae187..fde5010 100644 --- a/lib/file.cpp +++ b/lib/file.cpp @@ -1,6 +1,7 @@ #include "file.h" #ifdef _WIN32 +#define NOMINMAX #include #else #include