FIX: a define which was wrong

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 5b9479595b44bc0d44b98ae4caccb54145c4314b..05793685f52807726b2e2eaf6220a7c36d2ee9af 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -7,15 +7,14 @@ include ../common/Makefile.common
 
 CC = gcc
 CXX = g++
 
 CC = gcc
 CXX = g++

-#COMMON_FLAGS = -m32
-COMMON_FLAGS =  -std=c99 -O3 -mpopcnt -march=native
+COMMON_FLAGS =  -std=c99 -O3 -mpopcnt -march=native -g

 #VPATH = ../common ../zlib
 OBJDIR = obj
 
 LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
 LUALIB = ../liblua/liblua.a
 #LDFLAGS = $(COMMON_FLAGS)
 #VPATH = ../common ../zlib
 OBJDIR = obj
 
 LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread -lm
 LUALIB = ../liblua/liblua.a
 #LDFLAGS = $(COMMON_FLAGS)

-CFLAGS =  $(COMMON_FLAGS) -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall -g
+CFLAGS =  $(COMMON_FLAGS) -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall

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


@@ -42,6 +41,7 @@ ifneq (,$(findstring MINGW,$(platform)))
        endif
        
 else ifeq ($(platform),Darwin)
        endif
        
 else ifeq ($(platform),Darwin)

+       CFLAGS += -I/usr/include/malloc/

        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)
        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)


@@ -120,6 +120,7 @@ CMDSRCS =   nonce2key/crapto1.c \
                        cmdlfpresco.c \
                        cmdlfpyramid.c \
                        cmdlfguard.c \
                        cmdlfpresco.c \
                        cmdlfpyramid.c \
                        cmdlfguard.c \

+                       cmdlfnedap.c \

                        pm3_binlib.c \
                        scripting.c \
                        cmdscript.c \
                        pm3_binlib.c \
                        scripting.c \
                        cmdscript.c \