X-Git-Url: http://cvs.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/0a886a1d1bbe91af3e9e0a6a190a1af026faa589..50564be0f809e61f3148fb2f27db035b6362321f:/client/Makefile

diff --git a/client/Makefile b/client/Makefile
index 20273dd6..3345aa8b 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -5,20 +5,21 @@
 #-----------------------------------------------------------------------------
 include ../common/Makefile.common
 
-
-CC=gcc
-CXX=g++
+CC = gcc
+CXX = g++
 #COMMON_FLAGS = -m32
 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
+CFLAGS = -std=c99 -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O3
 LUAPLATFORM = generic
 
-ifneq (,$(findstring MINGW,$(platform)))
+ifneq (,$(findstring MINGW,$(platform))) 
+    LDLIBS +=  -L/mingw/lib -lgdi32
+	CFLAGS +=  -I/mingw/include
     CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
     MOC = $(QTDIR)/bin/moc
     LUAPLATFORM = mingw
@@ -28,13 +29,25 @@ 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
+	LDLIBS = -L/opt/local/lib -lreadline -lpthread -lm
+    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)
     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
     MOC = $(shell pkg-config --variable=moc_location QtCore)
@@ -43,30 +56,6 @@ else
     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
@@ -90,6 +79,7 @@ CMDSRCS = 	nonce2key/crapto1.c\
 			loclass/elite_crack.c\
 			loclass/fileutils.c\
 			mifarehost.c\
+			parity.c\
 			crc.c \
 			crc16.c \
 			crc64.c \
@@ -141,7 +131,12 @@ CMDSRCS = 	nonce2key/crapto1.c\
 			reveng/poly.c\
 			reveng/getopt.c\
 			tea.c\
-	   
+			prng.c\
+			radixsort.c\
+			bucketsort.c\
+			cmdlfpresco.c\
+			cmdlfpyramid.c\
+			cmdlfguard.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