Inclusion of unused oem variable

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index f76c955659f70d51bfaed973af025da4f1ec133e..616a2a7446d6cd5e4e6007922b8a37e2e0141fd2 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -41,9 +41,16 @@ ifneq (,$(findstring MINGW,$(platform)))
        endif
        
 else ifeq ($(platform),Darwin)
        endif
        
 else ifeq ($(platform),Darwin)

+
+       # Assuming you have QT4 installed.

        CFLAGS += -I/usr/include/malloc/ -I/usr/local/opt/readline/include
        LDLIBS = -L/opt/local/lib -L/usr/local/opt/readline/lib -lreadline -lpthread -lm
        CFLAGS += -I/usr/include/malloc/ -I/usr/local/opt/readline/include
        LDLIBS = -L/opt/local/lib -L/usr/local/opt/readline/lib -lreadline -lpthread -lm

-    CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O3
+       
+       # 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/opt/local/lib -L/usr/local/opt/readline/lib -L/usr/local/opt/qt5/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
     QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
     MOC = $(shell pkg-config --variable=moc_location QtCore)
     LUAPLATFORM = macosx


@@ -92,6 +99,7 @@ CMDSRCS =     nonce2key/crapto1.c \
                        ui.c \
                        cmddata.c \
                        lfdemod.c \
                        ui.c \
                        cmddata.c \
                        lfdemod.c \

+                       cmdanalyse.c \

                        cmdhf.c \
                        cmdhf14a.c \
                        cmdhf14b.c \
                        cmdhf.c \
                        cmdhf14a.c \
                        cmdhf14b.c \


@@ -140,8 +148,7 @@ CMDSRCS =   nonce2key/crapto1.c \
                        tea.c \
                        prng.c \
                        radixsort.c \
                        tea.c \
                        prng.c \
                        radixsort.c \

-                       bucketsort.c \
-                       cmdanalyse.c
+                       bucketsort.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