From cd00aa3043b507ed10bf79a37b83b88741d176d7 Mon Sep 17 00:00:00 2001 From: bushing Date: Tue, 22 Dec 2009 12:11:15 +0000 Subject: [PATCH 1/1] merge linux and windows clients into one directory... will consolidate makefiles shortly --- {linux => client}/Makefile | 2 +- winsrc/Makefile => client/Makefile.win | 0 {linux => client}/cli.c | 2 +- client/command.c | 2 ++ {winsrc => client}/command.cpp | 0 {linux => client}/flasher.c | 2 +- {linux => client}/gui.c | 2 +- {winsrc => client}/gui.cpp | 0 {linux => client}/guidummy.c | 0 {winsrc => client}/include/hidpi.h | 0 {winsrc => client}/include/hidsdi.h | 0 {winsrc => client}/include/hidusage.h | 0 linux/windows.h => client/obj/.dummy | 0 {winsrc => client}/prox.cpp | 0 {winsrc => client}/prox.h | 0 {linux => client}/proxgui.cpp | 0 {linux => client}/proxgui.h | 0 {linux => client}/proxguiqt.cpp | 0 {linux => client}/proxguiqt.h | 0 {linux => client}/proxmark3.c | 2 +- {linux => client}/proxmark3.h | 0 {linux => client}/snooper.c | 2 +- {linux => client}/translate.h | 0 {linux => client}/unbind-proxmark | 0 {linux => client}/usb.c | 2 +- client/windows.h | 0 linux/command.c | 2 -- 27 files changed, 9 insertions(+), 9 deletions(-) rename {linux => client}/Makefile (95%) rename winsrc/Makefile => client/Makefile.win (100%) rename {linux => client}/cli.c (97%) create mode 100644 client/command.c rename {winsrc => client}/command.cpp (100%) rename {linux => client}/flasher.c (99%) rename {linux => client}/gui.c (97%) rename {winsrc => client}/gui.cpp (100%) rename {linux => client}/guidummy.c (100%) rename {winsrc => client}/include/hidpi.h (100%) rename {winsrc => client}/include/hidsdi.h (100%) rename {winsrc => client}/include/hidusage.h (100%) rename linux/windows.h => client/obj/.dummy (100%) rename {winsrc => client}/prox.cpp (100%) rename {winsrc => client}/prox.h (100%) rename {linux => client}/proxgui.cpp (100%) rename {linux => client}/proxgui.h (100%) rename {linux => client}/proxguiqt.cpp (100%) rename {linux => client}/proxguiqt.h (100%) rename {linux => client}/proxmark3.c (98%) rename {linux => client}/proxmark3.h (100%) rename {linux => client}/snooper.c (96%) rename {linux => client}/translate.h (100%) rename {linux => client}/unbind-proxmark (100%) rename {linux => client}/usb.c (99%) create mode 100644 client/windows.h delete mode 100644 linux/command.c diff --git a/linux/Makefile b/client/Makefile similarity index 95% rename from linux/Makefile rename to client/Makefile index 70e7cc7a..113223fb 100644 --- a/linux/Makefile +++ b/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 diff --git a/winsrc/Makefile b/client/Makefile.win similarity index 100% rename from winsrc/Makefile rename to client/Makefile.win diff --git a/linux/cli.c b/client/cli.c similarity index 97% rename from linux/cli.c rename to client/cli.c index e893a727..3e8aab60 100644 --- a/linux/cli.c +++ b/client/cli.c @@ -7,7 +7,7 @@ #include #include "translate.h" -#include "../winsrc/prox.h" +#include "prox.h" #include "proxmark3.h" #define HANDLE_ERROR if (error_occured) { \ diff --git a/client/command.c b/client/command.c new file mode 100644 index 00000000..ceda9a27 --- /dev/null +++ b/client/command.c @@ -0,0 +1,2 @@ +#include "translate.h" +#include "command.cpp" diff --git a/winsrc/command.cpp b/client/command.cpp similarity index 100% rename from winsrc/command.cpp rename to client/command.cpp diff --git a/linux/flasher.c b/client/flasher.c similarity index 99% rename from linux/flasher.c rename to client/flasher.c index 8797becf..e3043fa3 100644 --- a/linux/flasher.c +++ b/client/flasher.c @@ -8,7 +8,7 @@ #include #include "translate.h" -#include "../winsrc/prox.h" +#include "prox.h" #include "proxmark3.h" static DWORD ExpectedAddr; diff --git a/linux/gui.c b/client/gui.c similarity index 97% rename from linux/gui.c rename to client/gui.c index d31c5287..c540f9e8 100644 --- a/linux/gui.c +++ b/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; diff --git a/winsrc/gui.cpp b/client/gui.cpp similarity index 100% rename from winsrc/gui.cpp rename to client/gui.cpp diff --git a/linux/guidummy.c b/client/guidummy.c similarity index 100% rename from linux/guidummy.c rename to client/guidummy.c diff --git a/winsrc/include/hidpi.h b/client/include/hidpi.h similarity index 100% rename from winsrc/include/hidpi.h rename to client/include/hidpi.h diff --git a/winsrc/include/hidsdi.h b/client/include/hidsdi.h similarity index 100% rename from winsrc/include/hidsdi.h rename to client/include/hidsdi.h diff --git a/winsrc/include/hidusage.h b/client/include/hidusage.h similarity index 100% rename from winsrc/include/hidusage.h rename to client/include/hidusage.h diff --git a/linux/windows.h b/client/obj/.dummy similarity index 100% rename from linux/windows.h rename to client/obj/.dummy diff --git a/winsrc/prox.cpp b/client/prox.cpp similarity index 100% rename from winsrc/prox.cpp rename to client/prox.cpp diff --git a/winsrc/prox.h b/client/prox.h similarity index 100% rename from winsrc/prox.h rename to client/prox.h diff --git a/linux/proxgui.cpp b/client/proxgui.cpp similarity index 100% rename from linux/proxgui.cpp rename to client/proxgui.cpp diff --git a/linux/proxgui.h b/client/proxgui.h similarity index 100% rename from linux/proxgui.h rename to client/proxgui.h diff --git a/linux/proxguiqt.cpp b/client/proxguiqt.cpp similarity index 100% rename from linux/proxguiqt.cpp rename to client/proxguiqt.cpp diff --git a/linux/proxguiqt.h b/client/proxguiqt.h similarity index 100% rename from linux/proxguiqt.h rename to client/proxguiqt.h diff --git a/linux/proxmark3.c b/client/proxmark3.c similarity index 98% rename from linux/proxmark3.c rename to client/proxmark3.c index 2839db93..3c3b7927 100644 --- a/linux/proxmark3.c +++ b/client/proxmark3.c @@ -10,7 +10,7 @@ #include #include "translate.h" -#include "../winsrc/prox.h" +#include "prox.h" #include "proxmark3.h" #include "proxgui.h" diff --git a/linux/proxmark3.h b/client/proxmark3.h similarity index 100% rename from linux/proxmark3.h rename to client/proxmark3.h diff --git a/linux/snooper.c b/client/snooper.c similarity index 96% rename from linux/snooper.c rename to client/snooper.c index 63fa406f..9a92e84d 100644 --- a/linux/snooper.c +++ b/client/snooper.c @@ -7,7 +7,7 @@ #include #include "translate.h" -#include "../winsrc/prox.h" +#include "prox.h" #include "proxmark3.h" #define HANDLE_ERROR if (error_occured) { \ diff --git a/linux/translate.h b/client/translate.h similarity index 100% rename from linux/translate.h rename to client/translate.h diff --git a/linux/unbind-proxmark b/client/unbind-proxmark similarity index 100% rename from linux/unbind-proxmark rename to client/unbind-proxmark diff --git a/linux/usb.c b/client/usb.c similarity index 99% rename from linux/usb.c rename to client/usb.c index 4f3b4e7e..c326aeca 100644 --- a/linux/usb.c +++ b/client/usb.c @@ -6,7 +6,7 @@ #include #include "translate.h" -#include "../winsrc/prox.h" +#include "prox.h" #include "proxmark3.h" usb_dev_handle *devh = NULL; diff --git a/client/windows.h b/client/windows.h new file mode 100644 index 00000000..e69de29b diff --git a/linux/command.c b/linux/command.c deleted file mode 100644 index 902045c6..00000000 --- a/linux/command.c +++ /dev/null @@ -1,2 +0,0 @@ -#include "translate.h" -#include "../winsrc/command.cpp" -- 2.39.5