diff --git a/android/sharedCode/CMakeLists.txt b/android/sharedCode/CMakeLists.txt index 9bc5162d7..4d0b632a3 100644 --- a/android/sharedCode/CMakeLists.txt +++ b/android/sharedCode/CMakeLists.txt @@ -461,10 +461,15 @@ set_target_properties( lib-LinearMath # before building ViroCore. It is OPTIONAL: open-source builds without the .so # compile stub implementations that report the feature as unavailable. # -# To enable: run reactvisioncca/scripts/build_android.sh and copy the .so files +# To enable: run spatial/scripts/build_android.sh and copy the .so files # to android/sharedCode/src/main/jniLibs/{abi}/ before building ViroCore. +# The sibling checkout is spatial/ (the repo's name); reactvisioncca/ is the +# folder's old name, still found so a checkout that kept it keeps building. -set(RVCCA_DIR "${CMAKE_SOURCE_DIR}/../../../reactvisioncca") +set(RVCCA_DIR "${CMAKE_SOURCE_DIR}/../../../spatial") +if(NOT EXISTS "${RVCCA_DIR}/include" AND EXISTS "${CMAKE_SOURCE_DIR}/../../../reactvisioncca/include") + set(RVCCA_DIR "${CMAKE_SOURCE_DIR}/../../../reactvisioncca") +endif() set(RVCCA_SO "${VIRO_ANDROID_LIBS}/${ANDROID_ABI}/libreactvisioncca.so") set(RVCCA_HDR "${RVCCA_DIR}/include/ReactVisionCCA/RVCCACloudAnchorProvider.h") diff --git a/ios/ViroKit/VROCloudAnchorProviderReactVision.mm b/ios/ViroKit/VROCloudAnchorProviderReactVision.mm index c866e25cb..7db97b235 100644 --- a/ios/ViroKit/VROCloudAnchorProviderReactVision.mm +++ b/ios/ViroKit/VROCloudAnchorProviderReactVision.mm @@ -19,8 +19,8 @@ // Detect ReactVisionCCA availability at compile time. // The build_ios.sh script deploys libreactvisioncca.a to // virocore/ios/Libraries/reactvisioncca/{arch}/ -// and the headers live in reactvisioncca/include/ (sibling repo). -// HEADER_SEARCH_PATHS includes $(SRCROOT)/../../reactvisioncca/include so +// and the headers live in spatial/include/ (sibling repo; reactvisioncca/ is its old name). +// HEADER_SEARCH_PATHS includes $(SRCROOT)/../../spatial/include (and the old name) so // __has_include returns true only when the SDK is actually present. #if __has_include("ReactVisionCCA/RVCCACloudAnchorProvider.h") # define RVCCA_AVAILABLE 1 diff --git a/ios/ViroRenderer.xcodeproj/project.pbxproj b/ios/ViroRenderer.xcodeproj/project.pbxproj index 074637196..65a8948d7 100644 --- a/ios/ViroRenderer.xcodeproj/project.pbxproj +++ b/ios/ViroRenderer.xcodeproj/project.pbxproj @@ -5696,6 +5696,7 @@ "$(SRCROOT)/Libraries/bullet/include", "$(SRCROOT)/Libraries/harfbuzz/include", "$(SRCROOT)/../ViroRenderer/", + "$(SRCROOT)/../../spatial/include", "$(SRCROOT)/../../reactvisioncca/include", ); IPHONEOS_DEPLOYMENT_TARGET = 10.0; @@ -5757,6 +5758,7 @@ "$(SRCROOT)/Libraries/bullet/include", "$(SRCROOT)/Libraries/harfbuzz/include", "$(SRCROOT)/../ViroRenderer/", + "$(SRCROOT)/../../spatial/include", "$(SRCROOT)/../../reactvisioncca/include", ); IPHONEOS_DEPLOYMENT_TARGET = 10.0; diff --git a/ios/build_visionos.sh b/ios/build_visionos.sh index 899ac4773..41cc91637 100755 --- a/ios/build_visionos.sh +++ b/ios/build_visionos.sh @@ -192,7 +192,7 @@ VENDORED_LIBS=( "bullet/%s/libLinearMath.a" "bullet/%s/libBulletCollision.a" "bullet/%s/libBulletDynamics.a" - # ReactVisionCCA, built by reactvisioncca/scripts/build_ios.sh with RVCCA_BUILD_VISIONOS=1. + # Spatial (libreactvisioncca), built by spatial/scripts/build_ios.sh with RVCCA_BUILD_VISIONOS=1. # Not optional here the way it is on iOS: VROColocationSession.o lives in this target and is # pulled into every link by -ObjC, so without these slices an app fails to link on a symbol # it never asked for.