From d04a86b859e264802739f46e13963aa8a1930ecc Mon Sep 17 00:00:00 2001 From: bernat Date: Tue, 23 Feb 2021 17:29:35 +0100 Subject: [PATCH] Changing 4.24.3 to 4.26.1 --- PythonAPI/carla/setup.py | 2 -- Util/BuildTools/Windows.mk | 4 ++-- Util/Docker/Prerequisites.Dockerfile | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/PythonAPI/carla/setup.py b/PythonAPI/carla/setup.py index 9993bd692..26a2d7f53 100755 --- a/PythonAPI/carla/setup.py +++ b/PythonAPI/carla/setup.py @@ -98,8 +98,6 @@ def get_libcarla_extensions(): else: raise NotImplementedError elif os.name == "nt": - sources += [x for x in walk('dependencies/include/carla', '*.cpp')] - pwd = os.path.dirname(os.path.realpath(__file__)) pylib = 'libboost_python%d%d' % ( sys.version_info.major, diff --git a/Util/BuildTools/Windows.mk b/Util/BuildTools/Windows.mk index 78edbb38b..7704816f0 100644 --- a/Util/BuildTools/Windows.mk +++ b/Util/BuildTools/Windows.mk @@ -26,7 +26,7 @@ launch-only: @"${CARLA_BUILD_TOOLS_FOLDER}/BuildCarlaUE4.bat" --launch 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 docs: @@ -38,7 +38,7 @@ PythonAPI.docs: cd PythonAPI/docs && python bp_doc_gen.py 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}/BuildPythonAPI.bat" --clean @"${CARLA_BUILD_TOOLS_FOLDER}/BuildLibCarla.bat" --clean diff --git a/Util/Docker/Prerequisites.Dockerfile b/Util/Docker/Prerequisites.Dockerfile index 75d53e94b..c6b61037b 100644 --- a/Util/Docker/Prerequisites.Dockerfile +++ b/Util/Docker/Prerequisites.Dockerfile @@ -1,4 +1,4 @@ -ARG UE4_V=4.24.3 +ARG UE4_V=4.26.1 FROM adamrehn/ue4-source:${UE4_V}-opengl USER root