Patch by jonor, fixes so uart_receive does not block when data is continuosly receive...

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 0d323424d48273301b68f36418aae09cad160b8a..ff701a9f637f5b609e1c32a3298e8cb0630fe561 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -12,22 +12,24 @@ CXX=g++
 VPATH = ../common
 OBJDIR = obj
 
 VPATH = ../common
 OBJDIR = obj
 

-LDLIBS = -L/opt/local/lib -L/usr/local/lib -lusb -lreadline -lpthread
+LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread

 LDFLAGS = $(COMMON_FLAGS)
 LDFLAGS = $(COMMON_FLAGS)

-CFLAGS = -std=gnu99 -I. -I../include -I../common -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS) -g -O3
+CFLAGS = -std=c99 -I. -I../include -I../common -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS) -g -O4

 
 ifneq (,$(findstring MINGW,$(platform)))
 CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
 QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
 
 ifneq (,$(findstring MINGW,$(platform)))
 CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
 QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4

-MOC = moc
+MOC = $(QTDIR)/bin/moc

 else ifeq ($(platform),Darwin)
 CXXFLAGS = -I/Library/Frameworks/QtGui.framework/Versions/Current/Headers -I/Library/Frameworks/QtCore.framework/Versions/Current/Headers
 QTLDLIBS = -framework QtGui -framework QtCore
 MOC = moc 
 else
 else ifeq ($(platform),Darwin)
 CXXFLAGS = -I/Library/Frameworks/QtGui.framework/Versions/Current/Headers -I/Library/Frameworks/QtCore.framework/Versions/Current/Headers
 QTLDLIBS = -framework QtGui -framework QtCore
 MOC = moc 
 else

-CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3
+CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4

 QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
 MOC = $(shell pkg-config --variable=moc_location QtCore)
 QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
 MOC = $(shell pkg-config --variable=moc_location QtCore)

+# Below is a variant you can use if you have problems compiling with QT5 on ubuntu. see http://www.proxmark.org/forum/viewtopic.php?id=1661 for more info. 
+#MOC = /usr/lib/x86_64-linux-gnu/qt4/bin/moc

 endif
 
 
 endif
 
 


@@ -39,31 +41,46 @@ else
 QTGUI = guidummy.o
 endif
 
 QTGUI = guidummy.o
 endif
 

-CMDSRCS = \
+CORESRCS =     uart.c \
+               util.c \
+               sleep.c
+
+
+CMDSRCS =      nonce2key/crapto1.c\
+               nonce2key/crypto1.c\
+               nonce2key/nonce2key.c\
+                       mifarehost.c\

                        crc16.c \
                        iso14443crc.c \
                        crc16.c \
                        iso14443crc.c \

+                       iso15693tools.c \

                        data.c \
                        graph.c \
                        ui.c \
                        data.c \
                        graph.c \
                        ui.c \

-                       util.c \

                        cmddata.c \
                        cmdhf.c \
                        cmdhf14a.c \
                        cmdhf14b.c \
                        cmdhf15.c \
                        cmddata.c \
                        cmdhf.c \
                        cmdhf14a.c \
                        cmdhf14b.c \
                        cmdhf15.c \

+                       cmdhfepa.c \

                        cmdhflegic.c \
                        cmdhflegic.c \

+                       cmdhficlass.c \
+                       cmdhfmf.c \

                        cmdhw.c \
                        cmdlf.c \
                        cmdhw.c \
                        cmdlf.c \

-                       cmdlfem4x.c \

                        cmdlfhid.c \
                        cmdlfhid.c \

+                       cmdlfem4x.c \
+                       cmdlfhitag.c \

                        cmdlfti.c \
                        cmdparser.c \
                        cmdlfti.c \
                        cmdparser.c \

-                       cmdmain.c
+                       cmdmain.c \
+                       cmdlft55xx.c \
+                       cmdlfpcf7931.c

 
 

+COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)

 CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
 
 RM = rm -f
 CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
 
 RM = rm -f

-BINS = proxmark3 snooper cli flasher
+BINS = proxmark3 flasher #snooper cli

 CLEAN = cli cli.exe flasher flasher.exe proxmark3 proxmark3.exe snooper snooper.exe $(CMDOBJS) $(OBJDIR)/*.o *.o *.moc.cpp
 
 all: $(BINS)
 CLEAN = cli cli.exe flasher flasher.exe proxmark3 proxmark3.exe snooper snooper.exe $(CMDOBJS) $(OBJDIR)/*.o *.o *.moc.cpp
 
 all: $(BINS)


@@ -72,16 +89,16 @@ all-static: LDLIBS:=-static $(LDLIBS)
 all-static: snooper cli flasher
        
 proxmark3: LDLIBS+=$(QTLDLIBS)
 all-static: snooper cli flasher
        
 proxmark3: LDLIBS+=$(QTLDLIBS)

-proxmark3: $(OBJDIR)/proxmark3.o $(CMDOBJS) $(OBJDIR)/proxusb.o $(QTGUI)
+proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUI)

        $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
 
        $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
 

-snooper: $(OBJDIR)/snooper.o $(CMDOBJS) $(OBJDIR)/proxusb.o $(OBJDIR)/guidummy.o
+snooper: $(OBJDIR)/snooper.o $(COREOBJS) $(CMDOBJS) $(OBJDIR)/guidummy.o

        $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
 
        $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
 

-cli: $(OBJDIR)/cli.o $(CMDOBJS) $(OBJDIR)/proxusb.o $(OBJDIR)/guidummy.o
+cli: $(OBJDIR)/cli.o $(COREOBJS) $(CMDOBJS) $(OBJDIR)/guidummy.o

        $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
 
        $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
 

-flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(OBJDIR)/proxusb.o
+flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS)

        $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
 
 $(OBJDIR)/%.o: %.c
        $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
 
 $(OBJDIR)/%.o: %.c