]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/Makefile
Fix two errors in writeraw (14a)-script that were found by jonor
[proxmark3-svn] / client / Makefile
index 0ce069757fbf067edcb5abbd64034e323d52732f..00da26a9a33a37249e20960ae4c816217ce81ae2 100644 (file)
@@ -13,7 +13,7 @@ CXX=g++
 VPATH = ../common
 OBJDIR = obj
 
-LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread ../liblua/liblua.a
+LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread ../liblua/liblua.a -ldl
 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 
 LUAPLATFORM = generic
@@ -27,10 +27,15 @@ 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 
+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)
+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
 
@@ -45,7 +50,8 @@ endif
 
 CORESRCS =     uart.c \
                util.c \
-               sleep.c \
+               sleep.c
+
 
 CMDSRCS =      nonce2key/crapto1.c\
                nonce2key/crypto1.c\
@@ -118,6 +124,7 @@ proxguiqt.moc.cpp: proxguiqt.h
 
 clean:
        $(RM) $(CLEAN)
+       cd ../liblua && make clean
 
 tarbin: $(BINS)
        $(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(BINS:%=client/%)
Impressum, Datenschutz