chg: the windows exe annoys the linux compiler

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 27617a5ddc86cf4145365147c3e96b2a4a04b014..56ae7de8a96961913ba9135198e39dc7beaff179 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -5,9 +5,8 @@
 #-----------------------------------------------------------------------------
 include ../common/Makefile.common
 
 #-----------------------------------------------------------------------------
 include ../common/Makefile.common
 

-
-CC=gcc
-CXX=g++
+CC = gcc
+CXX = g++

 #COMMON_FLAGS = -m32
 VPATH = ../common ../zlib
 OBJDIR = obj
 #COMMON_FLAGS = -m32
 VPATH = ../common ../zlib
 OBJDIR = obj


@@ -15,7 +14,7 @@ OBJDIR = obj
 LDLIBS =  -L/mingw/lib -L/opt/local/lib -L/usr/local/lib -lm -lreadline -lpthread -lgdi32
 LUALIB = ../liblua/liblua.a
 LDFLAGS = $(COMMON_FLAGS)
 LDLIBS =  -L/mingw/lib -L/opt/local/lib -L/usr/local/lib -lm -lreadline -lpthread -lgdi32
 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/mingw/include -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O3

 LUAPLATFORM = generic
 
 ifneq (,$(findstring MINGW,$(platform)))
 LUAPLATFORM = generic
 
 ifneq (,$(findstring MINGW,$(platform)))


@@ -29,12 +28,12 @@ ifneq (,$(findstring MINGW,$(platform)))
         QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
     endif
 else ifeq ($(platform),Darwin)
         QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
     endif
 else ifeq ($(platform),Darwin)

-    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)
     MOC = $(shell pkg-config --variable=moc_location QtCore)
     LUAPLATFORM = macosx
 else
     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)
     QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
     LUALIB +=  -ldl
     MOC = $(shell pkg-config --variable=moc_location QtCore)


@@ -55,7 +54,7 @@ endif
 
 # easy variable to pass to allow this to build on ubutnu 14.04.2
 ifeq (1,$(UBUNTU_1404_QT4))
 
 # 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
+  CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3

   QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
   LUALIB = ../liblua/liblua.a
   LUALIB +=  -ldl
   QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
   LUALIB = ../liblua/liblua.a
   LUALIB +=  -ldl


@@ -81,15 +80,16 @@ CORESRCS =  uart.c \
 
 
 CMDSRCS =      nonce2key/crapto1.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\
+                       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\
                        mifarehost.c\

+                       parity.c\

                        crc.c \
                        crc16.c \
                        crc64.c \
                        crc.c \
                        crc16.c \
                        crc64.c \


@@ -109,7 +109,7 @@ CMDSRCS =   nonce2key/crapto1.c\
                        cmdhficlass.c \
                        cmdhfmf.c \
             cmdhfmfu.c \
                        cmdhficlass.c \
                        cmdhfmf.c \
             cmdhfmfu.c \

-cmdhfmfhard.c \
+                       cmdhfmfhard.c \

                        cmdhfmfdes.c \
                        cmdhftopaz.c \
                        cmdhw.c \
                        cmdhfmfdes.c \
                        cmdhftopaz.c \
                        cmdhw.c \


@@ -140,7 +140,11 @@ cmdhfmfhard.c \
                        reveng/model.c\
                        reveng/poly.c\
                        reveng/getopt.c\
                        reveng/model.c\
                        reveng/poly.c\
                        reveng/getopt.c\

-          
+                       tea.c\
+                       prng.c\
+                       radixsort.c\
+                       bucketsort.c\
+                       cmdlfpresco.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 
 
 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