mv AndroidManifest.xml AndroidManifest_vrapi.xml;

This commit is contained in:
bjorn 2020-07-27 13:47:32 -06:00
parent 92bd4f60cf
commit d25e20fb9d
2 changed files with 1 additions and 1 deletions

View File

@ -75,7 +75,6 @@ elseif(ANDROID)
find_package(Java REQUIRED)
set(LOVR_USE_OPENVR OFF)
set(LOVR_USE_DESKTOP_HEADSET OFF)
set(ANDROID_MANIFEST "${CMAKE_CURRENT_SOURCE_DIR}/src/resources/AndroidManifest.xml" CACHE STRING "An optional path to a custom AndroidManifest.xml")
if(LOVR_BUILD_EXE)
set(LOVR_BUILD_SHARED ON)
endif()
@ -642,6 +641,7 @@ elseif(ANDROID)
if(LOVR_USE_VRAPI)
get_target_property(VRAPI_LIB ${LOVR_VRAPI} IMPORTED_LOCATION)
file(COPY ${VRAPI_LIB} DESTINATION lib/${ANDROID_ABI})
set(ANDROID_MANIFEST "${CMAKE_CURRENT_SOURCE_DIR}/src/resources/AndroidManifest_vrapi.xml" CACHE STRING "The AndroidManifest.xml path")
set(ANDROID_ACTIVITY "vrapi")
endif()