File tree Expand file tree Collapse file tree 2 files changed +6
-10
lines changed Expand file tree Collapse file tree 2 files changed +6
-10
lines changed Original file line number Diff line number Diff line change @@ -331,9 +331,7 @@ unset GTEST_BASENAME
331
331
# -- Get Recast&Detour and compile it with libc++ ------------------------------
332
332
# ==============================================================================
333
333
334
- RECAST_HASH=0b13b0
335
- RECAST_COMMIT=0b13b0d288ac96fdc5347ee38299511c6e9400db
336
- RECAST_BASENAME=recast-${RECAST_HASH} -${CXX_TAG}
334
+ RECAST_BASENAME=recast-${CXX_TAG}
337
335
338
336
RECAST_INCLUDE=${PWD} /${RECAST_BASENAME} -install/include
339
337
RECAST_LIBPATH=${PWD} /${RECAST_BASENAME} -install/lib
353
351
354
352
pushd ${RECAST_BASENAME} -source > /dev/null
355
353
356
- git reset --hard ${RECAST_COMMIT}
354
+ git checkout carla
357
355
358
356
popd > /dev/null
359
357
@@ -794,7 +792,7 @@ if ${USE_PYTORCH} ; then
794
792
cp -p ${LIBTORCH_LIB} /* .so* ${LIBCARLA_INSTALL_SERVER_FOLDER} /lib/
795
793
cp -p ${LIBTORCHSCATTER_LIB} /* .so ${LIBCARLA_INSTALL_SERVER_FOLDER} /lib/
796
794
cp -p ${LIBTORCHCLUSTER_LIB} /* .so ${LIBCARLA_INSTALL_SERVER_FOLDER} /lib/
797
-
795
+
798
796
mkdir -p ${CARLAUE4_PLUGIN_ROOT_FOLDER} /Binaries/Linux/
799
797
cp -p ${LIBTORCH_LIB} /* .so* ${CARLAUE4_PLUGIN_ROOT_FOLDER} /Binaries/Linux/
800
798
cp -p ${LIBTORCHSCATTER_LIB} /* .so* ${CARLAUE4_PLUGIN_ROOT_FOLDER} /Binaries/Linux/
Original file line number Diff line number Diff line change @@ -35,11 +35,9 @@ rem If not set set the build dir to the current dir
35
35
if " %BUILD_DIR% " == " " set BUILD_DIR = %~dp0
36
36
if not " %BUILD_DIR:~-1 % " == " \" set BUILD_DIR = %BUILD_DIR% \
37
37
38
- set RECAST_HASH = 0b13b0
39
- set RECAST_COMMIT = 0b13b0d288ac96fdc5347ee38299511c6e9400db
40
- set RECAST_SRC = recast-%RECAST_HASH% -src
38
+ set RECAST_SRC = recast-src
41
39
set RECAST_SRC_DIR = %BUILD_DIR%%RECAST_SRC% \
42
- set RECAST_INSTALL = recast-%RECAST_HASH% - install
40
+ set RECAST_INSTALL = recast-install
43
41
set RECAST_INSTALL_DIR = %BUILD_DIR%%RECAST_INSTALL% \
44
42
set RECAST_BUILD_DIR = %RECAST_SRC_DIR% build\
45
43
set RECAST_BASENAME = %RECAST_SRC%
@@ -53,7 +51,7 @@ if not exist "%RECAST_SRC_DIR%" (
53
51
54
52
call git clone https://github.com/carla-simulator/recastnavigation.git " %RECAST_SRC_DIR:~0 ,-1 % "
55
53
cd " %RECAST_SRC_DIR% "
56
- call git reset --hard %RECAST_COMMIT%
54
+ call git checkout carla
57
55
cd ..
58
56
if %errorlevel% neq 0 goto error_git
59
57
) else (
You can’t perform that action at this time.
0 commit comments