From b5f687c40298011f89f6a2492dd08cb069359655 Mon Sep 17 00:00:00 2001
From: Adam Honse <calcprogrammer1@gmail.com>
Date: Mon, 2 Sep 2019 17:48:34 -0500
Subject: [PATCH] Get project building on Windows again

---
 OpenAuraSDK.vcxproj         | 23 +++++++++++++++--------
 OpenAuraSDK.vcxproj.filters | 21 +++++++++++++++++++++
 net_port/net_port.h         |  3 +--
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/OpenAuraSDK.vcxproj b/OpenAuraSDK.vcxproj
index 0859c577..950cfe2e 100644
--- a/OpenAuraSDK.vcxproj
+++ b/OpenAuraSDK.vcxproj
@@ -96,9 +96,9 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_AFXDLL</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_AFXDLL;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.\dependencies\inpout32_1501\Win32;.\Controllers\AuraController;.\Controllers\CorsairController;.\Controllers\CorsairProController;.\Controllers\HyperXController;.\Controllers\LEDStripController;.\RGBController;.\i2c_smbus;.\serial_port;.\vc;.\wmi;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\dependencies\inpout32_1501\Win32;.\Controllers\AuraController;.\Controllers\CorsairController;.\Controllers\CorsairProController;.\Controllers\HuePlusController;.\Controllers\HyperXController;.\Controllers\LEDStripController;.\RGBController;.\i2c_smbus;.\net_port;.\serial_port;.\vc;.\wmi;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
@@ -116,11 +116,11 @@
       <WarningLevel>Level3</WarningLevel>
       <Optimization>Disabled</Optimization>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_AFXDLL</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_AFXDLL;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
-      <AdditionalIncludeDirectories>.\dependencies\inpout32_1501\Win32;.\Controllers\AuraController;.\Controllers\CorsairController;.\Controllers\CorsairProController;.\Controllers\HyperXController;.\Controllers\LEDStripController;.\RGBController;.\i2c_smbus;.\serial_port;.\vc;.\wmi;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\dependencies\inpout32_1501\Win32;.\Controllers\AuraController;.\Controllers\CorsairController;.\Controllers\CorsairProController;.\Controllers\HuePlusController;.\Controllers\HyperXController;.\Controllers\LEDStripController;.\RGBController;.\i2c_smbus;.\net_port;.\serial_port;.\vc;.\wmi;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
@@ -138,9 +138,9 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_AFXDLL</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_AFXDLL;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
-      <AdditionalIncludeDirectories>.\dependencies\inpout32_1501\Win32;.\Controllers\AuraController;.\Controllers\CorsairController;.\Controllers\CorsairProController;.\Controllers\HyperXController;.\Controllers\LEDStripController;.\RGBController;.\i2c_smbus;.\serial_port;.\vc;.\wmi;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\dependencies\inpout32_1501\Win32;.\Controllers\AuraController;.\Controllers\CorsairController;.\Controllers\CorsairProController;.\Controllers\HuePlusController;.\Controllers\HyperXController;.\Controllers\LEDStripController;.\RGBController;.\i2c_smbus;.\net_port;.\serial_port;.\vc;.\wmi;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
@@ -162,11 +162,11 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
-      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_AFXDLL</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_CRT_SECURE_NO_WARNINGS;_AFXDLL;_WINSOCK_DEPRECATED_NO_WARNINGS;WIN32_LEAN_AND_MEAN</PreprocessorDefinitions>
       <ConformanceMode>true</ConformanceMode>
       <PrecompiledHeaderFile />
       <PrecompiledHeaderOutputFile />
-      <AdditionalIncludeDirectories>.\dependencies\inpout32_1501\Win32;.\Controllers\AuraController;.\Controllers\CorsairController;.\Controllers\CorsairProController;.\Controllers\HyperXController;.\Controllers\LEDStripController;.\RGBController;.\i2c_smbus;.\serial_port;.\vc;.\wmi;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>.\dependencies\inpout32_1501\Win32;.\Controllers\AuraController;.\Controllers\CorsairController;.\Controllers\CorsairProController;.\Controllers\HuePlusController;.\Controllers\HyperXController;.\Controllers\LEDStripController;.\RGBController;.\i2c_smbus;.\net_port;.\serial_port;.\vc;.\wmi;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
     </ClCompile>
@@ -185,6 +185,8 @@
     <ClCompile Include="Controllers\CorsairController\CorsairControllerDetect.cpp" />
     <ClCompile Include="Controllers\CorsairProController\CorsairProController.cpp" />
     <ClCompile Include="Controllers\CorsairProController\CorsairProControllerDetect.cpp" />
