CHG: some minor adjustments.

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 3f1d13ed93836fc7f08fff30c65242b0f0328583..72552fd1e00d7d63f38940bab3c3bfbb3205f58d 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
@@ -42,17 +43,25 @@ ifneq (,$(findstring MINGW,$(platform)))
        
 else ifeq ($(platform),Darwin)
 
-       # 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
-       
-       # 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
+       # 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
@@ -73,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 \
@@ -94,6 +102,7 @@ CMDSRCS =    mifarehost.c \
                        crc16.c \
                        crc64.c \
                        iso14443crc.c \
+                       legic_prng.c \
                        iso15693tools.c \
                        data.c \
                        graph.c \
@@ -113,6 +122,7 @@ CMDSRCS =   mifarehost.c \
                        cmdhfmfhard.c \
                        cmdhfmfdes.c \
                        cmdhftopaz.c \
+                       cmdhfemv.c \
                        cmdhw.c \
                        cmdlf.c \
                        cmdlfio.c \
@@ -130,6 +140,11 @@ CMDSRCS =  mifarehost.c \
                        cmdlfpyramid.c \
                        cmdlfguard.c \
                        cmdlfnedap.c \
+                       cmdlfjablotron.c \
+                       cmdlfvisa2000.c \
+                       cmdlfnoralsy.c \
+                       cmdlffdx.c \
+                       cmdlfcotag.c \
                        pm3_binlib.c \
                        scripting.c \
                        cmdscript.c \