mirror of
				https://github.com/Proxmark/proxmark3.git
				synced 2025-10-31 08:26:28 +08:00 
			
		
		
		
	merge linux and windows clients into one directory... will consolidate makefiles shortly
This commit is contained in:
		
							parent
							
								
									e3dfa42772
								
							
						
					
					
						commit
						cd00aa3043
					
				
					 27 changed files with 9 additions and 9 deletions
				
			
		|  | @ -23,7 +23,7 @@ all-static: snooper cli flasher | ||||||
| proxmark3: LDLIBS+=$(QTLDLIBS) | proxmark3: LDLIBS+=$(QTLDLIBS) | ||||||
| proxmark3: proxmark3.o gui.o command.o usb.o $(QTGUI) | 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 | snooper: snooper.o gui.o command.o usb.o guidummy.o | ||||||
| 
 | 
 | ||||||
|  | @ -7,7 +7,7 @@ | ||||||
| #include <errno.h> | #include <errno.h> | ||||||
| 
 | 
 | ||||||
| #include "translate.h" | #include "translate.h" | ||||||
| #include "../winsrc/prox.h" | #include "prox.h" | ||||||
| #include "proxmark3.h" | #include "proxmark3.h" | ||||||
| 
 | 
 | ||||||
| #define HANDLE_ERROR if (error_occured) { \ | #define HANDLE_ERROR if (error_occured) { \ | ||||||
							
								
								
									
										2
									
								
								client/command.c
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										2
									
								
								client/command.c
									
										
									
									
									
										Normal file
									
								
							|  | @ -0,0 +1,2 @@ | ||||||
|  | #include "translate.h" | ||||||
|  | #include "command.cpp" | ||||||
|  | @ -8,7 +8,7 @@ | ||||||
| #include <ctype.h> | #include <ctype.h> | ||||||
| 
 | 
 | ||||||
| #include "translate.h" | #include "translate.h" | ||||||
| #include "../winsrc/prox.h" | #include "prox.h" | ||||||
| #include "proxmark3.h" | #include "proxmark3.h" | ||||||
| 
 | 
 | ||||||
| static DWORD ExpectedAddr; | static DWORD ExpectedAddr; | ||||||
|  | @ -4,7 +4,7 @@ | ||||||
| 
 | 
 | ||||||
| #include "proxgui.h" | #include "proxgui.h" | ||||||
| #include "translate.h" | #include "translate.h" | ||||||
| #include "../winsrc/prox.h" | #include "prox.h" | ||||||
| 
 | 
 | ||||||
| int GraphBuffer[MAX_GRAPH_TRACE_LEN]; | int GraphBuffer[MAX_GRAPH_TRACE_LEN]; | ||||||
| int GraphTraceLen; | int GraphTraceLen; | ||||||
|  | @ -10,7 +10,7 @@ | ||||||
| #include <pthread.h> | #include <pthread.h> | ||||||
| 
 | 
 | ||||||
| #include "translate.h" | #include "translate.h" | ||||||
| #include "../winsrc/prox.h" | #include "prox.h" | ||||||
| #include "proxmark3.h" | #include "proxmark3.h" | ||||||
| #include "proxgui.h" | #include "proxgui.h" | ||||||
| 
 | 
 | ||||||
|  | @ -7,7 +7,7 @@ | ||||||
| #include <errno.h> | #include <errno.h> | ||||||
| 
 | 
 | ||||||
| #include "translate.h" | #include "translate.h" | ||||||
| #include "../winsrc/prox.h" | #include "prox.h" | ||||||
| #include "proxmark3.h" | #include "proxmark3.h" | ||||||
| 
 | 
 | ||||||
| #define HANDLE_ERROR if (error_occured) { \ | #define HANDLE_ERROR if (error_occured) { \ | ||||||
|  | @ -6,7 +6,7 @@ | ||||||
| #include <errno.h> | #include <errno.h> | ||||||
| 
 | 
 | ||||||
| #include "translate.h" | #include "translate.h" | ||||||
| #include "../winsrc/prox.h" | #include "prox.h" | ||||||
| #include "proxmark3.h" | #include "proxmark3.h" | ||||||
| 
 | 
 | ||||||
| usb_dev_handle *devh = NULL; | usb_dev_handle *devh = NULL; | ||||||
							
								
								
									
										0
									
								
								client/windows.h
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										0
									
								
								client/windows.h
									
										
									
									
									
										Normal file
									
								
							|  | @ -1,2 +0,0 @@ | ||||||
| #include "translate.h" |  | ||||||
| #include "../winsrc/command.cpp" |  | ||||||
		Loading…
	
	Add table
		
		Reference in a new issue