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))) 
        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)
                        cmdlfpresco.c \
                        cmdlfpyramid.c \
                        cmdlfguard.c \
+                       cmdlfnedap.c \
                        pm3_binlib.c \
                        scripting.c \
                        cmdscript.c \
                        tea.c \
                        prng.c \
                        radixsort.c \
-                       bucketsort.c
+                       bucketsort.c \
+                       cmdanalyse.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 
 #-DDEBUG -Dverbose=1