CHG: updated the downloaded release from v1.4.0 -> v1.5.0

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 154828a9ed63bb85f1a0b435c1a4bfab5eb0c95a..d4def17e0c20e15c6d805f10b8e64799b217d5df 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -29,7 +29,19 @@ ifneq (,$(findstring MINGW,$(platform)))
     else
         QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
     endif
+
+       # QT version,  4 or 5
+       qtplatform = $(shell $(MOC) -v)
+       ifneq (, $(findstring moc 5,$(qtplatform)))
+          CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui -I$(QTDIR)/include/QtWidgets  -I/mingw/include
+          QTLDLIBS = -L$(QTDIR)/lib  -lQt5Core -lQt5Gui -lQt5Widgets 
+       else
+          CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
+          QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
+       endif
+       
 else ifeq ($(platform),Darwin)
+       LDLIBS = -L/opt/local/lib -lreadline -lpthread -lm
     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)
@@ -44,30 +56,6 @@ else
     LUAPLATFORM = linux
 endif
 
-# QT version,  4 or 5
-qtplatform = $(shell $(MOC) -v)
-ifneq (, $(findstring moc 5,$(qtplatform)))
-   CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui -I$(QTDIR)/include/QtWidgets  -I/mingw/include
-   QTLDLIBS = -L$(QTDIR)/lib  -lQt5Core -lQt5Gui -lQt5Widgets 
-else
-   CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
-   QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
-endif
-
-# easy variable to pass to allow this to build on ubutnu 14.04.2
-ifeq (1,$(UBUNTU_1404_QT4))
-  CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3
-  QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
-  LUALIB = ../liblua/liblua.a
-  LUALIB +=  -ldl
-  MOC = $(shell pkg-config --variable=moc_location QtCore)
-  LUAPLATFORM = linux
-
-  # pop out the libgdi/etc strings
-  LDLIBS = -L/mingw/lib -L/opt/local/lib -L/usr/local/lib -lm -lreadline -lpthread 
-  
-endif
-
 ifneq ($(QTLDLIBS),)
     QTGUI = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
     CFLAGS += -DHAVE_GUI
@@ -122,11 +110,14 @@ CMDSRCS =         nonce2key/crapto1.c\
                        cmdlfem4x.c \
                        cmdlfhitag.c \
                        cmdlfti.c \
-                       cmdlfviking.c\
                        cmdparser.c \
                        cmdmain.c \
                        cmdlft55xx.c \
                        cmdlfpcf7931.c\
+                       cmdlfviking.c\
+                       cmdlfpresco.c\
+                       cmdlfpyramid.c\
+                       cmdlfguard.c\
                        pm3_binlib.c\
                        scripting.c\
                        cmdscript.c\
@@ -136,6 +127,7 @@ CMDSRCS =   nonce2key/crapto1.c\
                        sha1.c\
                        sha256.c\
                        cmdcrc.c\
+                       reveng/preset.c\
                        reveng/reveng.c\
                        reveng/cli.c\
                        reveng/bmpbit.c\
@@ -145,9 +137,7 @@ CMDSRCS =   nonce2key/crapto1.c\
                        tea.c\
                        prng.c\
                        radixsort.c\
-                       bucketsort.c\
-                       cmdlfpresco.c
-
+                       bucketsort.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