Add ifdef guard to prevent including dpp stuff

Author: pifopi

SerialPrograms/Source/CommonFramework/Main.cpp

@@ -4,15 +4,15 @@
 #include <QFileInfo>
 //#include <QTextStream>
 #include <QMessageBox>
-#include <Integrations/DppIntegration/DppClient.h>
-#include <Integrations/DiscordSocial/DiscordSocial.h>
 #include "Common/Cpp/Exceptions.h"
 #include "Common/Cpp/ImageResolution.h"
 #include "PersistentSettings.h"
 #include "Tests/CommandLineTests.h"
 #include "ErrorReports/ProgramDumper.h"
 #include "ErrorReports/ErrorReports.h"
 #include "Environment/HardwareValidation.h"
+#include "Integrations/DiscordSocial/DiscordSocial.h"
+#include "Integrations/DppIntegration/DppClient.h"
 #include "Logging/Logger.h"
 #include "Logging/OutputRedirector.h"
 //#include "Tools/StatsDatabase.h"

SerialPrograms/Source/CommonFramework/Notifications/ProgramNotifications.cpp

@@ -5,7 +5,6 @@
  */
 
 #include <QFile>
-#include <Integrations/DppIntegration/DppClient.h>
 #include "Common/Cpp/PrettyPrint.h"
 #include "Common/Cpp/Json/JsonValue.h"
 #include "Common/Cpp/Json/JsonArray.h"
@@ -15,6 +14,7 @@
 #include "CommonFramework/Tools/ProgramEnvironment.h"
 #include "CommonFramework/ProgramStats/StatsTracking.h"
 #include "Integrations/DiscordWebhook.h"
+#include "Integrations/DppIntegration/DppClient.h"
 #include "ProgramNotifications.h"
 
 //#include <iostream>

SerialPrograms/Source/Integrations/DiscordIntegrationSettings.cpp

@@ -10,7 +10,7 @@
 #include "Common/Qt/StringToolsQt.h"
 //#include "CommonFramework/Globals.h"
 //#include "CommonFramework/GlobalSettingsPanel.h"
-#include "DppIntegration/DppClient.h"
+#include "Integrations/DppIntegration/DppClient.h"
 #include "DiscordIntegrationSettings.h"
 
 //#include <iostream>

SerialPrograms/Source/Integrations/DppIntegration/DppClient.cpp

@@ -2,13 +2,13 @@
 
 #include <set>
 #include <dpp/dpp.h>
-#include <Integrations/DppIntegration/DppClient.h>
-#include <Integrations/DppIntegration/DppCommandHandler.h>
 #include "Common/Cpp/Json/JsonArray.h"
 #include "Common/Cpp/Json/JsonObject.h"
 #include "Common/Qt/StringToolsQt.h"
 #include "CommonFramework/GlobalSettingsPanel.h"
 #include "CommonFramework/Notifications/EventNotificationOption.h"
+#include "Integrations/DppIntegration/DppClient.h"
+#include "Integrations/DppIntegration/DppCommandHandler.h"
 
 using namespace dpp;
 namespace PokemonAutomation{

SerialPrograms/Source/Integrations/DppIntegration/DppClient.h

@@ -2,6 +2,7 @@
 #ifndef DPP_CLIENT_H
 #define DPP_CLIENT_H
 
+#ifdef PA_DPP
 #include <atomic>
 #include <dpp/dpp.h>
 #include <Integrations/DppIntegration/DppCommandHandler.h>
@@ -49,3 +50,5 @@ class Client : protected DppCommandHandler::Handler{
 }
 }
 #endif
+
+#endif