From a4da877195c13ed6612b4877df23046cf2df8112 Mon Sep 17 00:00:00 2001 From: qubka Date: Sat, 27 Sep 2025 14:15:30 +0100 Subject: [PATCH 1/2] fix: add preprocessor macro to MSVC --- CMakeLists.txt | 2 +- external/plugify | 2 +- test/cross_call_master/CMakeLists.txt | 2 +- test/cross_call_master/external/plugify/include/plg/config.hpp | 2 +- test/cross_call_worker/CMakeLists.txt | 2 +- test/cross_call_worker/external/plugify/include/plg/config.hpp | 2 +- test/example_plugin/CMakeLists.txt | 2 +- test/example_plugin/external/plugify/include/plg/config.hpp | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f6aaf7a..c62b183 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -65,7 +65,7 @@ endif() target_link_libraries(${PROJECT_NAME} PRIVATE ${CPPLM_LINK_LIBRARIES}) if(MSVC) - target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX) + target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX /Zc:preprocessor) else() target_compile_options(${PROJECT_NAME} PRIVATE -Wextra -Wshadow -Wconversion -Wpedantic -Werror) endif() diff --git a/external/plugify b/external/plugify index 38d6e9f..7b231e6 160000 --- a/external/plugify +++ b/external/plugify @@ -1 +1 @@ -Subproject commit 38d6e9f5452fee901586219974cd7b177847d7bf +Subproject commit 7b231e630874c85795efb15edf3e345e19e889fa diff --git a/test/cross_call_master/CMakeLists.txt b/test/cross_call_master/CMakeLists.txt index c6ca410..7f732f4 100644 --- a/test/cross_call_master/CMakeLists.txt +++ b/test/cross_call_master/CMakeLists.txt @@ -36,7 +36,7 @@ add_library(${PROJECT_NAME} SHARED ${PLUGIN_SOURCES}) target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/external/plugify/include") if(MSVC) - target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX) + target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX /Zc:preprocessor) else() target_compile_options(${PROJECT_NAME} PRIVATE -Wextra -Wshadow -Wconversion -Wpedantic -Werror) endif() diff --git a/test/cross_call_master/external/plugify/include/plg/config.hpp b/test/cross_call_master/external/plugify/include/plg/config.hpp index 05db47f..8ba7006 100644 --- a/test/cross_call_master/external/plugify/include/plg/config.hpp +++ b/test/cross_call_master/external/plugify/include/plg/config.hpp @@ -43,7 +43,7 @@ namespace plg { } } } // namespace plg -# define PLUGIFY_THROW(str, exp, ...) ::plg::throw_exception(str, ##__VA_ARGS__); +# define PLUGIFY_THROW(str, exp, ...) ::plg::throw_exception(str __VA_OPT__(,) __VA_ARGS__); #else # include # include diff --git a/test/cross_call_worker/CMakeLists.txt b/test/cross_call_worker/CMakeLists.txt index ab94486..47cfc8c 100644 --- a/test/cross_call_worker/CMakeLists.txt +++ b/test/cross_call_worker/CMakeLists.txt @@ -36,7 +36,7 @@ add_library(${PROJECT_NAME} SHARED ${PLUGIN_SOURCES}) target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/external/plugify/include") if(MSVC) - target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX) + target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX /Zc:preprocessor) else() target_compile_options(${PROJECT_NAME} PRIVATE -Wextra -Wshadow -Wconversion -Wpedantic -Werror) endif() diff --git a/test/cross_call_worker/external/plugify/include/plg/config.hpp b/test/cross_call_worker/external/plugify/include/plg/config.hpp index 05db47f..8ba7006 100644 --- a/test/cross_call_worker/external/plugify/include/plg/config.hpp +++ b/test/cross_call_worker/external/plugify/include/plg/config.hpp @@ -43,7 +43,7 @@ namespace plg { } } } // namespace plg -# define PLUGIFY_THROW(str, exp, ...) ::plg::throw_exception(str, ##__VA_ARGS__); +# define PLUGIFY_THROW(str, exp, ...) ::plg::throw_exception(str __VA_OPT__(,) __VA_ARGS__); #else # include # include diff --git a/test/example_plugin/CMakeLists.txt b/test/example_plugin/CMakeLists.txt index ff1eee7..ec48ff0 100644 --- a/test/example_plugin/CMakeLists.txt +++ b/test/example_plugin/CMakeLists.txt @@ -36,7 +36,7 @@ add_library(${PROJECT_NAME} SHARED ${PLUGIN_SOURCES}) target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/external/plugify/include") if(MSVC) - target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX) + target_compile_options(${PROJECT_NAME} PRIVATE /W4 /WX /Zc:preprocessor) else() target_compile_options(${PROJECT_NAME} PRIVATE -Wextra -Wshadow -Wconversion -Wpedantic -Werror) endif() diff --git a/test/example_plugin/external/plugify/include/plg/config.hpp b/test/example_plugin/external/plugify/include/plg/config.hpp index 05db47f..8ba7006 100644 --- a/test/example_plugin/external/plugify/include/plg/config.hpp +++ b/test/example_plugin/external/plugify/include/plg/config.hpp @@ -43,7 +43,7 @@ namespace plg { } } } // namespace plg -# define PLUGIFY_THROW(str, exp, ...) ::plg::throw_exception(str, ##__VA_ARGS__); +# define PLUGIFY_THROW(str, exp, ...) ::plg::throw_exception(str __VA_OPT__(,) __VA_ARGS__); #else # include # include From ce9d7f3402f539f2b720c9ee3232dc94b2c19add Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sat, 27 Sep 2025 13:15:49 +0000 Subject: [PATCH 2/2] chore(main): release 2.1.1 --- .github/release-please-manifest.json | 2 +- CHANGELOG.md | 7 +++++++ version.txt | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/.github/release-please-manifest.json b/.github/release-please-manifest.json index 969d3db..48fbed9 100644 --- a/.github/release-please-manifest.json +++ b/.github/release-please-manifest.json @@ -1,3 +1,3 @@ { - ".": "2.1.0" + ".": "2.1.1" } diff --git a/CHANGELOG.md b/CHANGELOG.md index 3f60c7f..ef76cf5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # Changelog +## [2.1.1](https://github.com/untrustedmodders/plugify-module-cpp/compare/v2.1.0...v2.1.1) (2025-09-27) + + +### Bug Fixes + +* add preprocessor macro to MSVC ([a4da877](https://github.com/untrustedmodders/plugify-module-cpp/commit/a4da877195c13ed6612b4877df23046cf2df8112)) + ## [2.1.0](https://github.com/untrustedmodders/plugify-module-cpp/compare/v2.0.18...v2.1.0) (2025-09-27) diff --git a/version.txt b/version.txt index 7ec1d6d..3e3c2f1 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -2.1.0 +2.1.1