Merge branch 'master' into topaz

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index b04a152451ac0e42b3b235c8dcfe70e6629175ad..48cbdfaa9d1c27107846d5ce566021b33dbf3db4 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -12,38 +12,43 @@ CXX=g++
 VPATH = ../common
 OBJDIR = obj
 
-LDLIBS = -L/opt/local/lib -L/usr/local/lib ../liblua/liblua.a -lreadline -lpthread -lm -lcrypto
+LDLIBS = -L/opt/local/lib -L/usr/local/lib ../liblua/liblua.a -lreadline -lpthread -lm
 LDFLAGS = $(COMMON_FLAGS)
 CFLAGS = -std=c99 -I. -I../include -I../common -I/opt/local/include -I../liblua -Wall $(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
-LUAPLATFORM = mingw
+    CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
+    MOC = $(QTDIR)/bin/moc
+    LUAPLATFORM = mingw
+    ifneq ($(wildcard $(QTDIR)/include/QtWidgets),)
+        CXXFLAGS += -I$(QTDIR)/include/QtWidgets
+        QTLDLIBS = -L$(QTDIR)/lib -lQt5Core -lQt5Gui -lQt5Widgets
+    else
+        QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
+    endif
 else ifeq ($(platform),Darwin)
-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)
-LUAPLATFORM = macosx
+    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)
+    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
+    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
 
 
 ifneq ($(QTLDLIBS),)
-QTGUI = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
-CFLAGS += -DHAVE_GUI
-LINK.o = $(LINK.cpp)
+    QTGUI = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
+    CFLAGS += -DHAVE_GUI
+    LINK.o = $(LINK.cpp)
 else
-QTGUI = guidummy.o
+    QTGUI = guidummy.o
 endif
 
 CORESRCS =     uart.c \
@@ -60,41 +65,43 @@ CMDSRCS =   nonce2key/crapto1.c\
                loclass/ikeys.c \
                loclass/elite_crack.c\
                loclass/fileutils.c\
-                       mifarehost.c\
-                       crc16.c \
-                       iso14443crc.c \
-                       iso15693tools.c \
-                       data.c \
-                       graph.c \
-                       ui.c \
-                       cmddata.c \
-                       lfdemod.c \
-                       cmdhf.c \
-                       cmdhf14a.c \
-                       cmdhf14b.c \
-                       cmdhf15.c \
-                       cmdhfepa.c \
-                       cmdhflegic.c \
-                       cmdhficlass.c \
-                       cmdhfmf.c \
-            cmdhfmfu.c \
-                       cmdhw.c \
-                       cmdlf.c \
-                       cmdlfio.c \
-                       cmdlfhid.c \
-                       cmdlfem4x.c \
-                       cmdlfhitag.c \
-                       cmdlfti.c \
-                       cmdparser.c \
-                       cmdmain.c \
-                       cmdlft55xx.c \
-                       cmdlfpcf7931.c\
-                       pm3_binlib.c\
-                       scripting.c\
-                       cmdscript.c\
-                       pm3_bitlib.c\
-                       aes.c\
-
+               mifarehost.c\
+               crc.c \
+               crc16.c \
+               iso14443crc.c \
+               iso15693tools.c \
+               data.c \
+               graph.c \
+               ui.c \
+               cmddata.c \
+               lfdemod.c \
+               cmdhf.c \
+               cmdhf14a.c \
+               cmdhf14b.c \
+               cmdhf15.c \
+               cmdhfepa.c \
+               cmdhflegic.c \
+               cmdhficlass.c \
+               cmdhfmf.c \
+        cmdhfmfu.c \
+               cmdhftopaz.c \
+               cmdhw.c \
+               cmdlf.c \
+               cmdlfio.c \
+               cmdlfhid.c \
+               cmdlfem4x.c \
+               cmdlfhitag.c \
+               cmdlfti.c \
+               cmdparser.c \
+               cmdmain.c \
+               cmdlft55xx.c \
+               cmdlfpcf7931.c\
+               pm3_binlib.c\
+               scripting.c\
+               cmdscript.c\
+               pm3_bitlib.c\
+               aes.c\
+               protocols.c
 
 COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
 CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
@@ -137,17 +144,6 @@ clean:
 tarbin: $(BINS)
        $(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(BINS:%=client/%)
 
-# must be run as root
-install_kext: Info.plist
-       mkdir -p /System/Library/Extensions/Proxmark3.kext/Contents
-       cp Info.plist /System/Library/Extensions/Proxmark3.kext/Contents
-       chown -R root:wheel /System/Library/Extensions/Proxmark3.kext
-       chmod 755 /System/Library/Extensions/Proxmark3.kext /System/Library/Extensions/Proxmark3.kext/Contents
-       chmod 644 /System/Library/Extensions/Proxmark3.kext/Contents/Info.plist
-       rm -rf /System/Library/Caches/com.apple.kext.caches
-       touch /System/Library/Extensions
-       @echo "*** You may need to reboot for the kext to take effect."
-
 lua_build:
        @echo Compiling liblua, using platform $(LUAPLATFORM)
        cd ../liblua && make $(LUAPLATFORM)