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

Remove Recast hash version

This commit is contained in:
bernatx 2023-10-23 16:32:29 +02:00
parent 9ad61979c7
commit ed2159fb0d
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Util/BuildTools/Setup.sh
View File

@ -277,7 +277,7 @@ unset GTEST_BASENAME
RECAST_HASH=ffdc02 RECAST_HASH=ffdc02
RECAST_COMMIT=ffdc02a0e807e76998a6313eeec00d2bd3176162 RECAST_COMMIT=ffdc02a0e807e76998a6313eeec00d2bd3176162
RECAST_BASENAME=recast-${RECAST_HASH}-${CXX_TAG} RECAST_BASENAME=recast-${CXX_TAG}
RECAST_INCLUDE=${PWD}/${RECAST_BASENAME}-install/include RECAST_INCLUDE=${PWD}/${RECAST_BASENAME}-install/include
RECAST_LIBPATH=${PWD}/${RECAST_BASENAME}-install/lib RECAST_LIBPATH=${PWD}/${RECAST_BASENAME}-install/lib
@ -297,7 +297,7 @@ else
pushd ${RECAST_BASENAME}-source >/dev/null pushd ${RECAST_BASENAME}-source >/dev/null
git reset --hard ${RECAST_COMMIT} git checkout carla
popd >/dev/null popd >/dev/null

8
Util/InstallersWin/install_recast.bat
View File

@ -40,11 +40,9 @@ rem If not set set the build dir to the current dir
if "%BUILD_DIR%" == "" set BUILD_DIR=%~dp0 if "%BUILD_DIR%" == "" set BUILD_DIR=%~dp0
if not "%BUILD_DIR:~-1%"=="\" set BUILD_DIR=%BUILD_DIR%\ if not "%BUILD_DIR:~-1%"=="\" set BUILD_DIR=%BUILD_DIR%\
set RECAST_HASH=ffdc02 set RECAST_SRC=recast-src
set RECAST_COMMIT=ffdc02a0e807e76998a6313eeec00d2bd3176162
set RECAST_SRC=recast-%RECAST_HASH%-src
set RECAST_SRC_DIR=%BUILD_DIR%%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_INSTALL_DIR=%BUILD_DIR%%RECAST_INSTALL%\
set RECAST_BUILD_DIR=%RECAST_SRC_DIR%build\ set RECAST_BUILD_DIR=%RECAST_SRC_DIR%build\
set RECAST_BASENAME=%RECAST_SRC% 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%" call git clone https://github.com/carla-simulator/recastnavigation.git "%RECAST_SRC_DIR:~0,-1%"
cd "%RECAST_SRC_DIR%" cd "%RECAST_SRC_DIR%"
call git reset --hard %RECAST_COMMIT% call git checkout carla
cd .. cd ..
if %errorlevel% neq 0 goto error_git if %errorlevel% neq 0 goto error_git
) else ( ) else (