]> git.zerfleddert.de Git - proxmark3-svn/blobdiff - client/Makefile
fix compile errors in newer environment
[proxmark3-svn] / client / Makefile
index 523a1ad117c8fbf977ac0ee6c5ff9015600dc268..4d28216b186c713f77a320357974e8281e54850d 100644 (file)
@@ -9,34 +9,41 @@ include ../common/Makefile.common
 CC=gcc
 CXX=g++
 #COMMON_FLAGS = -m32
-
 VPATH = ../common
 OBJDIR = obj
 
 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 
+CFLAGS = -std=c99 -I. -I../include -I../common -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
 LUAPLATFORM = generic
 
+platform = $(shell uname)
 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 = $(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 = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
+    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
+    MOC = $(QTDIR)/bin/moc
+    LUAPLATFORM = mingw
 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 Qt5Core Qt5Widgets 2>/dev/null) -Wall -O4
+       QTLDLIBS = $(shell pkg-config --libs Qt5Core Qt5Widgets 2>/dev/null)
+       MOC = $(shell pkg-config --variable=host_bins Qt5Core)/moc
+       ifeq ($(QTLDLIBS), )
+               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)
+       endif
+       ifeq ($(platform),Darwin)
+               LUAPLATFORM = macosx
+       else
+               LUALIB +=  -ldl
+               LDLIBS +=  -ltermcap -lncurses
+               LUAPLATFORM = linux
+       endif
 endif
 
 
@@ -62,6 +69,7 @@ CMDSRCS =     nonce2key/crapto1.c\
                loclass/ikeys.c \
                loclass/elite_crack.c\
                loclass/fileutils.c\
+                       data_operations.c\
                        mifarehost.c\
                        crc16.c \
                        iso14443crc.c \
@@ -79,6 +87,7 @@ CMDSRCS =     nonce2key/crapto1.c\
                        cmdhflegic.c \
                        cmdhficlass.c \
                        cmdhfmf.c \
+            cmdhfmfu.c \
                        cmdhw.c \
                        cmdlf.c \
                        cmdlfio.c \
@@ -138,17 +147,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)
Impressum, Datenschutz