From ed2159fb0d82da2fc9233c4721d144554a3881ee Mon Sep 17 00:00:00 2001
From: bernatx <bernatx@gmail.com>
Date: Mon, 23 Oct 2023 16:32:29 +0200
Subject: [PATCH] Remove Recast hash version

---
 Util/BuildTools/Setup.sh              | 4 ++--
 Util/InstallersWin/install_recast.bat | 8 +++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/Util/BuildTools/Setup.sh b/Util/BuildTools/Setup.sh
index 073f6662f..5785b90c3 100755
--- a/Util/BuildTools/Setup.sh
+++ b/Util/BuildTools/Setup.sh
@@ -277,7 +277,7 @@ unset GTEST_BASENAME
 
 RECAST_HASH=ffdc02
 RECAST_COMMIT=ffdc02a0e807e76998a6313eeec00d2bd3176162
-RECAST_BASENAME=recast-${RECAST_HASH}-${CXX_TAG}
+RECAST_BASENAME=recast-${CXX_TAG}
 
 RECAST_INCLUDE=${PWD}/${RECAST_BASENAME}-install/include
 RECAST_LIBPATH=${PWD}/${RECAST_BASENAME}-install/lib
@@ -297,7 +297,7 @@ else
 
   pushd ${RECAST_BASENAME}-source >/dev/null
 
-  git reset --hard ${RECAST_COMMIT}
+  git checkout carla
 
   popd >/dev/null
 
diff --git a/Util/InstallersWin/install_recast.bat b/Util/InstallersWin/install_recast.bat
index 808de6f72..74257a91b 100644
--- a/Util/InstallersWin/install_recast.bat
+++ b/Util/InstallersWin/install_recast.bat
@@ -40,11 +40,9 @@ rem If not set set the build dir to the current dir
 if "%BUILD_DIR%" == "" set BUILD_DIR=%~dp0
 if not "%BUILD_DIR:~-1%"=="\" set BUILD_DIR=%BUILD_DIR%\
 
-set RECAST_HASH=ffdc02
-set RECAST_COMMIT=ffdc02a0e807e76998a6313eeec00d2bd3176162
-set RECAST_SRC=recast-%RECAST_HASH%-src
+set RECAST_SRC=recast-src
 set RECAST_SRC_DIR=%BUILD_DIR%%RECAST_SRC%\
-set RECAST_INSTALL=recast-%RECAST_HASH%-install
+set RECAST_INSTALL=recast-install
 set RECAST_INSTALL_DIR=%BUILD_DIR%%RECAST_INSTALL%\
 set RECAST_BUILD_DIR=%RECAST_SRC_DIR%build\
 set RECAST_BASENAME=%RECAST_SRC%
@@ -58,7 +56,7 @@ if not exist "%RECAST_SRC_DIR%" (
 
     call git clone https://github.com/carla-simulator/recastnavigation.git "%RECAST_SRC_DIR:~0,-1%"
     cd "%RECAST_SRC_DIR%"
-    call git reset --hard %RECAST_COMMIT%
+    call git checkout carla
     cd ..
     if %errorlevel% neq 0 goto error_git
 ) else (