Attempt at getting the windows client to at least compile without bombing out with errors, may not be fully usable, e.g. plot window doesn't come up, etc

client/Makefile

@@ -12,8 +12,8 @@ CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall
 QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
 
 CMDSRCS = \
-			crc16.c \
-			iso14443crc.c \
+			$(VPATH)\crc16.c \
+			$(VPATH)\iso14443crc.c \
 			data.c \
 			graph.c \
 			ui.c \

client/cmdlf.c

@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <limits.h>
 #include "proxusb.h"
 #include "data.h"
 #include "graph.h"

client/cmdmain.c

@@ -2,6 +2,9 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <string.h>
+#ifdef WIN32
+#include <windows.h>
+#endif
 #include "cmdparser.h"
 #include "data.h"
 #include "usb_cmd.h"
@@ -11,6 +14,7 @@
 #include "cmdhw.h"
 #include "cmdlf.h"
 #include "cmdmain.h"
+#include "proxusb.h"
 
 unsigned int current_command = CMD_UNKNOWN;
 unsigned int received_command = CMD_UNKNOWN;

client/cmdparser.h

@@ -16,4 +16,4 @@ void CmdsHelp(const command_t Commands[]);
 // Parse a command line
 void CmdsParse(const command_t Commands[], const char *Cmd);
 
-#endif
+#endif

client/flash.c

@@ -7,15 +7,18 @@ BOOL UsbConnect(void);
 #include <proxusb.h>
 #endif
 
+#include <usb_cmd.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <stdint.h>
 #include "flash.h"
 #include "elf.h"
+#include "proxusb.h"
 
 static uint32_t ExpectedAddr;
 static uint8_t QueuedToSend[256];
-static bool AllWritten;
+static BOOL AllWritten;
 #define PHYSICAL_FLASH_START 0x100000
 #define PHYSICAL_FLASH_END   0x200000
 

client/prox.c

@@ -3,14 +3,16 @@
 #include <stdio.h>
 #include <ctype.h>
 #include <stdlib.h>
+#include <stdint.h>
 //extern "C" {
 #include "include/hidusage.h"
 #include "include/hidpi.h"
 #include "include/hidsdi.h"
 //}
 
-#include "prox.h"
+#include "ui.h"
 #include "flash.h"
+#include "proxusb.h"
 
 #define OUR_VID 0x9ac4
 #define OUR_PID 0x4b8f

client/proxusb.h

@@ -10,7 +10,7 @@ typedef WORD uint16_t;
 #include <stdint.h>
 #include <stdbool.h>
 #endif
-#include <usb.h>
+#include "usb.h"
 #include "usb_cmd.h"
 
 extern unsigned char return_on_error;

client/wingui.c

@@ -10,8 +10,10 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <math.h>
-
-#include "prox.h"
+#include "graph.h"
+#include "proxusb.h"
+#include "cmdmain.h"
+#include "ui.h"
 
 #define oops() do { \
 	char line[100]; \