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

Changing 4.24.3 to 4.26.1

This commit is contained in:
bernat 2021-02-23 17:29:35 +01:00
parent 30f88cfb73
commit d04a86b859
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PythonAPI/carla/setup.py
View File

@ -98,8 +98,6 @@ def get_libcarla_extensions():
else: else:
raise NotImplementedError raise NotImplementedError
elif os.name == "nt": elif os.name == "nt":
sources += [x for x in walk('dependencies/include/carla', '*.cpp')]
pwd = os.path.dirname(os.path.realpath(__file__)) pwd = os.path.dirname(os.path.realpath(__file__))
pylib = 'libboost_python%d%d' % ( pylib = 'libboost_python%d%d' % (
sys.version_info.major, sys.version_info.major,

4
Util/BuildTools/Windows.mk
View File

@ -26,7 +26,7 @@ launch-only:
@"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.bat" --launch @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.bat" --launch
package: PythonAPI package: PythonAPI
@"${CARLA_BUILD_TOOLS_FOLDER}/Package.bat" --ue-version 4.24 $(ARGS) @"${CARLA_BUILD_TOOLS_FOLDER}/Package.bat" --ue-version 4.26 $(ARGS)
.PHONY: docs .PHONY: docs
docs: docs:
@ -38,7 +38,7 @@ PythonAPI.docs:
cd PythonAPI/docs && python bp_doc_gen.py cd PythonAPI/docs && python bp_doc_gen.py
clean: clean:
@"${CARLA_BUILD_TOOLS_FOLDER}/Package.bat" --clean --ue-version 4.24 @"${CARLA_BUILD_TOOLS_FOLDER}/Package.bat" --clean --ue-version 4.26
@"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.bat" --clean @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.bat" --clean
@"${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.bat" --clean @"${CARLA_BUILD_TOOLS_FOLDER}/BuildPythonAPI.bat" --clean
@"${CARLA_BUILD_TOOLS_FOLDER}/BuildLibCarla.bat" --clean @"${CARLA_BUILD_TOOLS_FOLDER}/BuildLibCarla.bat" --clean

2
Util/Docker/Prerequisites.Dockerfile
View File

@ -1,4 +1,4 @@
ARG UE4_V=4.24.3 ARG UE4_V=4.26.1
FROM adamrehn/ue4-source:${UE4_V}-opengl FROM adamrehn/ue4-source:${UE4_V}-opengl
USER root USER root