added some keys

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 33e02b3b407f939aab4f7cb306fc989ec676eb3d..27617a5ddc86cf4145365147c3e96b2a4a04b014 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -53,6 +53,20 @@ else
    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 -O4
+  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
@@ -95,15 +109,18 @@ CMDSRCS =  nonce2key/crapto1.c\
                        cmdhficlass.c \
                        cmdhfmf.c \
             cmdhfmfu.c \
+cmdhfmfhard.c \
                        cmdhfmfdes.c \
                        cmdhftopaz.c \
                        cmdhw.c \
                        cmdlf.c \
                        cmdlfio.c \
                        cmdlfhid.c \
+                       cmdlfawid.c \
                        cmdlfem4x.c \
                        cmdlfhitag.c \
                        cmdlfti.c \
+                       cmdlfviking.c\
                        cmdparser.c \
                        cmdmain.c \
                        cmdlft55xx.c \
@@ -115,6 +132,7 @@ CMDSRCS =   nonce2key/crapto1.c\
                        aes.c\
                        protocols.c\
                        sha1.c\
+                       sha256.c\
                        cmdcrc.c\
                        reveng/reveng.c\
                        reveng/cli.c\