+    <ClCompile Include="Controllers\HuePlusController\HuePlusController.cpp" />
+    <ClCompile Include="Controllers\HuePlusController\HuePlusControllerDetect.cpp" />
     <ClCompile Include="Controllers\HyperXController\HyperXController.cpp" />
     <ClCompile Include="Controllers\HyperXController\HyperXControllerDetect.cpp" />
     <ClCompile Include="Controllers\LEDStripController\LEDStripController.cpp" />
@@ -194,11 +196,13 @@
     <ClCompile Include="i2c_smbus\i2c_smbus_nct6775.cpp" />
     <ClCompile Include="i2c_smbus\i2c_smbus_piix4.cpp" />
     <ClCompile Include="main.cpp" />
+    <ClCompile Include="net_port\net_port.cpp" />
     <ClCompile Include="OpenAuraSDK.cpp" />
     <ClCompile Include="RGBController\RGBController_AorusGPU.cpp" />
     <ClCompile Include="RGBController\RGBController_Aura.cpp" />
     <ClCompile Include="RGBController\RGBController_Corsair.cpp" />
     <ClCompile Include="RGBController\RGBController_CorsairPro.cpp" />
+    <ClCompile Include="RGBController\RGBController_HuePlus.cpp" />
     <ClCompile Include="RGBController\RGBController_HyperX.cpp" />
     <ClCompile Include="RGBController\RGBController_LEDStrip.cpp" />
     <ClCompile Include="serial_port\serial_port.cpp" />
@@ -213,18 +217,21 @@
     <ClInclude Include="Controllers\AuraController\AuraController.h" />
     <ClInclude Include="Controllers\CorsairController\CorsairController.h" />
     <ClInclude Include="Controllers\CorsairProController\CorsairProController.h" />
+    <ClInclude Include="Controllers\HuePlusController\HuePlusController.h" />
     <ClInclude Include="Controllers\HyperXController\HyperXController.h" />
     <ClInclude Include="Controllers\LEDStripController\LEDStripController.h" />
     <ClInclude Include="i2c_smbus\i2c_smbus.h" />
     <ClInclude Include="i2c_smbus\i2c_smbus_i801.h" />
     <ClInclude Include="i2c_smbus\i2c_smbus_nct6775.h" />
     <ClInclude Include="i2c_smbus\i2c_smbus_piix4.h" />
+    <ClInclude Include="net_port\net_port.h" />
     <ClInclude Include="OpenAuraSDK.h" />
     <ClInclude Include="RGBController\RGBController.h" />
     <ClInclude Include="RGBController\RGBController_AorusGPU.h" />
     <ClInclude Include="RGBController\RGBController_Aura.h" />
     <ClInclude Include="RGBController\RGBController_Corsair.h" />
     <ClInclude Include="RGBController\RGBController_CorsairPro.h" />
+    <ClInclude Include="RGBController\RGBController_HuePlus.h" />
     <ClInclude Include="RGBController\RGBController_HyperX.h" />
     <ClInclude Include="RGBController\RGBController_LEDStrip.h" />
     <ClInclude Include="serial_port\serial_port.h" />
diff --git a/OpenAuraSDK.vcxproj.filters b/OpenAuraSDK.vcxproj.filters
index 41abddc3..97a676dd 100644
--- a/OpenAuraSDK.vcxproj.filters
+++ b/OpenAuraSDK.vcxproj.filters
@@ -114,6 +114,18 @@
     <ClCompile Include="vc\OpenAuraSDKDialog.cpp">
       <Filter>Source Files\Application</Filter>
     </ClCompile>
+    <ClCompile Include="Controllers\HuePlusController\HuePlusController.cpp">
+      <Filter>Source Files\Controllers</Filter>
+    </ClCompile>
+    <ClCompile Include="Controllers\HuePlusController\HuePlusControllerDetect.cpp">
+      <Filter>Source Files\Controllers</Filter>
+    </ClCompile>
+    <ClCompile Include="net_port\net_port.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="RGBController\RGBController_HuePlus.cpp">
+      <Filter>Source Files\RGBController</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="vc\Resource.rc">
@@ -187,5 +199,14 @@
     <ClInclude Include="vc\resource.h">
       <Filter>Resource Files</Filter>
     </ClInclude>
+    <ClInclude Include="Controllers\HuePlusController\HuePlusController.h">
+      <Filter>Header Files\Controllers</Filter>
+    </ClInclude>
+    <ClInclude Include="net_port\net_port.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="RGBController\RGBController_HuePlus.h">
+      <Filter>Header Files\RGBController</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/net_port/net_port.h b/net_port/net_port.h
index 8a57dd43..a47b6096 100644
--- a/net_port/net_port.h
+++ b/net_port/net_port.h
@@ -14,8 +14,7 @@
 
 #ifdef WIN32
 #include <winsock2.h>
-#include <winsock.h>
-#include <WS2tcpip.h>
+#include <ws2tcpip.h>
 #else
 #include <unistd.h>
 #include <sys/socket.h>