]> cvs.zerfleddert.de Git - proxmark3-svn/blobdiff - client/Makefile
Fix args number and example for guard
[proxmark3-svn] / client / Makefile
index de7bd45ae5213027c0d8376ab96a180e1dcb082e..26ecb962e5d20666c793f51254a79445721f72ad 100644 (file)
@@ -5,20 +5,22 @@
 #-----------------------------------------------------------------------------
 include ../common/Makefile.common
 
+CC = gcc
+CXX = g++
+COMMON_FLAGS += -std=c99 -O3 -mpopcnt -march=native -g
 
-CC=gcc
-CXX=g++
-#COMMON_FLAGS = -m32
-VPATH = ../common ../zlib
+#VPATH = ../common ../zlib
 OBJDIR = obj
 
-LDLIBS =  -L/mingw/lib -L/opt/local/lib -L/usr/local/lib -lm -lreadline -lpthread -lgdi32
+LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
 LUALIB = ../liblua/liblua.a
-LDFLAGS = $(COMMON_FLAGS)
-CFLAGS = -std=c99 -I. -I../include -I../common -I../zlib -I/mingw/include -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
+#LDFLAGS = $(COMMON_FLAGS)
+CFLAGS =  $(COMMON_FLAGS) -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall
 LUAPLATFORM = generic
 
-ifneq (,$(findstring MINGW,$(platform)))
+ifneq (,$(findstring MINGW,$(platform))) 
+    LDLIBS +=  -L/mingw/lib -lgdi32
+       CFLAGS +=  -I/mingw/include -D__USE_MINGW_ANSI_STDIO=1
     CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
     MOC = $(QTDIR)/bin/moc
     LUAPLATFORM = mingw
@@ -28,45 +30,50 @@ ifneq (,$(findstring MINGW,$(platform)))
     else
         QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
     endif
+
+       # QT version,  4 or 5
+       qtplatform = $(shell $(MOC) -v)
+       ifneq (, $(findstring moc 5,$(qtplatform)))
+          CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui -I$(QTDIR)/include/QtWidgets  -I/mingw/include
+          QTLDLIBS = -L$(QTDIR)/lib  -lQt5Core -lQt5Gui -lQt5Widgets 
+       else
+          CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
+          QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
+       endif
+       
 else ifeq ($(platform),Darwin)
-    CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
+
+       # OS X, QT5 detection needs this.
+       export PKG_CONFIG_PATH=/usr/local/Cellar/qt5/5.6.1-1/lib/pkgconfig/
+
+       CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3
     QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
     MOC = $(shell pkg-config --variable=moc_location QtCore)
+
+       # QT version,  4 or 5
+       qtplatform = $(shell $(MOC) -v)
+       ifneq (, $(findstring moc 5,$(qtplatform)))
+               # use this if you have QT5 installed.
+               CFLAGS += -I/usr/include/malloc/ -I/usr/local/opt/readline/include -I/usr/local/opt/qt5/include 
+               LDLIBS = -L/usr/local/opt/readline/lib -L/usr/local/opt/qt5/lib -lreadline -lpthread -lm
+       else
+               # Assuming you have QT4 installed.
+               CFLAGS += -I/usr/include/malloc/ -I/usr/local/opt/readline/include
+               LDLIBS = -L/usr/local/opt/readline/lib -lreadline -lpthread -lm
+       endif
+
     LUAPLATFORM = macosx
 else
-    CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
+    CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3
     QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
     LUALIB +=  -ldl
+    LDLIBS +=  -ltermcap -lncurses
     MOC = $(shell pkg-config --variable=moc_location QtCore)
     # 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
 
-# QT version,  4 or 5
-qtplatform = $(shell $(MOC) -v)
-ifneq (, $(findstring moc 5,$(qtplatform)))
-   CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui -I$(QTDIR)/include/QtWidgets  -I/mingw/include
-   QTLDLIBS = -L$(QTDIR)/lib  -lQt5Core -lQt5Gui -lQt5Widgets 
-else
-   CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
-   QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
-endif
-
-# easy variable to pass to allow this to build on ubutnu 14.04.2
-ifeq (1,$(UBUNTU_1404_QT4))
-  CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
-  QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
-  LUALIB = ../liblua/liblua.a
-  LUALIB +=  -ldl
-  MOC = $(shell pkg-config --variable=moc_location QtCore)
-  LUAPLATFORM = linux
-
-  # pop out the libgdi/etc strings
-  LDLIBS = -L/mingw/lib -L/opt/local/lib -L/usr/local/lib -lm -lreadline -lpthread 
-  
-endif
-
 ifneq ($(QTLDLIBS),)
     QTGUI = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
     CFLAGS += -DHAVE_GUI
