syntax sugar

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 7da69d73b7e7323295c47c9e1905fe24a840d2af..3c7a33fdd6c69ddd5da86c0c1a37ff03972fa6d8 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -7,7 +7,8 @@ include ../common/Makefile.common
 
 CC = gcc
 CXX = g++
 
 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
 
 #VPATH = ../common ../zlib
 OBJDIR = obj
 


@@ -19,7 +20,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


@@ -81,10 +82,9 @@ else
     QTGUI = guidummy.o
 endif
 
     QTGUI = guidummy.o
 endif
 

-CORESRCS =     uart.c \
-               util.c \
-               sleep.c
-
+CORESRCS =  uart.c \
+                       util.c \
+                       sleep.c

 
 CMDSRCS =      mifarehost.c \
                        nonce2key/crapto1.c \
 
 CMDSRCS =      mifarehost.c \
                        nonce2key/crapto1.c \


@@ -97,6 +97,7 @@ CMDSRCS =     mifarehost.c \
                        loclass/ikeys.c \
                        loclass/elite_crack.c \
                        loclass/fileutils.c \
                        loclass/ikeys.c \
                        loclass/elite_crack.c \
                        loclass/fileutils.c \

+                       whereami.c \

                        parity.c \
                        crc.c \
                        crc16.c \
                        parity.c \
                        crc.c \
                        crc16.c \


@@ -122,6 +123,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 \


@@ -143,6 +145,7 @@ CMDSRCS =   mifarehost.c \
                        cmdlfvisa2000.c \
                        cmdlfnoralsy.c \
                        cmdlffdx.c \
                        cmdlfvisa2000.c \
                        cmdlfnoralsy.c \
                        cmdlffdx.c \

+                       cmdlfcotag.c \

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


@@ -189,8 +192,9 @@ proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUI)
 snooper: $(OBJDIR)/snooper.o $(COREOBJS) $(CMDOBJS) $(OBJDIR)/guidummy.o
        $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
 
 snooper: $(OBJDIR)/snooper.o $(COREOBJS) $(CMDOBJS) $(OBJDIR)/guidummy.o
        $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
 

+cli: LDLIBS+=$(LUALIB)

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

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

 
 flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS)
        $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
 
 flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS)
        $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@