Merge branch 'master' of https://github.com/holiman/proxmark3

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 37616e4855180fd7b41e35c8109bafc8769ffd84..77fee4e664733a9b3231320f8af5dd4e32b2b060 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -17,7 +17,6 @@ LDLIBS = -L/opt/local/lib -L/usr/local/lib ../liblua/liblua.a -lreadline -lpthre
 LDFLAGS = $(COMMON_FLAGS)
 CFLAGS = -std=c99 -lcrypto -I. -I../include -I../common -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4 
 LUAPLATFORM = generic
 LDFLAGS = $(COMMON_FLAGS)
 CFLAGS = -std=c99 -lcrypto -I. -I../include -I../common -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4 
 LUAPLATFORM = generic

-

 ifneq (,$(findstring MINGW,$(platform)))
 CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
 QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
 ifneq (,$(findstring MINGW,$(platform)))
 CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
 QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4


@@ -94,6 +93,7 @@ CMDSRCS =     nonce2key/crapto1.c\
                        scripting.c\
                        cmdscript.c\
                        pm3_bitlib.c\
                        scripting.c\
                        cmdscript.c\
                        pm3_bitlib.c\

+                       aes.c\

 
 
 COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
 
 
 COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)