CHG: `lf em` - some minor refactoring in 4x50 commands

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 3b5f34f533411e7048325bbd05911c3a9030942f..26ecb962e5d20666c793f51254a79445721f72ad 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -7,7 +7,8 @@ include ../common/Makefile.common
 
 CC = gcc
 CXX = g++
-COMMON_FLAGS =  -std=c99 -O3 -mpopcnt -march=native -g
+COMMON_FLAGS += -std=c99 -O3 -mpopcnt -march=native -g
+
 #VPATH = ../common ../zlib
 OBJDIR = obj
 
@@ -19,7 +20,7 @@ LUAPLATFORM = generic
 
 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
@@ -54,11 +55,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 
-               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
-               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
@@ -81,10 +82,9 @@ else
     QTGUI = guidummy.o
 endif
 
-CORESRCS =     uart.c \
-               util.c \
-               sleep.c
-
+CORESRCS =  uart.c \
+                       util.c \
+                       sleep.c
 
 CMDSRCS =      mifarehost.c \
                        nonce2key/crapto1.c \
@@ -122,6 +122,7 @@ CMDSRCS =   mifarehost.c \
                        cmdhfmfhard.c \
                        cmdhfmfdes.c \
                        cmdhftopaz.c \
+                       cmdhfemv.c \
                        cmdhw.c \
                        cmdlf.c \
                        cmdlfio.c \
@@ -141,6 +142,9 @@ CMDSRCS =   mifarehost.c \
                        cmdlfnedap.c \
                        cmdlfjablotron.c \
                        cmdlfvisa2000.c \
+                       cmdlfnoralsy.c \
+                       cmdlffdx.c \
+                       cmdlfcotag.c \
                        pm3_binlib.c \
                        scripting.c \
                        cmdscript.c \