github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-30 19:40:09 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix linking under linux. liblua requires libld on linux.

Browse source
This commit is contained in:
pwpiwi 2015-05-29 18:14:36 +02:00
parent fbd0526b34
commit dc20a1f639
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/Makefile
View file

@ -36,8 +36,8 @@ else ifeq ($(platform),Darwin)
else
CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
LUALIB += -ldl
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
@ -121,7 +121,7 @@ all: lua_build $(BINS)
all-static: LDLIBS:=-static $(LDLIBS)
all-static: snooper cli flasher fpga_compress
proxmark3: LDLIBS+=$(QTLDLIBS) $(LUALIB)
proxmark3: LDLIBS+=$(LUALIB) $(QTLDLIBS)
proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUI)
$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@