Fixed compile error in MinGW (#260)

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 863f3c2c7eefffa1cf9ed1b74a5698cf8649bcd5..a6b1942fb9ccf4231015a64ddffdfcf50a7cc92c 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -12,15 +12,10 @@ CXX=g++
 VPATH = ../common ../zlib
 OBJDIR = obj
 
-ifneq (,$(findstring MINGW,$(platform)))
-    LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
-else
-    LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm -ltermcap -lncurses
-endif
-
+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/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
+CFLAGS = -std=c99 -D_ISOC99_SOURCE -I. -I../include -I../common -I../tools -I../zlib -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4
 LUAPLATFORM = generic
 
 ifneq (,$(findstring MINGW,$(platform)))
@@ -42,6 +37,7 @@ else
     CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
     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
@@ -58,19 +54,20 @@ endif
 
 CORESRCS =     uart.c \
                util.c \
-               sleep.c
 
 
-CMDSRCS =      nonce2key/crapto1.c\
-                       nonce2key/crypto1.c\
-                       nonce2key/nonce2key.c\
+CMDSRCS =      crapto1/crapto1.c\
+                       crapto1/crypto1.c\
+                       mfkey.c\
                        loclass/cipher.c \
                        loclass/cipherutils.c \
                        loclass/des.c \
                        loclass/ikeys.c \
                        loclass/elite_crack.c\
                        loclass/fileutils.c\
+                       whereami.c\
                        mifarehost.c\
+                       parity.c\
                        crc.c \
                        crc16.c \
                        crc64.c \
@@ -89,30 +86,47 @@ CMDSRCS =   nonce2key/crapto1.c\
                        cmdhflegic.c \
                        cmdhficlass.c \
                        cmdhfmf.c \
-            cmdhfmfu.c \
+                       cmdhfmfu.c \
                        cmdhftopaz.c \
                        cmdhw.c \
                        cmdlf.c \
-                       cmdlfio.c \
-                       cmdlfhid.c \
                        cmdlfawid.c \
+                       cmdlfcotag.c\
                        cmdlfem4x.c \
+                       cmdlffdx.c \
+                       cmdlfgproxii.c \
+                       cmdlfhid.c \
                        cmdlfhitag.c \
+                       cmdlfio.c \
+                       cmdlfindala.c \
+                       cmdlfjablotron.c \
+                       cmdlfnexwatch.c \
+                       cmdlfnoralsy.c \
+                       cmdlfparadox.c \
+                       cmdlfpcf7931.c \
+                       cmdlfpresco.c \
+                       cmdlfpyramid.c \
+                       cmdlfsecurakey.c \
+                       cmdlft55xx.c \
                        cmdlfti.c \
+                       cmdlfviking.c\
+                       cmdlfvisa2000.c\
                        cmdparser.c \
                        cmdmain.c \
-                       cmdlft55xx.c \
-                       cmdlfpcf7931.c\
-                       cmdlfviking.c\
-                       cmdlfpresco.c\
-                       cmdlfpyramid.c\
-                       pm3_binlib.c\
                        scripting.c\
                        cmdscript.c\
+                       pm3_binlib.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\
 
 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