Added WinPcap to the library of 3rd party includes and made DEV9ghzdrk use them.

WinPcap version is 4.1.2 and only the /include and /lib folders of their developer pack are included.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@5599 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
ramapcsx2.code 2013-03-20 13:58:00 +00:00
parent 7a00d19b55
commit e32a18dac4
31 changed files with 928 additions and 925 deletions

BIN
3rdparty/winpcap/lib/Packet.lib vendored Normal file

Binary file not shown.

BIN
3rdparty/winpcap/lib/wpcap.lib vendored Normal file

Binary file not shown.

BIN
3rdparty/winpcap/lib/x64/Packet.lib vendored Normal file

Binary file not shown.

BIN
3rdparty/winpcap/lib/x64/wpcap.lib vendored Normal file

Binary file not shown.

3
3rdparty/winpcap/readme.txt vendored Normal file
View File

@ -0,0 +1,3 @@
Winpcap is version 4.1.2 downloaded from
https://www.winpcap.org/install/bin/WpdPack_4_1_2.zip
Just the /include and /lib directories are included to keep the size small.

View File

@ -2,7 +2,7 @@
#include <stdlib.h>
#include <winsock2.h>
#include "DEV9.h"
#include "..\DEV9.h"
#define GetKeyV(name, var, s, t) \
size = s; type = t; \

View File

@ -60,7 +60,7 @@
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
<PrecompiledHeader>
</PrecompiledHeader>
<AdditionalIncludeDirectories>$(ProjectDir)\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SvnRootDir)\common\include;$(SvnRootDir)\3rdparty\winpcap\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -74,14 +74,14 @@
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;wpcap.lib;packet.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(ProjectDir)../pcap/wpcap_32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)3rdparty\winpcap\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<PrecompiledHeader>
</PrecompiledHeader>
<AdditionalIncludeDirectories>$(ProjectDir)\..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SvnRootDir)\common\include;$(SvnRootDir)\3rdparty\winpcap\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<ResourceCompile>
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@ -93,7 +93,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
<AdditionalLibraryDirectories>$(ProjectDir)../pcap/wpcap_32;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)3rdparty\winpcap\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalDependencies>ws2_32.lib;iphlpapi.lib;wpcap.lib;packet.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>

View File

@ -5,7 +5,7 @@
#include "Config.h"
#include "resource.h"
#include "DEV9.h"
#include "..\DEV9.h"
#include "pcap.h"
#include "pcap_io.h"
#include "net.h"

View File

@ -1,5 +1,5 @@
#include "net.h"
#include "Dev9.h"
#include "..\Dev9.h"
//mtfifo<NetPacket*> rx_fifo;
//mtfifo<NetPacket*> tx_fifo;

View File

@ -1,5 +1,5 @@
#pragma once
#include "dev9.h"
#include "..\dev9.h"
u8 CALLBACK smap_read8(u32 addr);
u16 CALLBACK smap_read16(u32 addr);

View File

@ -29,7 +29,7 @@
#include <stdio.h>
#include <windows.h>
#include "tap.h"
#include "dev9.h"
#include "..\dev9.h"
#include <string>
//=============