From 8fac5452b851fe2f6427c8eb8fc833018f75d330 Mon Sep 17 00:00:00 2001
From: Gil Cohen <gcohen@gmail.com>
Date: Mon, 3 Aug 2015 23:07:57 -0500
Subject: [PATCH] updated makefile, readme

---
 README.txt      | 27 ++++++++++++++++++++++-----
 client/Makefile | 14 ++++++++++++++
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/README.txt b/README.txt
index e510e792..2acd55a1 100644
--- a/README.txt
+++ b/README.txt
@@ -34,11 +34,28 @@ DEVELOPMENT:
 This fork is adjusted to compile on windows/mingw environment with Qt5.3.1 & GCC 4.8
 For people with linux you will need to patch some source code and some small change to one makefile.  If you are lazy, you google the forum and find asper's or holimans makefile or you find your solution below.
 
+GC made updates to allow this to build easily on Ubuntu 14.04.2 LTS.
+	- See https://github.com/Proxmark/proxmark3/wiki/Ubuntu%20Linux
+	- Generally speaking, if you're running a "later" Proxmark, installation is very easy.
+	- 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
+	- 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):
+
+(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
+Extract the contents of the .tar.bz2:
+ tar jxvf devkitARM_r41-<arch>-linux.tar.bz2
+Create a directory for the arm dev kit:
+ sudo mkdir -p /opt/devkitpro/
+Move the ARM developer kit to the newly created directory:
+ sudo mv devkitARM /opt/devkitpro/
+Add the appropriate environment variable:
+ export PATH=${PATH}:/opt/devkitpro/devkitARM/bin/
+Add the environment variable to your profile:
+ echo 'PATH=${PATH}:/opt/devkitpro/devkitARM/bin/ ' >> ~/.bashrc
+	- Use the magic build command "make UBUNTU_1404_QT4=1"
+
 Common errors linux/macOS finds
-Error:
-	* loclass/fileutils.c:15:2: warning: implicit declaration of function ‘_stat’ [-Wimplicit-function-declaration]
-Solution:
-	* Remove the "unscore" sign.   In linux you use without underscore, in windows you need a underscore. 
 	
 Error:  
 	* \client\makefile  the parameter -lgdi32 
@@ -67,4 +84,4 @@ following locations:
 
 
 January 2015, Sweden
-iceman at host iuse.se
\ No newline at end of file
+iceman at host iuse.se
diff --git a/client/Makefile b/client/Makefile
index 9133abff..de7bd45a 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -53,6 +53,20 @@ else
    QTLDLIBS = -L$(QTDIR)/lib -lQtCore4 -lQtGui4
 endif
 
+# easy variable to pass to allow this to build on ubutnu 14.04.2
+ifeq (1,$(UBUNTU_1404_QT4))
+  CXXFLAGS = $(shell pkg-config --cflags QtCore QtGui 2>/dev/null) -Wall -O4
+  QTLDLIBS = $(shell pkg-config --libs QtCore QtGui 2>/dev/null)
+  LUALIB = ../liblua/liblua.a
+  LUALIB +=  -ldl
+  MOC = $(shell pkg-config --variable=moc_location QtCore)
+  LUAPLATFORM = linux
+
+  # pop out the libgdi/etc strings
+  LDLIBS = -L/mingw/lib -L/opt/local/lib -L/usr/local/lib -lm -lreadline -lpthread 
+  
+endif
+
 ifneq ($(QTLDLIBS),)
     QTGUI = $(OBJDIR)/proxgui.o $(OBJDIR)/proxguiqt.o $(OBJDIR)/proxguiqt.moc.o
     CFLAGS += -DHAVE_GUI
-- 
2.39.2