CHG: textual change in README.md

FIX: Mac OSX ld (linker) warning for -L/usr/local/lib,  testing to remove it for mac builds.

diff --git a/README.md b/README.md
index 76dafd06998ea9e1eccede3bbeddaee3ebe5bd3b..4e6920c90a6ae120a0e8e635a44bf5dcd99cd104 100644 (file)
--- a/README.md
+++ b/README.md
@@ -83,10 +83,10 @@ GC made updates to allow this to build easily on Ubuntu 14.04.2 LTS or 15.10
 See https://github.com/Proxmark/proxmark3/wiki/Ubuntu%20Linux
 
 Run 
 See https://github.com/Proxmark/proxmark3/wiki/Ubuntu%20Linux
 
 Run 

-       -> sudo apt-get install p7zip git build-essential libreadline5 libreadline-dev libusb-0.1-4 libusb-dev libqt4-dev perl pkg-config wget"a
+       -> sudo apt-get install p7zip git build-essential libreadline5 libreadline-dev libusb-0.1-4 libusb-dev libqt4-dev perl pkg-config wget

 
 Follow these instructions
 
 Follow these instructions

-Get devkitARM release 41 from SourceForge (choose either the 64/32 ¿bit depending on your architecture, it is assumed you know how to check and recognize your architecture):
+Get devkitARM release 41 from SourceForge (choose either the 64/32 bit depending on your architecture, it is assumed you know how to check and recognize your architecture):

 
 (64-bit) http://sourceforge.net/projects/devkitpro/files/devkitARM/previous/devkitARM_r41-x86_64-linux.tar.bz2/download
 (32-bit) http://sourceforge.net/projects/devkitpro/files/devkitARM/previous/devkitARM_r41-i686-linux.tar.bz2/download
 
 (64-bit) http://sourceforge.net/projects/devkitpro/files/devkitARM/previous/devkitARM_r41-x86_64-linux.tar.bz2/download
 (32-bit) http://sourceforge.net/projects/devkitpro/files/devkitARM/previous/devkitARM_r41-i686-linux.tar.bz2/download

diff --git a/client/Makefile b/client/Makefile
index 84a158b2577415dc9495e37cf90dcc0208eb963c..c918fcb2eca218ad3635ec7d5f5e915f5061fac8 100644 (file)
--- a/client/Makefile
+++ b/client/Makefile
@@ -41,6 +41,7 @@ ifneq (,$(findstring MINGW,$(platform)))
        endif
        
 else ifeq ($(platform),Darwin)
        endif
        
 else ifeq ($(platform),Darwin)

+       LDLIBS -= -L/usr/local/lib

     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)
     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)