From 960fac7e472b7c70ebfdc1498a673c4167475d4e Mon Sep 17 00:00:00 2001 From: bernatx Date: Tue, 10 Dec 2019 21:29:06 +0100 Subject: [PATCH] Last version of Recast --- TrafficManager/CMakeLists.txt | 4 ++-- Util/BuildTools/Setup.sh | 4 ++-- Util/InstallersWin/install_recast.bat | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/TrafficManager/CMakeLists.txt b/TrafficManager/CMakeLists.txt index 21eabeb99..e73c50040 100644 --- a/TrafficManager/CMakeLists.txt +++ b/TrafficManager/CMakeLists.txt @@ -15,12 +15,12 @@ set(CARLA_LOCATION $ENV{CARLA_LOCATION}) include_directories(source/pipeline/) include_directories(${LIBCARLA_LOCATION}/source/) include_directories(${CARLA_LOCATION}/Build/boost-1.69.0-c7-install/include) -include_directories(${CARLA_LOCATION}/Build/recast-e59fc7-c7-install/include) +include_directories(${CARLA_LOCATION}/Build/recast-cdce4e-c7-install/include) include_directories(${CARLA_LOCATION}/Build/rpclib-v2.2.1_c2-c7-libstdcxx-install/include) link_directories(${LIBCARLA_LOCATION}/lib/) link_directories(${CARLA_LOCATION}/Build/boost-1.69.0-c7-install/lib) -link_directories(${CARLA_LOCATION}/Build/recast-e59fc7-c7-install/lib) +link_directories(${CARLA_LOCATION}/Build/recast-cdce4e-c7-install/lib) link_directories(${CARLA_LOCATION}/Build/rpclib-v2.2.1_c2-c7-libstdcxx-install/lib) link_directories(${CARLA_LOCATION}/PythonAPI/carla/dependencies/lib) diff --git a/Util/BuildTools/Setup.sh b/Util/BuildTools/Setup.sh index 69078f679..53faec715 100755 --- a/Util/BuildTools/Setup.sh +++ b/Util/BuildTools/Setup.sh @@ -289,8 +289,8 @@ unset GTEST_BASENAME # -- Get Recast&Detour and compile it with libc++ ------------------------------ # ============================================================================== -RECAST_HASH=e59fc7 -RECAST_COMMIT=e59fc7edb7312e9468ad69b39d560de3c7d0c967 +RECAST_HASH=cdce4e +RECAST_COMMIT=cdce4e1a270fdf1f3942d4485954cc5e136df1df RECAST_BASENAME=recast-${RECAST_HASH}-${CXX_TAG} RECAST_INCLUDE=${PWD}/${RECAST_BASENAME}-install/include diff --git a/Util/InstallersWin/install_recast.bat b/Util/InstallersWin/install_recast.bat index c29262248..874a66f33 100644 --- a/Util/InstallersWin/install_recast.bat +++ b/Util/InstallersWin/install_recast.bat @@ -32,8 +32,8 @@ if not "%1"=="" ( goto :arg-parse ) -set RECAST_HASH=e59fc7 -set RECAST_COMMIT=e59fc7edb7312e9468ad69b39d560de3c7d0c967 +set RECAST_HASH=cdce4e +set RECAST_COMMIT=cdce4e1a270fdf1f3942d4485954cc5e136df1df set RECAST_SRC=recast-%RECAST_HASH%-src set RECAST_SRC_DIR=%BUILD_DIR%%RECAST_SRC%\ set RECAST_INSTALL=recast-%RECAST_HASH%-install