FIX: should be defined earlier.

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 05793685f52807726b2e2eaf6220a7c36d2ee9af..3c7a33fdd6c69ddd5da86c0c1a37ff03972fa6d8 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
@@ -41,16 +42,32 @@ ifneq (,$(findstring MINGW,$(platform)))
        endif
        
 else ifeq ($(platform),Darwin)
-       CFLAGS += -I/usr/include/malloc/
-       LDLIBS = -L/opt/local/lib -lreadline -lpthread -lm
-    CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3
+
+       # OS X, QT5 detection needs this.
+       export PKG_CONFIG_PATH=/usr/local/Cellar/qt5/5.6.1-1/lib/pkgconfig/
+
+       CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3
     QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
     MOC = $(shell pkg-config --variable=moc_location QtCore)
+
+       # QT version,  4 or 5
+       qtplatform = $(shell $(MOC) -v)
+       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/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/usr/local/opt/readline/lib -lreadline -lpthread -lm
+       endif
+
     LUAPLATFORM = macosx
 else
     CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3
     QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
     LUALIB +=  -ldl
+    LDLIBS +=  -ltermcap -lncurses
     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
@@ -65,12 +82,12 @@ else
     QTGUI = guidummy.o
 endif
 
-CORESRCS =     uart.c \
-               util.c \
-               sleep.c
+CORESRCS =  uart.c \
+                       util.c \
+                       sleep.c
 
-
-CMDSRCS =      nonce2key/crapto1.c \
+CMDSRCS =      mifarehost.c \
+                       nonce2key/crapto1.c \
                        nonce2key/crypto1.c \
                        nonce2key/nonce2key.c \
                        nonce2key/crypto1_bs.c \
@@ -80,18 +97,20 @@ CMDSRCS =   nonce2key/crapto1.c \
                        loclass/ikeys.c \
                        loclass/elite_crack.c \
                        loclass/fileutils.c \
-                       mifarehost.c \
+                       whereami.c \
                        parity.c \
                        crc.c \
                        crc16.c \
                        crc64.c \
                        iso14443crc.c \
+                       legic_prng.c \
                        iso15693tools.c \
                        data.c \
                        graph.c \
                        ui.c \
                        cmddata.c \
                        lfdemod.c \
+                       cmdanalyse.c \
                        cmdhf.c \
                        cmdhf14a.c \
                        cmdhf14b.c \
@@ -104,6 +123,7 @@ CMDSRCS =   nonce2key/crapto1.c \
                        cmdhfmfhard.c \
                        cmdhfmfdes.c \
                        cmdhftopaz.c \
+                       cmdhfemv.c \
                        cmdhw.c \
                        cmdlf.c \
                        cmdlfio.c \
@@ -121,6 +141,11 @@ CMDSRCS =  nonce2key/crapto1.c \
                        cmdlfpyramid.c \
                        cmdlfguard.c \
                        cmdlfnedap.c \
+                       cmdlfjablotron.c \
+                       cmdlfvisa2000.c \
+                       cmdlfnoralsy.c \
+                       cmdlffdx.c \
+                       cmdlfcotag.c \
                        pm3_binlib.c \
                        scripting.c \
                        cmdscript.c \
@@ -139,8 +164,10 @@ CMDSRCS =  nonce2key/crapto1.c \
                        reveng/getopt.c \
                        tea.c \
                        prng.c \
-                       radixsort.c \
                        bucketsort.c
+#                      radixsort.c \
+
+               
 ZLIBSRCS = deflate.c adler32.c trees.c zutil.c inflate.c inffast.c inftrees.c
 ZLIB_FLAGS = -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED 
 #-DDEBUG -Dverbose=1
@@ -165,8 +192,9 @@ proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUI)
 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
-       $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
+       $(CXX) $(CXXFLAGS) -lpthread  $^ $(LDLIBS) -o $@
 
 flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS)
        $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@