From 28d47dc9b4bb437596594a62793bace13bbff172 Mon Sep 17 00:00:00 2001 From: iceman1001 Date: Thu, 18 Feb 2016 21:08:47 +0100 Subject: [PATCH 1/1] CHG: textual change in README.md FIX: Mac OSX ld (linker) warning for -L/usr/local/lib, testing to remove it for mac builds. --- README.md | 4 ++-- client/Makefile | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 76dafd06..4e6920c9 100644 --- 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 - -> 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 -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 diff --git a/client/Makefile b/client/Makefile index 84a158b2..c918fcb2 100644 --- a/client/Makefile +++ b/client/Makefile @@ -41,6 +41,7 @@ ifneq (,$(findstring MINGW,$(platform))) 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) -- 2.39.5