diff --git a/README.md b/README.md index f6be27099..07f5ab1a5 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,15 @@ Self-Driving Car Engineer Nanodegree Program * Linux: gcc / g++ is installed by default on most Linux distros * Mac: same deal as make - [install Xcode command line tools]((https://developer.apple.com/xcode/features/) * Windows: recommend using [MinGW](http://www.mingw.org/) -* [uWebSockets](https://github.com/uWebSockets/uWebSockets) == 0.14, but the master branch will probably work just fine - * Follow the instructions in the [uWebSockets README](https://github.com/uWebSockets/uWebSockets/blob/master/README.md) to get setup for your platform. You can download the zip of the appropriate version from the [releases page](https://github.com/uWebSockets/uWebSockets/releases). Here's a link to the [v0.14 zip](https://github.com/uWebSockets/uWebSockets/archive/v0.14.0.zip). - * If you have MacOS and have [Homebrew](https://brew.sh/) installed you can just run the ./install-mac.sh script to install this. +* [uWebSockets](https://github.com/uWebSockets/uWebSockets) + * Run either `install_uwebsockets_mac.sh` or `install_uwebsockets_ubuntu.sh`. + * If you install from source, checkout to commit `e94b6e1`, i.e. + ``` + git clone https://github.com/uWebSockets/uWebSockets + cd uWebSockets + git checkout e94b6e1 + ``` + Some function signatures have changed in v0.14.x. See [this PR](https://github.com/udacity/CarND-MPC-Project/pull/3) for more details. * Fortran Compiler * Mac: `brew install gcc` (might not be required) * Linux: `sudo apt-get install gfortran`. Additionall you have also have to install gcc and g++, `sudo apt-get install gcc g++`. Look in [this Dockerfile](https://github.com/udacity/CarND-MPC-Quizzes/blob/master/Dockerfile) for more info. diff --git a/install-mac.sh b/install_uwebsockets_mac.sh similarity index 93% rename from install-mac.sh rename to install_uwebsockets_mac.sh index 1ccf2b0a4..97e0b3765 100755 --- a/install-mac.sh +++ b/install_uwebsockets_mac.sh @@ -2,7 +2,7 @@ brew install openssl libuv cmake zlib git clone https://github.com/uWebSockets/uWebSockets cd uWebSockets -# git checkout e94b6e1 +git checkout e94b6e1 patch CMakeLists.txt < ../cmakepatch.txt mkdir build export PKG_CONFIG_PATH=/usr/local/opt/openssl/lib/pkgconfig diff --git a/install-ubuntu.sh b/install_uwebsockets_ubuntu.sh similarity index 91% rename from install-ubuntu.sh rename to install_uwebsockets_ubuntu.sh index 760def752..f281722b9 100755 --- a/install-ubuntu.sh +++ b/install_uwebsockets_ubuntu.sh @@ -2,7 +2,7 @@ sudo apt-get install libuv1-dev git clone https://github.com/uWebSockets/uWebSockets cd uWebSockets -# git checkout e94b6e1 +git checkout e94b6e1 mkdir build cd build cmake ..