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

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 00da26a9a33a37249e20960ae4c816217ce81ae2..523a1ad117c8fbf977ac0ee6c5ff9015600dc268 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -13,9 +13,9 @@ CXX=g++
 VPATH = ../common
 OBJDIR = obj
 
 VPATH = ../common
 OBJDIR = obj
 

-LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread ../liblua/liblua.a -ldl
+LDLIBS = -L/opt/local/lib -L/usr/local/lib ../liblua/liblua.a -lreadline -lpthread -lm

 LDFLAGS = $(COMMON_FLAGS)
 LDFLAGS = $(COMMON_FLAGS)

-CFLAGS = -std=c99 -I. -I../include -I../common -I/opt/local/include -I../liblua -Wall -Wno-unused-function $(COMMON_FLAGS) -g -O4 
+CFLAGS = -std=c99 -I. -I../include -I../common -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4 

 LUAPLATFORM = generic
 
 ifneq (,$(findstring MINGW,$(platform)))
 LUAPLATFORM = generic
 
 ifneq (,$(findstring MINGW,$(platform)))


@@ -24,9 +24,9 @@ QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
 MOC = $(QTDIR)/bin/moc
 LUAPLATFORM = mingw
 else ifeq ($(platform),Darwin)
 MOC = $(QTDIR)/bin/moc
 LUAPLATFORM = mingw
 else ifeq ($(platform),Darwin)

-CXXFLAGS = -I/Library/Frameworks/QtGui.framework/Versions/Current/Headers -I/Library/Frameworks/QtCore.framework/Versions/Current/Headers
-QTLDLIBS = -framework QtGui -framework QtCore
-MOC = moc 
+CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
+QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
+MOC = $(shell pkg-config --variable=moc_location QtCore)

 LUAPLATFORM = macosx
 else
 CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
 LUAPLATFORM = macosx
 else
 CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4


@@ -56,6 +56,12 @@ CORESRCS =   uart.c \
 CMDSRCS =      nonce2key/crapto1.c\
                nonce2key/crypto1.c\
                nonce2key/nonce2key.c\
 CMDSRCS =      nonce2key/crapto1.c\
                nonce2key/crypto1.c\
                nonce2key/nonce2key.c\

+               loclass/cipher.c \
+               loclass/cipherutils.c \
+               loclass/des.c \
+               loclass/ikeys.c \
+               loclass/elite_crack.c\
+               loclass/fileutils.c\

                        mifarehost.c\
                        crc16.c \
                        iso14443crc.c \
                        mifarehost.c\
                        crc16.c \
                        iso14443crc.c \


@@ -64,6 +70,7 @@ CMDSRCS =     nonce2key/crapto1.c\
                        graph.c \
                        ui.c \
                        cmddata.c \
                        graph.c \
                        ui.c \
                        cmddata.c \

+                       lfdemod.c \

                        cmdhf.c \
                        cmdhf14a.c \
                        cmdhf14b.c \
                        cmdhf.c \
                        cmdhf14a.c \
                        cmdhf14b.c \


@@ -74,6 +81,7 @@ CMDSRCS =     nonce2key/crapto1.c\
                        cmdhfmf.c \
                        cmdhw.c \
                        cmdlf.c \
                        cmdhfmf.c \
                        cmdhw.c \
                        cmdlf.c \

+                       cmdlfio.c \

                        cmdlfhid.c \
                        cmdlfem4x.c \
                        cmdlfhitag.c \
                        cmdlfhid.c \
                        cmdlfem4x.c \
                        cmdlfhitag.c \


@@ -85,7 +93,8 @@ CMDSRCS =     nonce2key/crapto1.c\
                        pm3_binlib.c\
                        scripting.c\
                        cmdscript.c\
                        pm3_binlib.c\
                        scripting.c\
                        cmdscript.c\

-
+                       pm3_bitlib.c\
+                       aes.c\

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