From 36010df716ca477d7936f0c1fbf9d85d836dbf71 Mon Sep 17 00:00:00 2001
From: Paul Bartell <pbartell@amazon.com>
Date: Tue, 18 Oct 2022 16:56:08 -0700
Subject: [PATCH] Update FreeRTOS+TCP and Kernel include paths

---
 .../WindowSimulator/FreeRTOS+TCP.vcxproj      | 38 +++++++++++-
 .../FreeRTOS+TCP.vcxproj.filters              | 60 +++++++++++++++++++
 .../WindowSimulator/FreeRTOS-Kernel.vcxproj   |  2 +-
 3 files changed, 96 insertions(+), 4 deletions(-)

diff --git a/FreeRTOS-Plus/WindowSimulator/FreeRTOS+TCP.vcxproj b/FreeRTOS-Plus/WindowSimulator/FreeRTOS+TCP.vcxproj
index 8a44a28ceb..702a84d914 100644
--- a/FreeRTOS-Plus/WindowSimulator/FreeRTOS+TCP.vcxproj
+++ b/FreeRTOS-Plus/WindowSimulator/FreeRTOS+TCP.vcxproj
@@ -41,7 +41,7 @@
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
     <PlatformToolset>v142</PlatformToolset>
   </PropertyGroup>
@@ -65,16 +65,24 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <LibraryPath>..\ThirdParty\winpcap\lib\x86;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <LinkIncremental>true</LinkIncremental>
+    <LibraryPath>..\ThirdParty\winpcap\lib\x86;$(LibraryPath)</LibraryPath>
   </PropertyGroup>
   <PropertyGroup>
     <OutDir>build\$(ProjectName)\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>build\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-    <PublicIncludeDirectories>$(ProjectDir)..\Source\FreeRTOS-Plus-TCP\source\portable\NetworkInterface\WinPCap;$(ProjectDir)..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;$(ProjectDir)..\Source\FreeRTOS-Plus-TCP\source\include;$(PublicIncludeDirectories)</PublicIncludeDirectories>
+    <PublicIncludeDirectories>..\Source\FreeRTOS-Plus-TCP\source\portable\NetworkInterface\WinPCap;..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;.;..\Source\FreeRTOS-Plus-TCP\source\include;$(PublicIncludeDirectories)</PublicIncludeDirectories>
     <AllProjectIncludesArePublic>true</AllProjectIncludesArePublic>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ReferencePath>..\ThirdParty\winpcap\lib\x64;$(ReferencePath)</ReferencePath>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ReferencePath>..\ThirdParty\winpcap\lib\x64;$(ReferencePath)</ReferencePath>
+  </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>WIN32;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -106,8 +114,14 @@
   </ItemDefinitionGroup>
   <ItemDefinitionGroup>
     <ClCompile>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;$(ProjectDir)..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include;$(ProjectDir)..\Source\FreeRTOS-Plus-TCP\source\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>$(ProjectDir)..\Source\FreeRTOS-Plus-TCP\source\portable\Compiler\MSVC;$(ProjectDir)..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include;$(ProjectDir)..\Source\FreeRTOS-Plus-TCP\source\include;$(ProjectDir)..\ThirdParty\winpcap\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ClCompile>
+    <Lib>
+      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Packet.lib;wpcap.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Lib>
+    <Lib>
+      <AdditionalDependencies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Packet.lib;wpcap.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_ARP.c" />
@@ -131,6 +145,8 @@
     <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_TCP_WIN.c" />
     <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_Tiny_TCP.c" />
     <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_UDP_IP.c" />
+    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\portable\BufferManagement\BufferAllocation_2.c" />
+    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\portable\NetworkInterface\WinPCap\NetworkInterface.c" />
     <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\tcp_dump_packets.c" />
     <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\tcp_mem_stats.c" />
     <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\tcp_netstat.c" />
@@ -168,6 +184,22 @@
     <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include\tcp_dump_packets.h" />
     <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include\tcp_mem_stats.h" />
     <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\include\tcp_netstat.h" />
+    <ClInclude Include="..\ThirdParty\winpcap\include\bittypes.h" />
+    <ClInclude Include="..\ThirdParty\winpcap\include\ip6_misc.h" />
+    <ClInclude Include="..\ThirdParty\winpcap\include\Packet32.h" />
+    <ClInclude Include="..\ThirdParty\winpcap\include\pcap-bpf.h" />
+    <ClInclude Include="..\ThirdParty\winpcap\include\pcap-namedb.h" />
+    <ClInclude Include="..\ThirdParty\winpcap\include\pcap-stdinc.h" />
+    <ClInclude Include="..\ThirdParty\winpcap\include\pcap.h" />
+    <ClInclude Include="..\ThirdParty\winpcap\include\pcap\bluetooth.h" />
+    <ClInclude Include="..\ThirdParty\winpcap\include\pcap\bpf.h" />
+    <ClInclude Include="..\ThirdParty\winpcap\include\pcap\namedb.h" />
+    <ClInclude Include="..\ThirdParty\winpcap\include\pcap\pcap.h" />
+    <ClInclude Include="..\ThirdParty\winpcap\include\pcap\sll.h" />
+    <ClInclude Include="..\ThirdParty\winpcap\include\pcap\usb.h" />
+    <ClInclude Include="..\ThirdParty\winpcap\include\pcap\vlan.h" />
+    <ClInclude Include="..\ThirdParty\winpcap\include\remote-ext.h" />
+    <ClInclude Include="..\ThirdParty\winpcap\include\Win32-Extensions.h" />
     <ClInclude Include="FreeRTOSIPConfig.h" />
   </ItemGroup>
   <ItemGroup>
