fixed CMD_HID_SIM_TAG

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 597f562eef6910c1e76219c18b8718524aff6225..d314427c7dbcd788a7fc7754d9dec2f10c88c750 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -14,7 +14,7 @@ OBJDIR = obj
 
 LDLIBS = -L/opt/local/lib -L/usr/local/lib -lusb -lreadline -lpthread
 LDFLAGS = $(COMMON_FLAGS)
 
 LDLIBS = -L/opt/local/lib -L/usr/local/lib -lusb -lreadline -lpthread
 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
 
 ifneq (,$(findstring MINGW,$(platform)))
 CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui


@@ -25,7 +25,7 @@ CXXFLAGS = -I/Library/Frameworks/QtGui.framework/Versions/Current/Headers -I/Lib
 QTLDLIBS = -framework QtGui -framework QtCore
 MOC = moc 
 else
 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)
 endif
 QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
 MOC = $(shell pkg-config --variable=moc_location QtCore)
 endif


@@ -50,6 +50,7 @@ CMDSRCS = \
                        data.c \
                        graph.c \
                        ui.c \
                        data.c \
                        graph.c \
                        ui.c \

+                       uart.c \

                        util.c \
                        cmddata.c \
                        cmdhf.c \
                        util.c \
                        cmddata.c \
                        cmdhf.c \


@@ -62,18 +63,19 @@ CMDSRCS = \
                        cmdhfmf.c \
                        cmdhw.c \
                        cmdlf.c \
                        cmdhfmf.c \
                        cmdhw.c \
                        cmdlf.c \

-                       cmdlfem4x.c \

                        cmdlfhid.c \
                        cmdlfhid.c \

+                       cmdlfem4x.c \

                        cmdlfhitag.c \
                        cmdlfti.c \
                        cmdparser.c \
                        cmdmain.c \
                        cmdlfhitag.c \
                        cmdlfti.c \
                        cmdparser.c \
                        cmdmain.c \

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

 
 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)


@@ -82,16 +84,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 $(CMDOBJS) $(OBJDIR)/uart.o $(QTGUI)

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

-snooper: $(OBJDIR)/snooper.o $(CMDOBJS) $(OBJDIR)/proxusb.o $(OBJDIR)/guidummy.o
+snooper: $(OBJDIR)/snooper.o $(CMDOBJS) $(OBJDIR)/uart.o $(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 $(CMDOBJS) $(OBJDIR)/uart.o $(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 $(OBJDIR)/uart.o

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