X-Git-Url: http://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/blobdiff_plain/3130ba4b2168f8e8dd66f214d1eecdca65708d53..df82844c056b3cb942bb055ab216161e5d4607e1:/client/Makefile diff --git a/client/Makefile b/client/Makefile index 5b947959..2aa7339c 100644 --- a/client/Makefile +++ b/client/Makefile @@ -7,15 +7,14 @@ include ../common/Makefile.common 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) -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))) @@ -42,7 +41,8 @@ ifneq (,$(findstring MINGW,$(platform))) endif else ifeq ($(platform),Darwin) - LDLIBS = -L/opt/local/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 QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null) MOC = $(shell pkg-config --variable=moc_location QtCore) @@ -120,6 +120,7 @@ CMDSRCS = nonce2key/crapto1.c \ cmdlfpresco.c \ cmdlfpyramid.c \ cmdlfguard.c \ + cmdlfnedap.c \ pm3_binlib.c \ scripting.c \ cmdscript.c \