From 8910583330b6c015aa46158d330f6a3d309b2995 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.sf.net>
Date: Thu, 26 Mar 2009 23:00:40 +0000
Subject: [PATCH] more graceful wifi compiling in vs2005

---
 desmume/src/windows/DeSmuME_2005.vcproj |  4 ++--
 desmume/src/windows/main.cpp            | 15 ++++-----------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/desmume/src/windows/DeSmuME_2005.vcproj b/desmume/src/windows/DeSmuME_2005.vcproj
index 3f832d0ea..4f5fad8f8 100644
--- a/desmume/src/windows/DeSmuME_2005.vcproj
+++ b/desmume/src/windows/DeSmuME_2005.vcproj
@@ -228,7 +228,7 @@
 				OmitFramePointers="true"
 				EnableFiberSafeOptimizations="true"
 				WholeProgramOptimization="true"
-				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib;.\gdiplus"
+				AdditionalIncludeDirectories=".;..;.\zlib123;.\zziplib;.\gdiplus;.\winpcap"
 				PreprocessorDefinitions="_CRT_SECURE_NO_DEPRECATE;WIN32;HAVE_LIBZ;HAVE_LIBZZIP;SSE2;BETA_VERSION;SPU_INTERPOLATE;NOMINMAX;NDEBUG"
 				StringPooling="true"
 				ExceptionHandling="1"
@@ -254,7 +254,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="gdiplus\gdiplus.lib gdiplus.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2005-x32.lib zziplib-2005-x32.lib shlwapi.lib"
+				AdditionalDependencies="gdiplus\gdiplus.lib gdiplus.lib vfw32.lib winmm.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2005-x32.lib zziplib-2005-x32.lib shlwapi.lib winpcap\wpcap.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_sse2.exe"
 				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
 				GenerateDebugInformation="true"
diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp
index da5cd50f9..4b9432a55 100644
--- a/desmume/src/windows/main.cpp
+++ b/desmume/src/windows/main.cpp
@@ -34,7 +34,9 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #include <vector>
 #include <sstream>
 #include <tchar.h>
+#ifdef EXPERIMENTAL_WIFI
 #include <pcap.h>
+#endif
 #include "CWindow.h"
 #include "../MMU.h"
 #include "../armcpu.h"
@@ -1208,16 +1210,6 @@ int WINAPI WinMain (HINSTANCE hThisInstance,
 					int nFunsterStil)
 
 {
-	 pcap_if_t *alldevs;
-    pcap_if_t *d;
-    int i = 0;
-    char errbuf[PCAP_ERRBUF_SIZE];
-
-	if ( pcap_findalldevs(&alldevs, errbuf) == -1 )
-	{
-		printf("fail initializing pcap\n");
-	}
-
 	ULONG_PTR GdiplusToken;
 	GdiplusStartupInput GdiplusSI;
 
@@ -3202,6 +3194,7 @@ LRESULT CALLBACK EmulationSettingsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, L
 
 LRESULT CALLBACK WifiSettingsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
+	#ifdef EXPERIMENTAL_WIFI
 	switch(uMsg)
 	{
 	case WM_INITDIALOG:
@@ -3264,7 +3257,7 @@ LRESULT CALLBACK WifiSettingsDlgProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM
 		}
 		return TRUE;
 	}
-	
+#endif
 	return FALSE;
 }