Port C++ code

Added the windows headers, as winapi headers only work if included in a certain order; previously, this was enforced by the PCH.
elgatosf · Jun 7, 2020 · 5ea8900 · 5ea8900
1 parent c3ddaa0
commit 5ea8900
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/Sources/MyStreamDeckPlugin.cpp b/Sources/MyStreamDeckPlugin.cpp
@@ -19,7 +19,7 @@
 	#include "Windows/CpuUsageHelper.h"
 #endif
 
-#include "Common/ESDConnectionManager.h"
+#include <StreamDeckSDK/ESDConnectionManager.h>
 
 class CallBackTimer
 {

diff --git a/Sources/MyStreamDeckPlugin.h b/Sources/MyStreamDeckPlugin.h
@@ -10,8 +10,12 @@
 **/
 //==============================================================================
 
-#include "Common/ESDBasePlugin.h"
+#include <StreamDeckSDK/ESDBasePlugin.h>
+
 #include <mutex>
+#include <set>
+
+using json = nlohmann::json;
 
 class CpuUsageHelper;
 class CallBackTimer;

diff --git a/Sources/Windows/CpuUsageHelper.h b/Sources/Windows/CpuUsageHelper.h
@@ -12,7 +12,10 @@
 
 #pragma once
 #pragma comment(lib, "Pdh.lib")
-#include "pdh.h"
+
+#include <winsock2.h>
+#include <windows.h>
+#include <pdh.h>
 
 class CpuUsageHelper
 {

diff --git a/Sources/macOS/CpuUsageHelper.cpp b/Sources/macOS/CpuUsageHelper.cpp
@@ -12,6 +12,8 @@
 
 #include "CpuUsageHelper.h"
 
+#include <cmath>
+
 CpuUsageHelper::CpuUsageHelper() 
 {
 	int mib[2U] = { CTL_HW, HW_NCPU };