Merge pull request #197 from yoyoerx/windocs

Cygwin Based Users Guide v0.6 -fixes to dfu-programmer build
author: Jack Humbert <jack.humb@gmail.com> 2016-03-14 13:37:10 -0400
committer: Jack Humbert <jack.humb@gmail.com> 2016-03-14 13:37:10 -0400
commit: f2cf3f3028d4ca3c6496db961aec6a5b4fd01c6c (patch)
tree: 609233ddb6306737d861e60ca4b814eecd21ed95
parent: 45de75f1791a226304e8d566cb1b75a4cc9e92b3 (diff)
parent: b8d4af8d4ad5fba13faf76149e349a1ee04284b9 (diff)
download: qmk_firmware-f2cf3f3028d4ca3c6496db961aec6a5b4fd01c6c.tar.gz
qmk_firmware-f2cf3f3028d4ca3c6496db961aec6a5b4fd01c6c.zip
1 files changed, 8 insertions, 6 deletions
diff --git a/keyboard/planck/CYGWIN_GUIDE.md b/keyboard/planck/CYGWIN_GUIDE.md
index 0b08a6aa1..ac13e745d 100755
--- a/keyboard/planck/CYGWIN_GUIDE.md
+++ b/keyboard/planck/CYGWIN_GUIDE.md
@@ -17,6 +17,9 @@ Download the `cygwin` setup ([x86_64](https://cygwin.com/setup-x86_64.exe)) and
 - devel/make
 - devel/texinfo
 - devel/gettext-devel
+- devel/automake
+- devel/autoconfig
+- devel/libtool
 - text/gettext
 - libs/libgcc1
 - interpreters/m4
@@ -60,7 +63,7 @@ These commands will set up the install directory and the `PATH` variable, which
 $ PREFIX=$HOME/local/avr
 $ export PREFIX
 $ PATH=/usr/local/bin:/usr/local/lib:/usr/local/include:/bin:/lib:/cygdrive/c/WINDOWS/system32:/cygdrive/c/WINDOWS
-$ PATH=$PATH:$PREFIX/bin
+$ PATH=$PATH:$PREFIX/bin:$PREFIX/lib
 $ export PATH
 ```
@@ -155,13 +158,13 @@ $ make install
 We can either build our own, or use the precomplied binaries.  The precompiled binaries don't play well with `cygwin` so it is better to build them ourselves.  The procedure for the precompiled binaries is included at the end of this guide.
 ### Build and Install the `libusb`
-The `dfu-programmer` requires `libusb` so that it can interact with the USB system.
+The `dfu-programmer` requires `libusb` so that it can interact with the USB system. These repos must be bootstrapped in order to create an appropriate `./configure` and `Makefile` for your system.
 ```
 $ cd ~/src
 $ git clone https://github.com/libusb/libusb.git
 $ cd libusb
 $ ./bootstrap.sh
-$ ./configure --prefix=$PREFIX
+$ ./configure
 $ make
 $ make install
 ```
@@ -172,7 +175,7 @@ $ cd ~/src
 $ git clone https://github.com/dfu-programmer/dfu-programmer.git
 $ cd dfu-programmer
 $ ./bootstrap.sh
-$ ./configure --prefix=$PREFIX
+$ ./configure
 $ make
 $ make install
 ```
@@ -180,7 +183,7 @@ $ make install
 Verify the installation with:
 ```
 $ which dfu-programmer
-/home/Kevin/local/avr/bin/dfu-programmer
+/usr/local/bin/dfu-programmer
 $ dfu-programmer
 dfu-programmer 0.7.2
@@ -315,7 +318,6 @@ These tools are for debugging your firmware, etc. before flashing. Theoretically
 $ cd ~/src
 $ git clone git://sourceware.org/git/binutils-gdb.git
 $ cd binutils-gdb
-$ ./bootstrap
 $ mkdir obj-avr
 $ cd obj-avr
 $ ../configure --prefix=$PREFIX --target=avr --build=x86_64-unknown-cygwin --with-gmp=/usr/local --with-mpfr=/usr/local --with-mpc=/usr/local --disable-nls --enable-static
author	Jack Humbert <jack.humb@gmail.com>	2016-03-14 13:37:10 -0400
committer	Jack Humbert <jack.humb@gmail.com>	2016-03-14 13:37:10 -0400
commit	f2cf3f3028d4ca3c6496db961aec6a5b4fd01c6c (patch)
tree	609233ddb6306737d861e60ca4b814eecd21ed95
parent	45de75f1791a226304e8d566cb1b75a4cc9e92b3 (diff)
parent	b8d4af8d4ad5fba13faf76149e349a1ee04284b9 (diff)
download	qmk_firmware-f2cf3f3028d4ca3c6496db961aec6a5b4fd01c6c.tar.gz qmk_firmware-f2cf3f3028d4ca3c6496db961aec6a5b4fd01c6c.zip

diff --git a/keyboard/planck/CYGWIN_GUIDE.md b/keyboard/planck/CYGWIN_GUIDE.md index 0b08a6aa1..ac13e745d 100755 --- a/keyboard/planck/CYGWIN_GUIDE.md +++ b/keyboard/planck/CYGWIN_GUIDE.md
@@ -17,6 +17,9 @@ Download the `cygwin` setup ([x86_64](https://cygwin.com/setup-x86_64.exe)) and
17	- devel/make	17	- devel/make
18	- devel/texinfo	18	- devel/texinfo
19	- devel/gettext-devel	19	- devel/gettext-devel
		20	- devel/automake
		21	- devel/autoconfig
		22	- devel/libtool
20	- text/gettext	23	- text/gettext
21	- libs/libgcc1	24	- libs/libgcc1
22	- interpreters/m4	25	- interpreters/m4
@@ -60,7 +63,7 @@ These commands will set up the install directory and the `PATH` variable, which
60	$ PREFIX=$HOME/local/avr	63	$ PREFIX=$HOME/local/avr
61	$ export PREFIX	64	$ export PREFIX
62	$ PATH=/usr/local/bin:/usr/local/lib:/usr/local/include:/bin:/lib:/cygdrive/c/WINDOWS/system32:/cygdrive/c/WINDOWS	65	$ PATH=/usr/local/bin:/usr/local/lib:/usr/local/include:/bin:/lib:/cygdrive/c/WINDOWS/system32:/cygdrive/c/WINDOWS
63	$ PATH=$PATH:$PREFIX/bin	66	$ PATH=$PATH:$PREFIX/bin:$PREFIX/lib
64	$ export PATH	67	$ export PATH
65	```	68	```
66		69
@@ -155,13 +158,13 @@ $ make install
155	We can either build our own, or use the precomplied binaries. The precompiled binaries don't play well with `cygwin` so it is better to build them ourselves. The procedure for the precompiled binaries is included at the end of this guide.	158	We can either build our own, or use the precomplied binaries. The precompiled binaries don't play well with `cygwin` so it is better to build them ourselves. The procedure for the precompiled binaries is included at the end of this guide.
156		159
157	### Build and Install the `libusb`	160	### Build and Install the `libusb`
158	The `dfu-programmer` requires `libusb` so that it can interact with the USB system.	161	The `dfu-programmer` requires `libusb` so that it can interact with the USB system. These repos must be bootstrapped in order to create an appropriate `./configure` and `Makefile` for your system.
159	```	162	```
160	$ cd ~/src	163	$ cd ~/src
161	$ git clone https://github.com/libusb/libusb.git	164	$ git clone https://github.com/libusb/libusb.git
162	$ cd libusb	165	$ cd libusb
163	$ ./bootstrap.sh	166	$ ./bootstrap.sh
164	$ ./configure --prefix=$PREFIX	167	$ ./configure
165	$ make	168	$ make
166	$ make install	169	$ make install
167	```	170	```
@@ -172,7 +175,7 @@ $ cd ~/src
172	$ git clone https://github.com/dfu-programmer/dfu-programmer.git	175	$ git clone https://github.com/dfu-programmer/dfu-programmer.git
173	$ cd dfu-programmer	176	$ cd dfu-programmer
174	$ ./bootstrap.sh	177	$ ./bootstrap.sh
175	$ ./configure --prefix=$PREFIX	178	$ ./configure
176	$ make	179	$ make
177	$ make install	180	$ make install
178	```	181	```
@@ -180,7 +183,7 @@ $ make install
180	Verify the installation with:	183	Verify the installation with:
181	```	184	```
182	$ which dfu-programmer	185	$ which dfu-programmer
183	/home/Kevin/local/avr/bin/dfu-programmer	186	/usr/local/bin/dfu-programmer
184		187
185	$ dfu-programmer	188	$ dfu-programmer
186	dfu-programmer 0.7.2	189	dfu-programmer 0.7.2
@@ -315,7 +318,6 @@ These tools are for debugging your firmware, etc. before flashing. Theoretically
315	$ cd ~/src	318	$ cd ~/src
316	$ git clone git://sourceware.org/git/binutils-gdb.git	319	$ git clone git://sourceware.org/git/binutils-gdb.git
317	$ cd binutils-gdb	320	$ cd binutils-gdb
318	$ ./bootstrap
319	$ mkdir obj-avr	321	$ mkdir obj-avr
320	$ cd obj-avr	322	$ cd obj-avr
321	$ ../configure --prefix=$PREFIX --target=avr --build=x86_64-unknown-cygwin --with-gmp=/usr/local --with-mpfr=/usr/local --with-mpc=/usr/local --disable-nls --enable-static	323	$ ../configure --prefix=$PREFIX --target=avr --build=x86_64-unknown-cygwin --with-gmp=/usr/local --with-mpfr=/usr/local --with-mpc=/usr/local --disable-nls --enable-static