github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-08-21 13:53:26 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merged latest trunk changes into scripting-branch

Browse source
This commit is contained in:
martin.holst@gmail.com 2013-09-01 20:00:56 +00:00
commit cda2a4c0a5
18 changed files with 646 additions and 550 deletions
Download patch file Download diff file Expand all files Collapse all files

5
client/Makefile
View file

@ -32,6 +32,8 @@ 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)
# 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
@ -46,7 +48,8 @@ endif
CORESRCS = uart.c \
util.c \
sleep.c \
sleep.c
CMDSRCS = nonce2key/crapto1.c\
nonce2key/crypto1.c\