warn

lib/pch.hpp

@@ -38,11 +38,3 @@
 #include <thread>
 #include <unordered_map>
 #include <vector>
-
-// ARM64 libobs pulls in windows.h, whose macros collide with our identifiers
-#ifdef _WIN32
-#undef DELETE
-#undef DispatchMessage
-#undef SendMessage
-#undef GetObject
-#endif

lib/utils/message-dispatcher.hpp

@@ -5,6 +5,10 @@
 #include <memory>
 #include <vector>
 
+#ifdef DispatchMessage
+#undef DispatchMessage
+#endif
+
 namespace advss {
 
 template<class T> class MessageDispatcher {

plugins/http/macro-action-http.hpp

@@ -9,6 +9,10 @@
 #include <QComboBox>
 #include <QCheckBox>
 
+#ifdef DELETE
+#undef DELETE
+#endif
+
 namespace advss {
 
 class MacroActionHttp final : public MacroAction {

plugins/http/macro-condition-http.hpp

@@ -8,6 +8,10 @@
 #include <QCheckBox>
 #include <QComboBox>
 
+#ifdef DELETE
+#undef DELETE
+#endif
+
 namespace advss {
 
 class MacroConditionHttp : public MacroCondition {

plugins/midi/midi-helpers.hpp

@@ -6,6 +6,10 @@
 #include <variable-spinbox.hpp>
 #include <variable-string.hpp>
 
+#ifdef WIN32_LEAN_AND_MEAN
+#undef WIN32_LEAN_AND_MEAN
+#endif
+
 #define LIBREMIDI_HEADER_ONLY 1
 #include <libremidi/libremidi.hpp>
 

plugins/mqtt/mqtt-helpers.hpp

@@ -16,6 +16,10 @@
 
 #include <mqtt/async_client.h>
 
+#ifdef SendMessage
+#undef SendMessage
+#endif
+
 namespace advss {
 
 using MqttMessageBuffer = std::shared_ptr<MessageBuffer<std::string>>;

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 "")

plugins/scripting/utils/properties-view.hpp

@@ -9,6 +9,10 @@
 #include <QScrollArea>
 #include <QPlainTextEdit>
 
+#ifdef GetObject
+#undef GetObject
+#endif
+
 #if LIBOBS_API_VER >= MAKE_SEMANTIC_VERSION(30, 0, 0)
 
 class QFormLayout;