diff --git a/lib/pch.hpp b/lib/pch.hpp index c19ab166..57ba0a2a 100644 --- a/lib/pch.hpp +++ b/lib/pch.hpp @@ -38,11 +38,3 @@ #include #include #include - -// ARM64 libobs pulls in windows.h, whose macros collide with our identifiers -#ifdef _WIN32 -#undef DELETE -#undef DispatchMessage -#undef SendMessage -#undef GetObject -#endif diff --git a/lib/utils/message-dispatcher.hpp b/lib/utils/message-dispatcher.hpp index 1bc766c3..11a3fc65 100644 --- a/lib/utils/message-dispatcher.hpp +++ b/lib/utils/message-dispatcher.hpp @@ -5,6 +5,10 @@ #include #include +#ifdef DispatchMessage +#undef DispatchMessage +#endif + namespace advss { template class MessageDispatcher { diff --git a/plugins/http/macro-action-http.hpp b/plugins/http/macro-action-http.hpp index 3a0acd05..685974e6 100644 --- a/plugins/http/macro-action-http.hpp +++ b/plugins/http/macro-action-http.hpp @@ -9,6 +9,10 @@ #include #include +#ifdef DELETE +#undef DELETE +#endif + namespace advss { class MacroActionHttp final : public MacroAction { diff --git a/plugins/http/macro-condition-http.hpp b/plugins/http/macro-condition-http.hpp index be1b042a..e76559ee 100644 --- a/plugins/http/macro-condition-http.hpp +++ b/plugins/http/macro-condition-http.hpp @@ -8,6 +8,10 @@ #include #include +#ifdef DELETE +#undef DELETE +#endif + namespace advss { class MacroConditionHttp : public MacroCondition { diff --git a/plugins/midi/midi-helpers.hpp b/plugins/midi/midi-helpers.hpp index c1f828f5..02ab9b21 100644 --- a/plugins/midi/midi-helpers.hpp +++ b/plugins/midi/midi-helpers.hpp @@ -6,6 +6,10 @@ #include #include +#ifdef WIN32_LEAN_AND_MEAN +#undef WIN32_LEAN_AND_MEAN +#endif + #define LIBREMIDI_HEADER_ONLY 1 #include diff --git a/plugins/mqtt/mqtt-helpers.hpp b/plugins/mqtt/mqtt-helpers.hpp index d9c8e2e6..9b1ea25d 100644 --- a/plugins/mqtt/mqtt-helpers.hpp +++ b/plugins/mqtt/mqtt-helpers.hpp @@ -16,6 +16,10 @@ #include +#ifdef SendMessage +#undef SendMessage +#endif + namespace advss { using MqttMessageBuffer = std::shared_ptr>; diff --git a/plugins/now-playing/CMakeLists.txt b/plugins/now-playing/CMakeLists.txt index 9b117a38..ee908c92 100644 --- a/plugins/now-playing/CMakeLists.txt +++ b/plugins/now-playing/CMakeLists.txt @@ -11,6 +11,9 @@ target_sources(${PROJECT_NAME} PRIVATE macro-condition-now-playing.cpp macro-condition-now-playing.hpp) target_link_libraries(${PROJECT_NAME} PRIVATE windowsapp) +target_compile_definitions( + ${PROJECT_NAME} + PRIVATE _SILENCE_EXPERIMENTAL_COROUTINE_DEPRECATION_WARNINGS) setup_advss_plugin(${PROJECT_NAME}) set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "") diff --git a/plugins/scripting/utils/properties-view.hpp b/plugins/scripting/utils/properties-view.hpp index 614db8d0..fdcc3199 100644 --- a/plugins/scripting/utils/properties-view.hpp +++ b/plugins/scripting/utils/properties-view.hpp @@ -9,6 +9,10 @@ #include #include +#ifdef GetObject +#undef GetObject +#endif + #if LIBOBS_API_VER >= MAKE_SEMANTIC_VERSION(30, 0, 0) class QFormLayout;