From 246488db857974167f9c49227f613075cc6f0aaf Mon Sep 17 00:00:00 2001 From: nsubiron Date: Thu, 14 Jun 2018 11:31:16 +0200 Subject: [PATCH] Change Discord links so they go directly to the relevant channel --- Docs/how_to_build_on_windows.md | 14 +++++++------- README.md | 2 +- Setup.bat | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Docs/how_to_build_on_windows.md b/Docs/how_to_build_on_windows.md index 2b4e3b930..2fa2407f5 100644 --- a/Docs/how_to_build_on_windows.md +++ b/Docs/how_to_build_on_windows.md @@ -15,7 +15,7 @@ Also:

Environment Setup

In order to build CARLA you must **enable the x64 Visual C++ Toolset**. -I recommend to use this environment for everything you do in this tutorial. +I recommend to use this environment for everything you do in this tutorial. You have different options: - **Recomended:** Use [`Visual Studio x64 Native Tools Command Prompt`](https://docs.microsoft.com/en-us/dotnet/framework/tools/developer-command-prompt-for-vs). Just press the `Win` button and search for `x64`, because the name of this Command Prompt can change depending on the lenguage you have installed Visual Studio. @@ -35,7 +35,7 @@ cd carla ``` # Automatic installation -Once you have downloaded the repo you can start with the automatic installation. +Once you have downloaded the repo you can start with the automatic installation. This process may take a while, it will download and install the necessary Boost and Protobuf libraries. Expect 20-40 minutes, depending on your hardware and internet connection. Script | Use @@ -48,13 +48,13 @@ Script | Use Setup.bat -j 8 --boost-toolset msvc-14.1 - `-j n` will try to parallelize the git download and NMake compilation. If not specified, no optimization will be made. + `-j n` will try to parallelize the git download and NMake compilation. If not specified, no optimization will be made. To see available commands, like which `--boost-toolset` you have to use depending on your Visual Studio version, use: Setup.bat --help -1. When it's done, and if everything went well, `Setup.bat` will provide a link where you can download the assets manually. If you get some errors you can try the **Manual Installation**, open a new issue on [GitHub](https://github.com/carla-simulator/carla/issues/) or just ask on the Windows [Discord](https://discord.gg/vNVHXfb) channel. +1. When it's done, and if everything went well, `Setup.bat` will provide a link where you can download the assets manually. If you get some errors you can try the **Manual Installation**, open a new issue on [GitHub](https://github.com/carla-simulator/carla/issues/) or just ask on the [Windows Discord channel](https://discord.gg/42KJdRj). 1. Unzip these assets into `Unreal/CarlaUE4/Content`. Create it if the folder is not there. @@ -86,7 +86,7 @@ Download and build **for win64**: - Protobuf 3.3.2

Building Boost for CARLA

-Follow the official documentatio to compile boost. +Follow the official documentation to compile boost. Put the generated binaries in `Util/Build/boost-install`: ```c @@ -136,10 +136,10 @@ If you have done everything alright, **carla server** must be installed successf

Launch Unreal Engine

Double click `Unreal/CarlaUE4/CarlaUE4.uproject` and it will ask you to rebuild: - + UE4Editor-CarlaUE4.dll UE4Editor-Carla.dll - + Agree.

Compilation failures

diff --git a/README.md b/README.md index 7ad9b9989..d324ab098 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ CARLA Simulator [![carla.org](Docs/img/btn/web.png)](http://carla.org) [![download](Docs/img/btn/download.png)](https://github.com/carla-simulator/carla/releases/latest) [![documentation](Docs/img/btn/docs.png)](http://carla.readthedocs.io) -[![discord](Docs/img/btn/chat.png)](https://discord.gg/vNVHXfb) +[![discord](Docs/img/btn/chat.png)](https://discord.gg/8kqACuC) CARLA is an open-source simulator for autonomous driving research. CARLA has diff --git a/Setup.bat b/Setup.bat index c3cc22632..0fb41060b 100644 --- a/Setup.bat +++ b/Setup.bat @@ -130,7 +130,7 @@ goto success echo. echo - Or just use our Discord channel! echo We'll be glad to help you there :) - echo https://discord.gg/vNVHXfb + echo https://discord.gg/42KJdRj goto eof