Small lf bug fixes and threshold adjustments

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 8786701f2684b69a3a05b31acc89d3ab583cc188..523a1ad117c8fbf977ac0ee6c5ff9015600dc268 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -1,64 +1,142 @@
-WINCC=c:\mingw\bin\gcc
+#-----------------------------------------------------------------------------
+# This code is licensed to you under the terms of the GNU GPL, version 2 or,
+# at your option, any later version. See the LICENSE.txt file for the text of
+# the license.
+#-----------------------------------------------------------------------------
+include ../common/Makefile.common

 
 

+
+CC=gcc
+CXX=g++

 #COMMON_FLAGS = -m32
 
 #COMMON_FLAGS = -m32
 

-LDLIBS = -L/opt/local/lib -L/usr/local/lib -lusb -lreadline -lpthread
-LDFLAGS = $(COMMON_FLAGS)
-CFLAGS = -I. -I/opt/local/include -Wall -Wno-unused-function $(COMMON_FLAGS)
+VPATH = ../common
+OBJDIR = obj

 
 

-WINLIBS = -lgdi32 -lsetupapi
-CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall
+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
+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)
 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

 
 

-ifeq ($(shell uname),Darwin)
-CXXFLAGS += -DQ_WS_MAC32
-CFLAGS += 
-QTLDLIBS += 
+# 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

-QTLDLIBS=
+
+

 ifneq ($(QTLDLIBS),)
 ifneq ($(QTLDLIBS),)

-QTGUI = proxgui.o proxguiqt.o proxguiqt.moc.o
+QTGUI = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o

 CFLAGS += -DHAVE_GUI
 CFLAGS += -DHAVE_GUI

-MOC ?= $(shell pkg-config --variable=moc_location QtCore)

 LINK.o = $(LINK.cpp)
 else
 QTGUI = guidummy.o
 endif
 
 LINK.o = $(LINK.cpp)
 else
 QTGUI = guidummy.o
 endif
 

-ifeq ($(shell echo ""),)
+CORESRCS =     uart.c \
+               util.c \
+               sleep.c
+
+
+CMDSRCS =      nonce2key/crapto1.c\
+               nonce2key/crypto1.c\
+               nonce2key/nonce2key.c\
+               loclass/cipher.c \
+               loclass/cipherutils.c \
+               loclass/des.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 \
+                       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\
+
+
+COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)
+CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
+

 RM = rm -f
 RM = rm -f

-BINS = proxmark3 snooper cli flasher
-CLEAN = cli flasher proxmark3 snooper *.o *.moc.cpp
-else
-RM = del
-BINS = prox.exe
-CLEAN = prox.exe
-endif
+BINS = proxmark3 flasher #snooper cli
+CLEAN = cli cli.exe flasher flasher.exe proxmark3 proxmark3.exe snooper snooper.exe $(CMDOBJS) $(OBJDIR)/*.o *.o *.moc.cpp

 
 

-all: $(BINS)
+all: lua_build $(BINS) 

 
 all-static: LDLIBS:=-static $(LDLIBS)
 all-static: snooper cli flasher
 
 all-static: LDLIBS:=-static $(LDLIBS)
 all-static: snooper cli flasher

-
-prox.exe: prox.c wingui.c command.c
-       $(WINCC) $(CFLAGS) $(DEFINES) -o prox.exe prox.c wingui.c command.c $(WINLIBS)

        
 proxmark3: LDLIBS+=$(QTLDLIBS)
        
 proxmark3: LDLIBS+=$(QTLDLIBS)

-proxmark3: proxmark3.o gui.o command.o usb.o $(QTGUI)
+proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUI)
+       $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@

 
 

-command.o: command.c
+snooper: $(OBJDIR)/snooper.o $(COREOBJS) $(CMDOBJS) $(OBJDIR)/guidummy.o
+       $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@

 
 

-snooper: snooper.o gui.o command.o usb.o guidummy.o
+cli: $(OBJDIR)/cli.o $(COREOBJS) $(CMDOBJS) $(OBJDIR)/guidummy.o
+       $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@

 
 

-cli: cli.o gui.o command.o usb.o guidummy.o
+flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS)
+       $(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@

 
 

-flasher: flasher.o usb.o
+$(OBJDIR)/%.o: %.c
+       $(CC) $(CFLAGS) -c -o $@ $<
+
+$(OBJDIR)/%.o: %.cpp
+       $(CXX) $(CXXFLAGS) -c -o $@ $<

 
 proxguiqt.moc.cpp: proxguiqt.h
        $(MOC) -o$@ $^
 
 clean:
        $(RM) $(CLEAN)
 
 proxguiqt.moc.cpp: proxguiqt.h
        $(MOC) -o$@ $^
 
 clean:
        $(RM) $(CLEAN)

+       cd ../liblua && make clean
+
+tarbin: $(BINS)
+       $(TAR) $(TARFLAGS) ../proxmark3-$(platform)-bin.tar $(BINS:%=client/%)

 
 # must be run as root
 install_kext: Info.plist
 
 # must be run as root
 install_kext: Info.plist


@@ -71,4 +149,8 @@ install_kext: Info.plist
        touch /System/Library/Extensions
        @echo "*** You may need to reboot for the kext to take effect."
 
        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)
+

 .PHONY: all clean
 .PHONY: all clean