merge linux and windows clients into one directory... will consolidate makefiles shortly

client/Makefile

@@ -23,7 +23,7 @@ all-static: snooper cli flasher
 proxmark3: LDLIBS+=$(QTLDLIBS)
 proxmark3: proxmark3.o gui.o command.o usb.o $(QTGUI)
 
-command.o: ../winsrc/command.cpp translate.h
+command.o: command.cpp translate.h
 
 snooper: snooper.o gui.o command.o usb.o guidummy.o
 

client/cli.c

@@ -7,7 +7,7 @@
 #include <errno.h>
 
 #include "translate.h"
-#include "../winsrc/prox.h"
+#include "prox.h"
 #include "proxmark3.h"
 
 #define HANDLE_ERROR if (error_occured) { \

client/command.c

@@ -0,0 +1,2 @@
+#include "translate.h"
+#include "command.cpp"

client/flasher.c

@@ -8,7 +8,7 @@
 #include <ctype.h>
 
 #include "translate.h"
-#include "../winsrc/prox.h"
+#include "prox.h"
 #include "proxmark3.h"
 
 static DWORD ExpectedAddr;

client/gui.c

@@ -4,7 +4,7 @@
 
 #include "proxgui.h"
 #include "translate.h"
-#include "../winsrc/prox.h"
+#include "prox.h"
 
 int GraphBuffer[MAX_GRAPH_TRACE_LEN];
 int GraphTraceLen;

client/proxmark3.c

@@ -10,7 +10,7 @@
 #include <pthread.h>
 
 #include "translate.h"
-#include "../winsrc/prox.h"
+#include "prox.h"
 #include "proxmark3.h"
 #include "proxgui.h"
 

client/snooper.c

@@ -7,7 +7,7 @@
 #include <errno.h>
 
 #include "translate.h"
-#include "../winsrc/prox.h"
+#include "prox.h"
 #include "proxmark3.h"
 
 #define HANDLE_ERROR if (error_occured) { \

client/usb.c

@@ -6,7 +6,7 @@
 #include <errno.h>
 
 #include "translate.h"
-#include "../winsrc/prox.h"
+#include "prox.h"
 #include "proxmark3.h"
 
 usb_dev_handle *devh = NULL;

linux/command.c

@@ -1,2 +0,0 @@
-#include "translate.h"
-#include "../winsrc/command.cpp"