bugfixes hf mf sim

[proxmark3-svn] / client / Makefile

diff --git a/client/Makefile b/client/Makefile
index 00da26a9a33a37249e20960ae4c816217ce81ae2..e4a3580b8814ee0b33da32693f59abea3b073413 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -13,9 +13,9 @@ CXX=g++
 VPATH = ../common
 OBJDIR = obj
 
-LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread ../liblua/liblua.a -ldl
+LDLIBS = -L/opt/local/lib -L/usr/local/lib -lreadline -lpthread ../liblua/liblua.a
 LDFLAGS = $(COMMON_FLAGS)
-CFLAGS = -std=c99 -I. -I../include -I../common -I/opt/local/include -I../liblua -Wall -Wno-unused-function $(COMMON_FLAGS) -g -O4 
+CFLAGS = -std=c99 -I. -I../include -I../common -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4 
 LUAPLATFORM = generic
 
 ifneq (,$(findstring MINGW,$(platform)))
@@ -24,8 +24,10 @@ QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
 MOC = $(QTDIR)/bin/moc
 LUAPLATFORM = mingw
 else ifeq ($(platform),Darwin)
-CXXFLAGS = -I/Library/Frameworks/QtGui.framework/Versions/Current/Headers -I/Library/Frameworks/QtCore.framework/Versions/Current/Headers
-QTLDLIBS = -framework QtGui -framework QtCore
+#CXXFLAGS = -I/Library/Frameworks/QtGui.framework/Versions/Current/Headers -I/Library/Frameworks/QtCore.framework/Versions/Current/Headers
+#QTLDLIBS = -framework QtGui -framework QtCore
+CXXFLAGS = -I$(QTDIR)/include -I$(QTDIR)/include/QtCore -I$(QTDIR)/include/QtGui
+QTLDLIBS = -F/opt/local/Library/Frameworks -framework QtGui -framework QtCore
 MOC = moc 
 LUAPLATFORM = macosx
 else
@@ -75,6 +77,7 @@ CMDSRCS =     nonce2key/crapto1.c\
                        cmdhw.c \
                        cmdlf.c \
                        cmdlfhid.c \
+                       cmdlfio.c \
                        cmdlfem4x.c \
                        cmdlfhitag.c \
                        cmdlfti.c \
@@ -85,7 +88,7 @@ CMDSRCS =     nonce2key/crapto1.c\
                        pm3_binlib.c\
                        scripting.c\
                        cmdscript.c\
-
+                       pm3_bitlib.c\
 
 
 COREOBJS = $(CORESRCS:%.c=$(OBJDIR)/%.o)