diff --git a/FreeRTOS-Plus/WindowSimulator/FreeRTOS+TCP.vcxproj.filters b/FreeRTOS-Plus/WindowSimulator/FreeRTOS+TCP.vcxproj.filters
index ddeb53b13e..fc9436fc8c 100644
--- a/FreeRTOS-Plus/WindowSimulator/FreeRTOS+TCP.vcxproj.filters
+++ b/FreeRTOS-Plus/WindowSimulator/FreeRTOS+TCP.vcxproj.filters
@@ -21,6 +21,12 @@
     <Filter Include="config">
       <UniqueIdentifier>{7f8e5e6c-a484-404a-a27f-4a214aa6c6ef}</UniqueIdentifier>
     </Filter>
+    <Filter Include="winpcap">
+      <UniqueIdentifier>{97a99563-c215-4975-9cb8-c6a29a30f03f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="winpcap\include">
+      <UniqueIdentifier>{7a52d3bf-8fc9-4242-8636-e173ade0aa68}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\FreeRTOS_ICMP.c">
@@ -95,6 +101,12 @@
     <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\tools\tcp_utilities\tcp_netstat.c">
       <Filter>tcp_utilities</Filter>
     </ClCompile>
+    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\portable\NetworkInterface\WinPCap\NetworkInterface.c">
+      <Filter>source</Filter>
+    </ClCompile>
+    <ClCompile Include="..\Source\FreeRTOS-Plus-TCP\source\portable\BufferManagement\BufferAllocation_2.c">
+      <Filter>source</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="..\Source\FreeRTOS-Plus-TCP\source\include\FreeRTOS_Sockets.h">
@@ -196,5 +208,53 @@
     <ClInclude Include="FreeRTOSIPConfig.h">
       <Filter>config</Filter>
     </ClInclude>
+    <ClInclude Include="..\ThirdParty\winpcap\include\pcap\bpf.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ThirdParty\winpcap\include\pcap\sll.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ThirdParty\winpcap\include\pcap\bluetooth.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ThirdParty\winpcap\include\pcap\pcap.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ThirdParty\winpcap\include\pcap\usb.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ThirdParty\winpcap\include\pcap\vlan.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ThirdParty\winpcap\include\pcap\namedb.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ThirdParty\winpcap\include\pcap-bpf.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ThirdParty\winpcap\include\pcap-namedb.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ThirdParty\winpcap\include\remote-ext.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ThirdParty\winpcap\include\bittypes.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ThirdParty\winpcap\include\ip6_misc.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ThirdParty\winpcap\include\pcap.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ThirdParty\winpcap\include\Win32-Extensions.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ThirdParty\winpcap\include\Packet32.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
+    <ClInclude Include="..\ThirdParty\winpcap\include\pcap-stdinc.h">
+      <Filter>winpcap\include</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/FreeRTOS-Plus/WindowSimulator/FreeRTOS-Kernel.vcxproj b/FreeRTOS-Plus/WindowSimulator/FreeRTOS-Kernel.vcxproj
index 6e4fc901c6..7fc0be4fc9 100644
--- a/FreeRTOS-Plus/WindowSimulator/FreeRTOS-Kernel.vcxproj
+++ b/FreeRTOS-Plus/WindowSimulator/FreeRTOS-Kernel.vcxproj
@@ -72,7 +72,7 @@
   <PropertyGroup>
     <OutDir>build\$(ProjectName)\$(Platform)\$(Configuration)\</OutDir>
     <IntDir>build\$(ProjectName)\$(Platform)\$(Configuration)\</IntDir>
-    <PublicIncludeDirectories>$(ProjectDir)..\..\FreeRTOS\Source\portable\MSVC-MingW;$(ProjectDir)..\..\FreeRTOS\Source\include;$(PublicIncludeDirectories)</PublicIncludeDirectories>
+    <PublicIncludeDirectories>..\..\FreeRTOS\Source\portable\MSVC-MingW;..\..\FreeRTOS\Source\include;.\;$(ProjectDir);$(PublicIncludeDirectories)</PublicIncludeDirectories>
     <AllProjectIncludesArePublic>true</AllProjectIncludesArePublic>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">