From: iceman1001 <iceman@iuse.se>
Date: Mon, 20 Feb 2017 10:47:10 +0000 (+0100)
Subject: CHG: added some comments when changing the HAS_512_FLASH macro directive.
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/proxmark3-svn/commitdiff_plain/19d9376c1670efa52061b571e865bd8c5e57808a

CHG: added some comments when changing the HAS_512_FLASH macro directive.
CHG: 'make cli'  -  needs lualibs to compile.  well,  and more stuff ofcourse.
---

diff --git a/client/Makefile b/client/Makefile
index 26ecb962..7e002488 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -191,8 +191,9 @@ proxmark3: $(OBJDIR)/proxmark3.o $(COREOBJS) $(CMDOBJS) $(QTGUI)
 snooper: $(OBJDIR)/snooper.o $(COREOBJS) $(CMDOBJS) $(OBJDIR)/guidummy.o
 	$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
 
+cli: LDLIBS+=$(LUALIB)
 cli: $(OBJDIR)/cli.o $(COREOBJS) $(CMDOBJS) $(OBJDIR)/guidummy.o
-	$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
+	$(CXX) $(CXXFLAGS) -lpthread  $^ $(LDLIBS) -o $@
 
 flasher: $(OBJDIR)/flash.o $(OBJDIR)/flasher.o $(COREOBJS)
 	$(CXX) $(CXXFLAGS) $^ $(LDLIBS) -o $@
diff --git a/common/Makefile.common b/common/Makefile.common
index 3da34603..a13e32dd 100644
--- a/common/Makefile.common
+++ b/common/Makefile.common
@@ -59,10 +59,15 @@ DETECTED_OS=Windows
 
 endif
 
-#uncomment to enable EMV
+#
+# uncomment these two; to enable EMV
+#
 #APP_CFLAGS += -DWITH_EMV
 #COMMON_FLAGS += -DWITH_EMV
-#uncomment to fix 256 vs 512kb Devices
+#
+# uncomment these two; to fix 256 vs 512kb PM3 devices
+# flashing bootrom -b is needed
+#
 APP_CFLAGS += -DHAS_512_FLASH
 COMMON_FLAGS += -DHAS_512_FLASH