Skip to content

Commit

Permalink
Require the user to download eigen instead of including it. This is m…
Browse files Browse the repository at this point in the history
…ore for commit readibility than for keeping the repo small.
  • Loading branch information
cboulay committed Aug 17, 2015
1 parent 0063b78 commit 4d41ec5
Show file tree
Hide file tree
Showing 444 changed files with 23 additions and 137,780 deletions.
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ build*
bindings/processing
external/opencv
external/libusb*
external/SDL2
external/SDL2
external/eigen
4 changes: 2 additions & 2 deletions README.osx
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ You will need...
... to install Homebrew: http://mxcl.github.com/homebrew/
$ ruby -e "$(curl -fsSL https://raw.github.com/Homebrew/homebrew/go/install)"
$ brew doctor
... to install cmake, and git from Homebrew
$ brew install cmake git
... to install cmake, mercurial, and git from Homebrew
$ brew install cmake hg git
… to download and install Doxygen (http://www.stack.nl/~dimitri/doxygen/download.html#latestsrc) to generate the documentation (optional)


Expand Down
19 changes: 13 additions & 6 deletions README.win64_msvc
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,19 @@ Requirements
http://www.cmake.org/cmake/resources/software.html
- Git
http://code.google.com/p/msysgit/
- Mercurial
https://mercurial.selenic.com/wiki/Download

1. Clone the PS Move API repository
`git clone --recursive https://github.com/cboulay/psmoveapi.git`
`cd psmoveapi`

2. Build libusb-1.0
2. Eigen
Required - Necessary for orientation algorithms
`cd external`
`hg clone https://bitbucket.org/eigen/eigen`

3. Build libusb-1.0
Optional - Only required if you are building the positional tracker.
Open psmoveapi\external\libusb-1.0\msvc\libusb_2013.sln
Change the target to Release x64 (at the top of the Visual Studio window).
Expand All @@ -23,7 +30,7 @@ Requirements
Click OK
Right-click on libusb-1.0 (static) and Build.

3. OpenCV
4. OpenCV
Optional - Only required if you are building the positional tracker.
Still in `psmoveapi/external`
`git clone --depth 1 --branch 2.4.11 git://github.com/Itseez/opencv.git`
Expand All @@ -38,7 +45,7 @@ Requirements

Note: OpenCV 2.4.11 is required only for MSVC builds of the psmoveapi; Linux and Mac builds of the psmoveapi require OpenCV 3.

4. SDL2
5. SDL2
Optional - Only required if you are building the OpenGL examples.
Still in `psmoveapi/external`
`cd SDL2`
Expand All @@ -50,7 +57,7 @@ Requirements
Change the target to Release (at the top of the VS window).
Build the solution (Press F7).

4. Build psmoveapi
6. Build psmoveapi

Still in the VS2013 command prompt:

Expand All @@ -64,9 +71,9 @@ Requirements
Change the target to Release.
Build the solution (Press F7).

5. Read [this Wiki](https://github.com/cboulay/psmove-ue4/wiki) for windows-specific information on pairing and connecting the psmove controller and on using the PS3Eye camera.
7. Read [this Wiki](https://github.com/cboulay/psmove-ue4/wiki) for windows-specific information on pairing and connecting the psmove controller and on using the PS3Eye camera.

6. Start one of the desired test applications
8. Start one of the desired test applications

If you previously chose to build the example applications (which is the
default), you can then run
Expand Down
6 changes: 6 additions & 0 deletions contrib/build-osx-snapshot
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ if [ ! -f $PSMOVEAPI_CHECKOUT/CMakeLists.txt ]; then
exit 1
fi

# Download the eigen library needed for orientation estimation
(
cd $PSMOVEAPI_CHECKOUT/external
hg clone https://bitbucket.org/eigen/eigen
)

# Build libusb-1.0 as universal static library
# needed for the PS3EYEDriver to access the PSEye
# otherwise we'd dynamically link against some the Homebrew libusb
Expand Down
26 changes: 0 additions & 26 deletions external/eigen/COPYING.BSD

This file was deleted.

Loading

0 comments on commit 4d41ec5

Please sign in to comment.