From 902e2226b676def36f41566eb683e3779e50f518 Mon Sep 17 00:00:00 2001
From: oliverschmidt <oliverschmidt>
Date: Wed, 11 Apr 2007 00:33:08 +0000
Subject: [PATCH] Use the cpu/native/net WinPcap driver for platform/win32 as
 well.

---
 platform/win32/vcproj/contiki.exe.vcproj | 42 ++++++++++++++++--------
 1 file changed, 28 insertions(+), 14 deletions(-)

diff --git a/platform/win32/vcproj/contiki.exe.vcproj b/platform/win32/vcproj/contiki.exe.vcproj
index 27cae3a6e..eb3cca0ec 100644
--- a/platform/win32/vcproj/contiki.exe.vcproj
+++ b/platform/win32/vcproj/contiki.exe.vcproj
@@ -40,7 +40,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				BasicRuntimeChecks="3"
 				RuntimeLibrary="3"
@@ -60,6 +60,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib iphlpapi.lib"
 				OutputFile="$(OutDir)\$(ProjectName)"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -116,7 +117,7 @@
 			/>
 			<Tool
 				Name="VCCLCompilerTool"
-				AdditionalIncludeDirectories="..;../../../core;../../../apps/program-handler"
+				AdditionalIncludeDirectories="..;../../../cpu/native;../../../core;../../../apps/program-handler"
 				PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;_CRT_SECURE_NO_DEPRECATE;WITH_LOADER_ARCH"
 				RuntimeLibrary="2"
 				WarningLevel="3"
@@ -135,6 +136,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalDependencies="ws2_32.lib iphlpapi.lib"
 				OutputFile="$(OutDir)\$(ProjectName)"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"
@@ -456,6 +458,30 @@
 				</File>
 			</Filter>
 		</Filter>
+		<Filter
+			Name="cpu"
+			>
+			<Filter
+				Name="net"
+				>
+				<File
+					RelativePath="..\..\..\cpu\native\net\wpcap-service.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\cpu\native\net\wpcap-service.h"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\cpu\native\net\wpcap.c"
+					>
+				</File>
+				<File
+					RelativePath="..\..\..\cpu\native\net\wpcap.h"
+					>
+				</File>
+			</Filter>
+		</Filter>
 		<Filter
 			Name="win32"
 			>
@@ -507,18 +533,6 @@
 					>
 				</File>
 			</Filter>
-			<Filter
-				Name="net"
-				>
-				<File
-					RelativePath="..\net\wpcap-service.c"
-					>
-				</File>
-				<File
-					RelativePath="..\net\wpcap-service.h"
-					>
-				</File>
-			</Filter>
 		</Filter>
 	</Files>
 	<Globals>