CHG: testing to set 460800 baudrate as default, if it fails, go to 115200 baudrate...

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index dc1ce801fa24b3819c380fe38b384d9f86738c2c..a56fd35bc56944b41e00c589b7604e71bccd14b8 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -19,7 +19,7 @@ LUAPLATFORM = generic
 
 ifneq (,$(findstring MINGW,$(platform))) 
     LDLIBS +=  -L/mingw/lib -lgdi32
 
 ifneq (,$(findstring MINGW,$(platform))) 
     LDLIBS +=  -L/mingw/lib -lgdi32

-       CFLAGS +=  -I/mingw/include
+       CFLAGS +=  -I/mingw/include -D__USE_MINGW_ANSI_STDIO=1

     CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
     MOC = $(QTDIR)/bin/moc
     LUAPLATFORM = mingw
     CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
     MOC = $(QTDIR)/bin/moc
     LUAPLATFORM = mingw


@@ -54,11 +54,11 @@ else ifeq ($(platform),Darwin)
        ifneq (, $(findstring moc 5,$(qtplatform)))
                # use this if you have QT5 installed.
                CFLAGS += -I/usr/include/malloc/ -I/usr/local/opt/readline/include -I/usr/local/opt/qt5/include 
        ifneq (, $(findstring moc 5,$(qtplatform)))
                # use this if you have QT5 installed.
                CFLAGS += -I/usr/include/malloc/ -I/usr/local/opt/readline/include -I/usr/local/opt/qt5/include 

-               LDLIBS = -L/opt/local/lib -L/usr/local/opt/readline/lib -L/usr/local/opt/qt5/lib -lreadline -lpthread -lm
+               LDLIBS = -L/usr/local/opt/readline/lib -L/usr/local/opt/qt5/lib -lreadline -lpthread -lm

        else
                # Assuming you have QT4 installed.
                CFLAGS += -I/usr/include/malloc/ -I/usr/local/opt/readline/include
        else
                # Assuming you have QT4 installed.
                CFLAGS += -I/usr/include/malloc/ -I/usr/local/opt/readline/include

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

        endif
 
     LUAPLATFORM = macosx
        endif
 
     LUAPLATFORM = macosx


@@ -122,6 +122,7 @@ CMDSRCS =   mifarehost.c \
                        cmdhfmfhard.c \
                        cmdhfmfdes.c \
                        cmdhftopaz.c \
                        cmdhfmfhard.c \
                        cmdhfmfdes.c \
                        cmdhftopaz.c \

+                       cmdhfemv.c \

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


@@ -142,6 +143,8 @@ CMDSRCS =   mifarehost.c \
                        cmdlfjablotron.c \
                        cmdlfvisa2000.c \
                        cmdlfnoralsy.c \
                        cmdlfjablotron.c \
                        cmdlfvisa2000.c \
                        cmdlfnoralsy.c \

+                       cmdlffdx.c \
+                       cmdlfcotag.c \

                        pm3_binlib.c \
                        scripting.c \
                        cmdscript.c \
                        pm3_binlib.c \
                        scripting.c \
                        cmdscript.c \