@@ -75,31 +82,34 @@ else
     QTGUI = guidummy.o
 endif
 
-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\
+CORESRCS =  uart.c \
+                       util.c \
+                       sleep.c
+
+CMDSRCS =      mifarehost.c \
+                       nonce2key/crapto1.c \
+                       nonce2key/crypto1.c \
+                       nonce2key/nonce2key.c \
+                       nonce2key/crypto1_bs.c \
+                       loclass/cipher.c \
+                       loclass/cipherutils.c \
+                       loclass/des.c \
+                       loclass/ikeys.c \
+                       loclass/elite_crack.c \
+                       loclass/fileutils.c \
+                       parity.c \
                        crc.c \
                        crc16.c \
                        crc64.c \
                        iso14443crc.c \
+                       legic_prng.c \
                        iso15693tools.c \
                        data.c \
                        graph.c \
                        ui.c \
                        cmddata.c \
                        lfdemod.c \
+                       cmdanalyse.c \
                        cmdhf.c \
                        cmdhf14a.c \
                        cmdhf14b.c \
@@ -109,8 +119,10 @@ CMDSRCS =  nonce2key/crapto1.c\
                        cmdhficlass.c \
                        cmdhfmf.c \
             cmdhfmfu.c \
+                       cmdhfmfhard.c \
                        cmdhfmfdes.c \
                        cmdhftopaz.c \
+                       cmdhfemv.c \
                        cmdhw.c \
                        cmdlf.c \
                        cmdlfio.c \
@@ -122,23 +134,39 @@ CMDSRCS =         nonce2key/crapto1.c\
                        cmdparser.c \
                        cmdmain.c \
                        cmdlft55xx.c \
-                       cmdlfpcf7931.c\
-                       pm3_binlib.c\
-                       scripting.c\
-                       cmdscript.c\
-                       pm3_bitlib.c\
-                       aes.c\
-                       protocols.c\
-                       sha1.c\
-                       cmdcrc.c\
-                       reveng/reveng.c\
-                       reveng/cli.c\
-                       reveng/bmpbit.c\
-                       reveng/model.c\
-                       reveng/poly.c\
-                       reveng/getopt.c\
-          
-
+                       cmdlfpcf7931.c \
+                       cmdlfviking.c \
+                       cmdlfpresco.c \
+                       cmdlfpyramid.c \
+                       cmdlfguard.c \
+                       cmdlfnedap.c \
+                       cmdlfjablotron.c \
+                       cmdlfvisa2000.c \
+                       cmdlfnoralsy.c \
+                       cmdlffdx.c \
+                       cmdlfcotag.c \
+                       pm3_binlib.c \
+                       scripting.c \
+                       cmdscript.c \
+                       pm3_bitlib.c \
+                       aes.c \
+                       protocols.c \
+                       sha1.c \
+                       sha256.c \
+                       cmdcrc.c \
+                       reveng/preset.c \
+                       reveng/reveng.c \
+                       reveng/cli.c \
+                       reveng/bmpbit.c \
+                       reveng/model.c \
+                       reveng/poly.c \
+                       reveng/getopt.c \
+                       tea.c \
+                       prng.c \
+                       bucketsort.c
+#                      radixsort.c \
+
+               
 ZLIBSRCS = deflate.c adler32.c trees.c zutil.c inflate.c inffast.c inftrees.c
 ZLIB_FLAGS = -DZ_SOLO -DZ_PREFIX -DNO_GZIP -DZLIB_PM3_TUNED 
 #-DDEBUG -Dverbose=1
@@ -148,13 +176,13 @@ CMDOBJS = $(CMDSRCS:%.c=$(OBJDIR)/%.o)
 ZLIBOBJS = $(ZLIBSRCS:%.c=$(OBJDIR)/%.o)
 
 RM = rm -f
-BINS = proxmark3 flasher fpga_compress #snooper cli
+BINS = proxmark3 flasher fpga_compress
 CLEAN = cli cli.exe flasher flasher.exe proxmark3 proxmark3.exe fpga_compress fpga_compress.exe snooper snooper.exe $(CMDOBJS) $(OBJDIR)/*.o *.o *.moc.cpp
 
 all: lua_build $(BINS) 
 
 all-static: LDLIBS:=-static $(LDLIBS)
-all-static: snooper cli flasher fpga_compress
+all-static: $(BINS)
        
 proxmark3: LDLIBS+=$(LUALIB) $(QTLDLIBS)
 proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUI)
Impressum, Datenschutz