android link

BabylonJS · Sep 25, 2023 · cfa7fac · cfa7fac
1 parent 644453c
commit cfa7fac
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 8 deletions.
diff --git a/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt b/Modules/@babylonjs/react-native-iosandroid/android/CMakeLists.txt
@@ -58,6 +58,8 @@ add_library(BabylonNative SHARED
 
 if (${BASEKIT_BUILD})
     target_compile_definitions(BabylonNative PRIVATE BASEKIT_BUILD=1)
+else()
+    set(ADDITIONAL_LIBRARIES PRIVATE NativeXr NativeCamera)
 endif()
 
 set(TURBOMODULE_DIR "${REACTNATIVE_DIR_CMAKE}/ReactAndroid/src/main/jni/react/turbomodule/")
@@ -152,8 +154,7 @@ if (EXISTS "${TURBOMODULE_DIR}/CMakeLists.txt")
         Window
         XMLHttpRequest
         Canvas
-        NativeXr
-        NativeCamera)
+        ${ADDITIONAL_LIBRARIES})
 
     # We use an interface target to propagate flags to all the generated targets
     # such as the folly flags or others.
@@ -214,6 +215,5 @@ else()
         Window
         XMLHttpRequest
         Canvas
-        NativeXr
-        NativeCamera)
+        ${ADDITIONAL_LIBRARIES})
 endif()
diff --git a/Modules/@babylonjs/react-native-iosandroid/ios/CMakeLists.txt b/Modules/@babylonjs/react-native-iosandroid/ios/CMakeLists.txt
@@ -42,6 +42,8 @@ add_library(BabylonNative
 
 if (${BASEKIT_BUILD})
     target_compile_definitions(BabylonNative PRIVATE BASEKIT_BUILD=1)
+else()
+    set(ADDITIONAL_LIBRARIES PRIVATE NativeXr NativeCamera)
 endif()
 
 target_include_directories(BabylonNative PRIVATE ${SHARED_INCLUDES})
@@ -62,8 +64,7 @@ target_link_libraries(BabylonNative
     Window
     XMLHttpRequest
     Canvas
-    NativeXr
-    NativeCamera)
+    ${ADDITIONAL_LIBRARIES})
 
 # TODO: For some reason these don't work, so we specify these in the CMake command line args.
 set_target_properties(BabylonNative PROPERTIES

diff --git a/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt b/Modules/@babylonjs/react-native-windows/windows/CMakeLists.txt
@@ -32,6 +32,8 @@ add_library(BabylonNative
 
 if (${BASEKIT_BUILD})
     target_compile_definitions(BabylonNative PRIVATE BASEKIT_BUILD=1)
+else()
+    set(ADDITIONAL_LIBRARIES PRIVATE NativeXr NativeCamera)
 endif()
 
 target_include_directories(BabylonNative PRIVATE ${SHARED_INCLUDES})
@@ -49,5 +51,4 @@ target_link_libraries(BabylonNative
     Window
     XMLHttpRequest
     Canvas
-    NativeXr
-    NativeCamera)
+    ${ADDITIONAL_LIBRARIES})