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 26ecb962e5d20666c793f51254a79445721f72ad..7e002488b74e8a3e71e83de16ede435e5c9a8347 100644 (file)
--- 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 3da346030c05b8090c1833db7599d1a011e71b06..a13e32dd284035d13f03ca75873786b64c433b94 100644 (file)
--- 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