From: pwpiwi <pwpiwi@users.noreply.github.com>
Date: Fri, 29 May 2015 16:14:36 +0000 (+0200)
Subject: Fix linking under linux. liblua requires libld on linux.
X-Git-Tag: v2.2.0~10^2~1
X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/dc20a1f63970e2ddca978fe98311dcc09180ca56

Fix linking under linux. liblua requires libld on linux.
---

diff --git a/client/Makefile b/client/Makefile
index 7d03b101..f9645194 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -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 $@