Merge pull request #197 from menshiyun/test-pr

[proxmark3-svn] / COMPILING.txt

diff --git a/COMPILING.txt b/COMPILING.txt
index 1cc34a0fc008309d1376b1755ceeb09e19c9ae3a..e5abb25fc16dda96fa328dad210308fb7e008325 100644 (file)
--- a/COMPILING.txt
+++ b/COMPILING.txt
@@ -86,19 +86,22 @@ Tested on OSX 10.10 Yosemite
 1 - Install Xcode and Xcode Command Line Tools
 
 2 - Install Homebrew and dependencies
 1 - Install Xcode and Xcode Command Line Tools
 
 2 - Install Homebrew and dependencies

-    brew install readline
-    brew instal libusb
+    brew install readline libusb p7zip libusb-compat wget qt5 pkgconfig

 
 

-3 - Download DevKitARM for OSX
-    http://sourceforge.net/projects/devkitpro/files/devkitARM/devkitARM_r44/
-    Unpack devkitARM_r44-osx.tar.bz2 to proxmark3 directory.
+3 - Install DevKitARM for OSX
+    Option 1:
+        http://sourceforge.net/projects/devkitpro/files/devkitARM/devkitARM_r44/
+        Unpack devkitARM_r44-osx.tar.bz2 to proxmark3 directory.
+    Option 2:
+        brew tap nitsky/stm32
+        brew install arm-none-eabi-gcc

 
 

-4 - Edit proxmark3/client/Makefile adding path to readline
+4 - Edit proxmark3/client/Makefile adding path to readline and qt5

 
 

-    LDLIBS = -L/usr/local/Cellar/readline/6.3.8/lib/ -L/opt/local/lib -L/usr/local/lib ../liblua/liblua.a -lreadline -lpthread -lm
-    CFLAGS = -std=c99 -I/usr/local/Cellar/readline/6.3.8/include/ -I. -I../include -I../common -I/opt/local/include -I../liblua  -Wall $(COMMON_FLAGS) -g -O4
+    LDLIBS = -L/usr/local/opt/readline/lib -L/usr/local/opt/qt5/lib -L/opt/local/lib -L/usr/local/lib ../liblua/liblua.a -lreadline -lpthread -lm
+    CFLAGS = -std=c99 -I/usr/local/opt/qt5/include -I/usr/local/opt/readline/include -I. -I../include -I../common -I../zlib -I/opt/local/include -I../liblua -Wall $(COMMON_FLAGS) -g -O4

 
 

-    Replace path /usr/local/Cellar/readline/6.3.8 with your actuall readline path. See homebrew manuals.
+    If your old brew intallation use /usr/local/Cellar/ path replace /usr/local/opt/readline/lib with your actuall readline and qt5 path. See homebrew manuals.

 
 5 - Set Environment
 
 
 5 - Set Environment