p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'windows_build' into Optimizations

This commit is contained in:
U-CVC\jbelon 2018-02-19 11:40:15 +01:00
parent 3c8f58d4db f38f71a2cb
commit 45ea4bc154
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Makefile
View File

@ -4,10 +4,16 @@ BASE_BUILD_FOLDER=$(CURDIR)/Util/Build/carlaserver-build
MY_CMAKE_FOLDER=$(CURDIR)/Util/cmake MY_CMAKE_FOLDER=$(CURDIR)/Util/cmake
MY_CMAKE_FLAGS=-B"$(BUILD_FOLDER)" -DCMAKE_INSTALL_PREFIX="$(INSTALL_FOLDER)" MY_CMAKE_FLAGS=-B"$(BUILD_FOLDER)" -DCMAKE_INSTALL_PREFIX="$(INSTALL_FOLDER)"
define log
@echo -- LOG [$(1)] '$($1)'
endef
ifeq ($(OS),Windows_NT) ifeq ($(OS),Windows_NT)
BUILD_RULE=build_windows BUILD_RULE=build_windows
CLEAN_RULE=clean_windows
PROTOC_COMPILE=cmd.exe /k "cd Util & call Protoc.bat & exit" PROTOC_COMPILE=cmd.exe /k "cd Util & call Protoc.bat & exit"
PROTOC_CLEAN=cmd.exe /k "cd Util & call Protoc.bat --clean & exit" PROTOC_CLEAN=cmd.exe /k "cd Util & call Protoc.bat --clean & exit"
RM=
else else
BUILD_RULE=build_linux BUILD_RULE=build_linux
PROTOC_COMPILE=./Util/Protoc.sh PROTOC_COMPILE=./Util/Protoc.sh
@ -26,6 +32,11 @@ release: BUILD_FOLDER=$(BASE_BUILD_FOLDER)/release
release: MY_CMAKE_FLAGS+=-DCMAKE_BUILD_TYPE=Release release: MY_CMAKE_FLAGS+=-DCMAKE_BUILD_TYPE=Release
release: $(BUILD_RULE) release: $(BUILD_RULE)
vsproject: BUILD_FOLDER=$(BASE_BUILD_FOLDER)/visualstudio
vsproject: MY_CMAKE_FLAGS+=-DCMAKE_BUILD_TYPE=Debug
vsproject: MY_CMAKE_FLAGS+=-G "Visual Studio 14 2015 Win64"
vsproject: call_cmake
build_linux: MY_CMAKE_FLAGS+=-G "Ninja" build_linux: MY_CMAKE_FLAGS+=-G "Ninja"
build_linux: call_cmake build_linux: call_cmake
@cd $(BUILD_FOLDER) && ninja && ninja install @cd $(BUILD_FOLDER) && ninja && ninja install
@ -34,13 +45,12 @@ build_windows: MY_CMAKE_FLAGS+=-G "NMake Makefiles"
build_windows: call_cmake build_windows: call_cmake
@cd $(BUILD_FOLDER) && nmake && nmake install @cd $(BUILD_FOLDER) && nmake && nmake install
vsproject: BUILD_FOLDER=$(BASE_BUILD_FOLDER)/visualstudio
vsproject: MY_CMAKE_FLAGS+=-DCMAKE_BUILD_TYPE=Debug
vsproject: MY_CMAKE_FLAGS+=-G "Visual Studio 14 2015 Win64"
vsproject: call_cmake
call_cmake: protobuf call_cmake: protobuf
ifeq ($(OS),Windows_NT)
-@mkdir "$(BUILD_FOLDER)"
else
@mkdir -p $(BUILD_FOLDER) @mkdir -p $(BUILD_FOLDER)
endif
@cd $(BUILD_FOLDER) && cmake $(MY_CMAKE_FLAGS) "$(MY_CMAKE_FOLDER)" @cd $(BUILD_FOLDER) && cmake $(MY_CMAKE_FLAGS) "$(MY_CMAKE_FOLDER)"
protobuf: protobuf:
@ -57,7 +67,11 @@ doxygen:
### Clean ###################################################################### ### Clean ######################################################################
clean: clean:
ifeq ($(OS),Windows_NT)
@rd /s /q "$(BASE_BUILD_FOLDER)" "$(INSTALL_FOLDER)"
else
@rm -Rf $(BASE_BUILD_FOLDER) $(INSTALL_FOLDER) Doxygen @rm -Rf $(BASE_BUILD_FOLDER) $(INSTALL_FOLDER) Doxygen
endif
@$(PROTOC_CLEAN) @$(PROTOC_CLEAN)
### Test ####################################################################### ### Test #######################################################################
@ -82,4 +96,4 @@ kill_test_clients:
@echo "Kill echo client" @echo "Kill echo client"
@kill `cat echo_client.pid` && rm echo_client.pid @kill `cat echo_client.pid` && rm echo_client.pid
@echo "Kill carla client" @echo "Kill carla client"
@kill `cat carla_client.pid` && rm carla_client.pid @kill `cat carla_client.pid` && rm carla_client.pid