FIX: wrong compile define used, __WIN32 should be _WIN32

[proxmark3-svn] / README.txt

diff --git a/README.txt b/README.txt
index 13f2556a78b158f144b9c34edabc9062b000a14c..ec921838ceb7bc15a03bd77a5e026b9de143853a 100644 (file)
--- a/README.txt
+++ b/README.txt
@@ -14,7 +14,7 @@ NEWS:
 [![Build Status](https://travis-ci.org/iceman1001/proxmark3.svg?branch=master)](https://travis-ci.org/iceman1001/proxmark3)
 
 ## Build Status Coverity Scan
 [![Build Status](https://travis-ci.org/iceman1001/proxmark3.svg?branch=master)](https://travis-ci.org/iceman1001/proxmark3)
 
 ## Build Status Coverity Scan

-[![Coverity Scan Build Status](https://scan.coverity.com/projects/5117/badge.svg)](https://scan.coverity.com/projects/proxmark3-iceman-fork)
+[![Coverity Scan Build Status](https://scan.coverity.com/projects/5117/badge.svg)](https://scan.coverity.com/projects/proxmark3_iceman_fork)

 
 
 Whats in this fork?  I have scraped the web for different enhancements to the PM3 source code and not all of them ever found their way to the master branch. 
 
 
 Whats in this fork?  I have scraped the web for different enhancements to the PM3 source code and not all of them ever found their way to the master branch. 


@@ -41,7 +41,7 @@ Among the stuff is
        * A Bruteforce for HID,  starting w a facilitycode then trying all 0xFFFF cardnumbers via simulation. To be used against a HID Reader.
        * Blaposts Crapto1 v3.3
     * Icsom's  legic script and legic enhancements
        * A Bruteforce for HID,  starting w a facilitycode then trying all 0xFFFF cardnumbers via simulation. To be used against a HID Reader.
        * Blaposts Crapto1 v3.3
     * Icsom's  legic script and legic enhancements

-    * Azcid's bitsliced bruteforce solver in 'hf mf hardnested'
+    * Aczid's bitsliced bruteforce solver in 'hf mf hardnested'

        
 Give me a hint, and I'll see if I can't merge in the stuff you have. 
 
        
 Give me a hint, and I'll see if I can't merge in the stuff you have. 
 


@@ -56,12 +56,11 @@ I do tend to rename and move stuff around, the official PM3-GUI from Gaucho will
 DEVELOPMENT:
 
 This fork is adjusted to compile on windows/mingw environment with Qt5.3.1 & GCC 4.9
 DEVELOPMENT:
 
 This fork is adjusted to compile on windows/mingw environment with Qt5.3.1 & GCC 4.9

-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.
+GC made updates to allow this to build easily on Ubuntu 14.04

        - See https://github.com/Proxmark/proxmark3/wiki/Ubuntu%20Linux
        - Generally speaking, if you're running a "later" Proxmark, installation is very easy.
        - 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
+       - Run "sudo apt-get install p7zip git build-essential libreadline5 libreadline-dev libusb-0.1-4 libusb-dev libqt4-dev perl pkg-config wget libncurses5-dev

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


@@ -110,7 +109,11 @@ iceman at host iuse.se
 The Proxmark 3 is available for purchase (assembled and tested) from the
 following locations:
 
 The Proxmark 3 is available for purchase (assembled and tested) from the
 following locations:
 

-   * http://www.elechouse.com  (new and revised hardware package 2015)
+   * http://proxmark3.tictail.com/ (For buyers in EU, most likely in Sweden)
+ 
+   * http://www.elechouse.com/  (new and revised hardware package 2015, located in China)  
+
+

    
 
 Most of the ultra-low-volume contract assemblers could put
    
 
 Most of the ultra-low-volume contract assemblers could put