win32: fix yet another vs2005 build type that got broken. add a warning to wifi dialog that it doesnt actually work. fix wpcap.dll detection
This commit is contained in:
parent
9b96d80ecc
commit
210de746fb
|
@ -790,6 +790,14 @@
|
|||
<File
|
||||
RelativePath="..\matrix_sse2-x64.asm"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32"
|
||||
ExcludedFromBuild="true"
|
||||
>
|
||||
<Tool
|
||||
Name="MASM"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
<FileConfiguration
|
||||
Name="Interim|Win32"
|
||||
ExcludedFromBuild="true"
|
||||
|
|
|
@ -1228,8 +1228,8 @@ class WinDriver : public Driver
|
|||
printf("Failed initializing WSAStartup - softAP support disabled\n");
|
||||
return FALSE ;
|
||||
}
|
||||
//require winpcap.dll
|
||||
HMODULE temp = LoadLibrary("winpcap.dll");
|
||||
//require wpcap.dll
|
||||
HMODULE temp = LoadLibrary("wpcap.dll");
|
||||
if(temp == NULL) {
|
||||
printf("Failed initializing winpcap.dll - softAP support disabled\n");
|
||||
return FALSE;
|
||||
|
|
|
@ -412,7 +412,6 @@
|
|||
#define IDC_FRAMELIMIT 40005
|
||||
#define IDC_WINDOW1_5X 40006
|
||||
#define IDM_WIFISETTINGS 40007
|
||||
#define IDM__1 40008
|
||||
#define ID_VIEW_FRAMECOUNTER 40009
|
||||
#define ID_VIEW_DISPLAYFPS 40010
|
||||
#define ID_VIEW_DISPLAYINPUT 40011
|
||||
|
|
|
@ -2518,6 +2518,7 @@ BEGIN
|
|||
GROUPBOX "Network adapter settings", IDC_STATIC, 5, 5, 320, 60
|
||||
LTEXT "Bridge network adapter:", IDC_STATIC, 15, 20, 76, 8, SS_LEFT
|
||||
COMBOBOX IDC_BRIDGEADAPTER, 15, 30, 300, 45, CBS_DROPDOWNLIST | CBS_HASSTRINGS
|
||||
LTEXT "(wifi emulation is not yet complete. this doesn't work.)", IDC_STATIC, 15, 48, 166, 8, SS_LEFT
|
||||
END
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue