Skip to content

Commit ee8db7e

Browse files
committed
Invoke fwfetcher.py with python2 - fixes #370
Refine README.md Signed-off-by: Benn Snyder <[email protected]>
1 parent 306ee84 commit ee8db7e

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,8 @@
3030
# CMake directives
3131
######################################################################################
3232

33-
#Require 2.6 or higher.
34-
3533
cmake_minimum_required(VERSION 2.6)
34+
set(PYTHON_EXECUTABLE "python2")
3635

3736
######################################################################################
3837
# Project declaration and options

OpenNI2-FreenectDriver/README.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ OpenNI2-FreenectDriver
44
OpenNI2-FreenectDriver is a bridge to libfreenect implemented as an OpenNI2 driver.
55
It allows OpenNI2 to use Kinect hardware on Linux and OSX.
66
It was originally a [separate project](https://github.com/piedar/OpenNI2-FreenectDriver) but is now distributed with libfreenect.
7-
OpenNI2-FreenectDriver is distributed under the Apache 2 license.
7+
OpenNI2-FreenectDriver is distributed under the [Apache 2](https://github.com/OpenKinect/libfreenect/blob/master/APACHE20) license.
88

99
Install
1010
-------
@@ -16,10 +16,13 @@ Install
1616
cmake .. -DBUILD_OPENNI2_DRIVER=ON
1717
make
1818

19-
3. Copy the driver to your OpenNI2 driver repository. You must change `Repository` to match your project layout.
19+
3. Copy the driver to your OpenNI2 driver repository. You must first change `Repository` to match your project layout.
2020

2121
Repository="/example/path/to/Samples/Bin/OpenNI2/Drivers/"
2222
cp -L lib/OpenNI2-FreenectDriver/libFreenectDriver.{so,dylib} ${Repository}
23+
24+
# you could instead make a symlink to avoid copying after every build
25+
# ln -s lib/OpenNI2-FreenectDriver/libFreenectDriver.{so,dylib} ${Repository}
2326

2427
OpenNI2-FreenectDriver is built with a static libfreenect, so you do not need to include libfreenect when deploying.
2528
However, you will need to make sure target systems have libusb and all other dependencies listed in `ldd libFreenectDriver.so`.

README.md

Lines changed: 18 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ libfreenect
22
===========
33

44
libfreenect is a userspace driver for the Microsoft Kinect.
5-
It runs on \*nix, OSX, and Windows and supports
5+
It runs on Linux, OSX, and Windows and supports
66

77
- RGB and Depth Images
88
- Motors
@@ -12,7 +12,7 @@ It runs on \*nix, OSX, and Windows and supports
1212
Audio is a work in progress.
1313

1414

15-
# Build Guide
15+
# Build Instructions
1616

1717
To build libfreenect, you'll need
1818

@@ -25,14 +25,19 @@ For the examples, you'll need
2525
- glut (included with OSX)
2626
- [pthreads-win32](http://sourceforge.net/projects/pthreads4w/) (Windows)
2727

28-
## Fetch & Build
28+
29+
## Fetch & Build <a name="fetch-build"></a>
2930

3031
git clone https://github.com/OpenKinect/libfreenect
3132
cd libfreenect
3233
mkdir build
3334
cd build
3435
cmake ..
35-
cmake --build .
36+
make
37+
38+
# if you don't have `make` or don't want color output
39+
# cmake --build .
40+
3641

3742
## OSX
3843

@@ -48,7 +53,9 @@ For a manual build, see [the wiki](http://openkinect.org/wiki/Getting_Started#Ma
4853
### MacPorts
4954

5055
sudo port install git-core cmake libusb libtool
51-
# GOTO: Fetch & Build
56+
57+
Continue with [Fetch & Build](#fetch-build).
58+
5259

5360
## Linux
5461

@@ -67,7 +74,7 @@ Continue with this section for a manual build.
6774
# only if you are building the examples:
6875
sudo apt-get install libglut3-dev libxmu-dev libxi-dev
6976

70-
# GOTO: Fetch & Build
77+
Continue with [Fetch & Build](#fetch-build).
7178

7279
There is also a [debian branch](https://github.com/OpenKinect/libfreenect/tree/debian) for packaging purposes.
7380

@@ -83,7 +90,7 @@ There is a [libfreenect-git](https://aur.archlinux.org/packages/libfreenect-git/
8390
## Windows
8491

8592
The inf files in [platform/windows/](https://github.com/OpenKinect/libfreenect/tree/master/platform/windows) may be used for installing the device.
86-
Follow **Fetch & Build** or use Github and CMake GUI tools.
93+
Follow [Fetch & Build](#fetch-build) or use Github and CMake GUI tools.
8794
You may need to supply paths to CMake so it can find dependencies.
8895
For example:
8996

@@ -152,19 +159,10 @@ of either License.
152159

153160
# More Information
154161

155-
Information about the OpenKinect project can be found at
156-
157-
http://www.openkinect.org
158-
159-
For questions, support, and discussion, check out the google groups
160-
mailing list at
161-
162-
http://groups.google.com/group/openkinect
163-
164-
Or the IRC channel at
162+
Information about the OpenKinect project can be found at http://www.openkinect.org
165163

166-
\#openkinect on Freenode
164+
For questions, support, and discussion, check out the google groups mailing list at http://groups.google.com/group/openkinect
167165

168-
We are also on twitter at
166+
Or the IRC channel at \#openkinect on [Freenode](http://freenode.net/)
169167

170-
http://twitter.com/openkinect
168+
We are also on twitter at http://twitter.com/openkinect

src/fwfetcher.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#!/usr/bin/env python
1+
#!/usr/bin/env python2
22

33
from urllib2 import Request, urlopen, URLError
44
import hashlib

0 commit comments

Comments
 (0)