Merge remote-tracking branch 'origin/master' into Optimizations
This commit is contained in:
CVC\jbelon
commit
42d5127c99
|
|
@ -28,7 +28,7 @@ Please check first the list of [feature requests][frlink]. If it is not there
|
|||
and you think is a feature that might be interesting for users, please submit
|
||||
your request as a new issue.
|
||||
|
||||
[frlink]: https://github.com/carla-simulator/carla/issues?q=is%3Aissue+is%3Aopen+label%3A%22feature+request%22
|
||||
[frlink]: https://github.com/carla-simulator/carla/issues?q=is%3Aissue+is%3Aopen+label%3A%22feature+request%22+sort%3Acomments-desc
|
||||
|
||||
Improving documentation
|
||||
-----------------------
|
||||
|
|
@ -55,13 +55,13 @@ Code contributions
|
|||
So you are considering making a code contribution, great! we love to have
|
||||
contributions from the community.
|
||||
|
||||
Before starting hands-on on coding, please check out the
|
||||
[projects page][projectslink] to see if we are already working on that, it would
|
||||
Before starting hands-on on coding, please check out our
|
||||
[issue board][wafflelink] to see if we are already working on that, it would
|
||||
be a pity putting an effort into something just to discover that someone else
|
||||
was already working on that. In case of doubt or to discuss how to proceed,
|
||||
please contact one of us (or send an email to carla.simulator@gmail.com).
|
||||
|
||||
[projectslink]: https://github.com/carla-simulator/carla/projects/1
|
||||
[wafflelink]: https://waffle.io/carla-simulator/carla
|
||||
|
||||
#### Where can I learn more about Unreal Engine?
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,14 @@ Thanks for contributing to CARLA!
|
|||
|
||||
If you are asking a question please make sure your question was not asked before
|
||||
by searching among the existing issues. Also make sure you have read our
|
||||
documentation and FAQ at carla.readthedocs.io.
|
||||
documentation and FAQ at http://carla.readthedocs.io.
|
||||
|
||||
If your question is about creating content (assets, levels) you'll most likely
|
||||
have all the info you need in the Unreal Engine's documentation
|
||||
https://docs.unrealengine.com
|
||||
|
||||
Please, keep the threads focused and single-themed. Make them easy to find
|
||||
for everyone.
|
||||
|
||||
If you are reporting an issue, please provide the CARLA version number you are
|
||||
using and your Platform/OS.
|
||||
|
|
|
|||
36
Makefile
36
Makefile
|
|
@ -4,18 +4,16 @@ BASE_BUILD_FOLDER=$(CURDIR)/Util/Build/carlaserver-build
|
|||
MY_CMAKE_FOLDER=$(CURDIR)/Util/cmake
|
||||
MY_CMAKE_FLAGS=-B"$(BUILD_FOLDER)" -DCMAKE_INSTALL_PREFIX="$(INSTALL_FOLDER)"
|
||||
|
||||
define log
|
||||
@echo -- LOG [$(1)] '$($1)'
|
||||
endef
|
||||
|
||||
ifeq ($(OS),Windows_NT)
|
||||
BUILD_RULE=build_windows
|
||||
CLEAN_RULE=clean_windows
|
||||
CALL_CMAKE_RULE=call_cmake_windows
|
||||
PROTOC_COMPILE=cmd.exe /k "cd Util & call Protoc.bat & exit"
|
||||
PROTOC_CLEAN=cmd.exe /k "cd Util & call Protoc.bat --clean & exit"
|
||||
RM=
|
||||
else
|
||||
BUILD_RULE=build_linux
|
||||
CLEAN_RULE=clean_linux
|
||||
CALL_CMAKE_RULE=call_cmake_linux
|
||||
PROTOC_COMPILE=./Util/Protoc.sh
|
||||
PROTOC_CLEAN=./Util/Protoc.sh --clean
|
||||
endif
|
||||
|
|
@ -33,7 +31,7 @@ release: MY_CMAKE_FLAGS+=-DCMAKE_BUILD_TYPE=Release
|
|||
release: $(BUILD_RULE)
|
||||
|
||||
vsproject: BUILD_FOLDER=$(BASE_BUILD_FOLDER)/visualstudio
|
||||
vsproject: MY_CMAKE_FLAGS+=-DCMAKE_BUILD_TYPE=Debug
|
||||
vsproject: MY_CMAKE_FLAGS+=-DCMAKE_BUILD_TYPE=Release
|
||||
vsproject: MY_CMAKE_FLAGS+=-G "Visual Studio 14 2015 Win64"
|
||||
vsproject: call_cmake
|
||||
|
||||
|
|
@ -45,17 +43,18 @@ build_windows: MY_CMAKE_FLAGS+=-G "NMake Makefiles"
|
|||
build_windows: call_cmake
|
||||
@cd $(BUILD_FOLDER) && nmake && nmake install
|
||||
|
||||
call_cmake: protobuf
|
||||
ifeq ($(OS),Windows_NT)
|
||||
-@mkdir "$(BUILD_FOLDER)"
|
||||
else
|
||||
@mkdir -p $(BUILD_FOLDER)
|
||||
endif
|
||||
call_cmake: protobuf $(CALL_CMAKE_RULE)
|
||||
@cd $(BUILD_FOLDER) && cmake $(MY_CMAKE_FLAGS) "$(MY_CMAKE_FOLDER)"
|
||||
|
||||
protobuf:
|
||||
@$(PROTOC_COMPILE)
|
||||
|
||||
call_cmake_linux:
|
||||
@mkdir -p $(BUILD_FOLDER)
|
||||
|
||||
call_cmake_windows:
|
||||
-@mkdir "$(BUILD_FOLDER)"
|
||||
|
||||
### Docs #######################################################################
|
||||
|
||||
docs: doxygen
|
||||
|
|
@ -66,14 +65,15 @@ doxygen:
|
|||
|
||||
### Clean ######################################################################
|
||||
|
||||
clean:
|
||||
ifeq ($(OS),Windows_NT)
|
||||
@rd /s /q "$(BASE_BUILD_FOLDER)" "$(INSTALL_FOLDER)"
|
||||
else
|
||||
@rm -Rf $(BASE_BUILD_FOLDER) $(INSTALL_FOLDER) Doxygen
|
||||
endif
|
||||
clean: $(CLEAN_RULE)
|
||||
@$(PROTOC_CLEAN)
|
||||
|
||||
clean_linux:
|
||||
@rm -Rf $(BASE_BUILD_FOLDER) $(INSTALL_FOLDER) Doxygen
|
||||
|
||||
clean_windows:
|
||||
-@rd /s /q "$(BASE_BUILD_FOLDER)" "$(INSTALL_FOLDER)" Doxygen 2>nul
|
||||
|
||||
### Test #######################################################################
|
||||
|
||||
check: debug launch_test_clients run_test_debug kill_test_clients
|
||||
|
|
|
|||
|
|
@ -7,9 +7,9 @@ set PROTO_BASENAME=carla_server
|
|||
|
||||
if "%1" == "--clean" (
|
||||
rem Delete existing ones.
|
||||
rm -f %PROTOBUF_CPP_OUT_DIR%/carla_server.pb.h
|
||||
rm -f %PROTOBUF_CPP_OUT_DIR%/carla_server.pb.cc
|
||||
rm -f %PROTOBUF_PY_OUT_DIR%/carla_server_pb2.py
|
||||
@rd /s /q "%PROTOBUF_CPP_OUT_DIR%\carla_server.pb.h" 2>nul
|
||||
@rd /s /q "%PROTOBUF_CPP_OUT_DIR%\carla_server.pb.cc" 2>nul
|
||||
@rd /s /q "%PROTOBUF_PY_OUT_DIR%\carla_server_pb2.py" 2>nul
|
||||
goto end
|
||||
)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue