Merge pull request #119 from marshmellow42/pm3+reveng

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index cab4fddbb229d4852a43768ea5e985f655229a1c..8dd8ddef513ce3657e57bd228ef9e238139cc594 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -12,7 +12,7 @@ CXX=g++
 VPATH = ../common ../zlib
 OBJDIR = obj
 
 VPATH = ../common ../zlib
 OBJDIR = obj
 

-LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm -ltermcap -lncurses
+LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm

 LUALIB = ../liblua/liblua.a
 LDFLAGS = $(COMMON_FLAGS)
 CFLAGS = -std=c99 -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
 LUALIB = ../liblua/liblua.a
 LDFLAGS = $(COMMON_FLAGS)
 CFLAGS = -std=c99 -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4


@@ -37,6 +37,7 @@ else
     CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
     QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
     LUALIB +=  -ldl
     CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
     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
     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


@@ -84,7 +85,7 @@ CMDSRCS =     nonce2key/crapto1.c\
                        cmdhflegic.c \
                        cmdhficlass.c \
                        cmdhfmf.c \
                        cmdhflegic.c \
                        cmdhficlass.c \
                        cmdhfmf.c \

-            cmdhfmfu.c \
+                       cmdhfmfu.c \

                        cmdhftopaz.c \
                        cmdhw.c \
                        cmdlf.c \
                        cmdhftopaz.c \
                        cmdhw.c \
                        cmdlf.c \


@@ -108,6 +109,13 @@ CMDSRCS =  nonce2key/crapto1.c\
                        aes.c\
                        protocols.c\
                        sha1.c\
                        aes.c\
                        protocols.c\
                        sha1.c\

+                       cmdcrc.c\
+                       reveng/reveng.c\
+                       reveng/cli.c\
+                       reveng/bmpbit.c\
+                       reveng/model.c\
+                       reveng/poly.c\
+                       reveng/getopt.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 
 
 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