projects
/
proxmark3-svn
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge pull request #4 from Proxmark/master
[proxmark3-svn]
/
client
/
Makefile
diff --git
a/client/Makefile
b/client/Makefile
index ffafcbd14044bbe66a2cf65cc496ddeec57ee023..b2b215e177d899f71a40c7f3508073e477d9e8c0 100644
(file)
--- a/
client/Makefile
+++ b/
client/Makefile
@@
-5,6
+5,7
@@
#-----------------------------------------------------------------------------
include ../common/Makefile.common
#-----------------------------------------------------------------------------
include ../common/Makefile.common
+
CC=gcc
CXX=g++
#COMMON_FLAGS = -m32
CC=gcc
CXX=g++
#COMMON_FLAGS = -m32
@@
-12,27
+13,30
@@
CXX=g++
VPATH = ../common
OBJDIR = obj
VPATH = ../common
OBJDIR = obj
-LDLIBS = -L/opt/local/lib -L/usr/local/lib -l
usb -lreadline -lpthread
+LDLIBS = -L/opt/local/lib -L/usr/local/lib -l
readline -lpthread ../liblua/liblua.a
LDFLAGS = $(COMMON_FLAGS)
LDFLAGS = $(COMMON_FLAGS)
-CFLAGS = -std=c99 -I. -I../include -I../common -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS) -g -O4
+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
-MOC = $(QTDIR)/moc
-####################################################
-# Disabled gui for Windows, can someone with more
-# knowledge about QT fix this problem??
-####################################################
-QTLDLIBS=
+MOC = $(QTDIR)/bin/moc
+LUAPLATFORM = mingw
else ifeq ($(platform),Darwin)
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
QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
MOC = $(shell pkg-config --variable=moc_location QtCore)
else
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)
+LDLIBS += -ldl
+
+# 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
+LUAPLATFORM = linux
endif
endif
@@
-44,10
+48,20
@@
else
QTGUI = guidummy.o
endif
QTGUI = guidummy.o
endif
-CMDSRCS = \
- nonce2key/crapto1.c\
- nonce2key/crypto1.c\
- nonce2key/nonce2key.c\
+CORESRCS = uart.c \
+ util.c \
+ sleep.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 \
@@
-55,9
+69,8
@@
CMDSRCS = \
data.c \
graph.c \
ui.c \
data.c \
graph.c \
ui.c \
- uart.c \
- util.c \
cmddata.c \
cmddata.c \
+ lfdemod.c \
cmdhf.c \
cmdhf14a.c \
cmdhf14b.c \
cmdhf.c \
cmdhf14a.c \
cmdhf14b.c \
@@
-68,6
+81,7
@@
CMDSRCS = \
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 \
@@
-75,30
+89,36
@@
CMDSRCS = \
cmdparser.c \
cmdmain.c \
cmdlft55xx.c \
cmdparser.c \
cmdmain.c \
cmdlft55xx.c \
- cmdlfpcf7931.c
+ cmdlfpcf7931.c\
+ pm3_binlib.c\
+ scripting.c\
+ cmdscript.c\
+ pm3_bitlib.c\
+
+COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
RM = rm -f
BINS = proxmark3 flasher #snooper cli
CLEAN = cli cli.exe flasher flasher.exe proxmark3 proxmark3.exe snooper snooper.exe $(CMDOBJS) $(OBJDIR)/*.o *.o *.moc.cpp
CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
RM = rm -f
BINS = proxmark3 flasher #snooper cli
CLEAN = cli cli.exe flasher flasher.exe proxmark3 proxmark3.exe snooper snooper.exe $(CMDOBJS) $(OBJDIR)/*.o *.o *.moc.cpp
-all:
$(BINS)
+all:
lua_build $(BINS)
all-static: LDLIBS:=-static $(LDLIBS)
all-static: snooper cli flasher
proxmark3: LDLIBS+=$(QTLDLIBS)
all-static: LDLIBS:=-static $(LDLIBS)
all-static: snooper cli flasher
proxmark3: LDLIBS+=$(QTLDLIBS)
-proxmark3: $(OBJDIR)/proxmark3.o $(C
MDOBJS) $(OBJDIR)/uart.o
$(QTGUI)
+proxmark3: $(OBJDIR)/proxmark3.o $(C
OREOBJS) $(CMDOBJS)
$(QTGUI)
$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
-snooper: $(OBJDIR)/snooper.o $(C
MDOBJS) $(OBJDIR)/uart.o
$(OBJDIR)/guidummy.o
+snooper: $(OBJDIR)/snooper.o $(C
OREOBJS) $(CMDOBJS)
$(OBJDIR)/guidummy.o
$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
-cli: $(OBJDIR)/cli.o $(C
MDOBJS) $(OBJDIR)/uart.o
$(OBJDIR)/guidummy.o
+cli: $(OBJDIR)/cli.o $(C
OREOBJS) $(CMDOBJS)
$(OBJDIR)/guidummy.o
$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
-flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(
OBJDIR)/uart.o
+flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(
COREOBJS)
$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
$(OBJDIR)/%.o: %.c
$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
$(OBJDIR)/%.o: %.c
@@
-112,6
+132,7
@@
proxguiqt.moc.cpp: proxguiqt.h
clean:
$(RM) $(CLEAN)
clean:
$(RM) $(CLEAN)
+ cd ../liblua && make clean
tarbin: $(BINS)
$(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(BINS:%=client/%)
tarbin: $(BINS)
$(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(BINS:%=client/%)
@@
-127,4
+148,8
@@
install_kext: Info.plist
touch /System/Library/Extensions
@echo "*** You may need to reboot for the kext to take effect."
touch /System/Library/Extensions
@echo "*** You may need to reboot for the kext to take effect."
+lua_build:
+ @echo Compiling liblua, using platform $(LUAPLATFORM)
+ cd ../liblua && make $(LUAPLATFORM)
+
.PHONY: all clean
.PHONY: all clean
Impressum
,
Datenschutz