Removed the -ldl switch from r763, so it only is added for Linux (it apparently cause...

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 5b6f4e836887748406e1c5854418c137b75b9a76..00da26a9a33a37249e20960ae4c816217ce81ae2 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -13,22 +13,30 @@ CXX=g++
 VPATH = ../common
 OBJDIR = obj
 
 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 
 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

 
 ifneq (,$(findstring MINGW,$(platform)))
 CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
 QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
 MOC = $(QTDIR)/bin/moc
 
 ifneq (,$(findstring MINGW,$(platform)))
 CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
 QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
 MOC = $(QTDIR)/bin/moc

+LUAPLATFORM = mingw

 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 
 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)
 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
 
 


@@ -42,7 +50,8 @@ endif
 
 CORESRCS =     uart.c \
                util.c \
 
 CORESRCS =     uart.c \
                util.c \

-               sleep.c \
+               sleep.c
+

 
 CMDSRCS =      nonce2key/crapto1.c\
                nonce2key/crypto1.c\
 
 CMDSRCS =      nonce2key/crapto1.c\
                nonce2key/crypto1.c\


@@ -73,6 +82,7 @@ CMDSRCS =     nonce2key/crapto1.c\
                        cmdmain.c \
                        cmdlft55xx.c \
                        cmdlfpcf7931.c\
                        cmdmain.c \
                        cmdlft55xx.c \
                        cmdlfpcf7931.c\

+                       pm3_binlib.c\

                        scripting.c\
                        cmdscript.c\
 
                        scripting.c\
                        cmdscript.c\
 


@@ -114,6 +124,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/%)


@@ -130,7 +141,7 @@ install_kext: Info.plist
        @echo "*** You may need to reboot for the kext to take effect."
 
 lua_build:
        @echo "*** You may need to reboot for the kext to take effect."
 
 lua_build:

-       @echo Compiling liblua;
-       cd ../liblua && make linux
+       @echo Compiling liblua, using platform $(LUAPLATFORM)
+       cd ../liblua && make $(LUAPLATFORM)

 
 .PHONY: all clean
 
 .PHONY: all clean