mirror of https://github.com/bjornbytes/lovr.git
CMake build fix for Oculus Audio on Quest
This commit is contained in:
parent
634e7210bf
commit
3619626710
|
@ -634,7 +634,8 @@ elseif(ANDROID)
|
||||||
|
|
||||||
# Dynamically linked targets output libraries in raw/lib/<ABI> for easy including in apk with aapt
|
# Dynamically linked targets output libraries in raw/lib/<ABI> for easy including in apk with aapt
|
||||||
set_target_properties(
|
set_target_properties(
|
||||||
lovr ${LOVR_ODE}
|
lovr
|
||||||
|
${LOVR_ODE}
|
||||||
PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/raw/lib/${ANDROID_ABI}"
|
PROPERTIES LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/raw/lib/${ANDROID_ABI}"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
@ -680,6 +681,11 @@ elseif(ANDROID)
|
||||||
endif()
|
endif()
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if(LOVR_USE_OCULUS_AUDIO)
|
||||||
|
get_target_property(OCULUS_AUDIO_LIB ${LOVR_OCULUS_AUDIO} IMPORTED_LOCATION)
|
||||||
|
file(COPY ${OCULUS_AUDIO_LIB} DESTINATION raw/lib/${ANDROID_ABI})
|
||||||
|
endif()
|
||||||
|
|
||||||
set(ANDROID_MANIFEST "${CMAKE_CURRENT_SOURCE_DIR}/src/resources/AndroidManifest_${MANIFEST}.xml" CACHE STRING "The AndroidManifest.xml file to use")
|
set(ANDROID_MANIFEST "${CMAKE_CURRENT_SOURCE_DIR}/src/resources/AndroidManifest_${MANIFEST}.xml" CACHE STRING "The AndroidManifest.xml file to use")
|
||||||
|
|
||||||
if(ANDROID_KEYSTORE_PASS) # Trick so that --ks-pass is not passed if no password is given.
|
if(ANDROID_KEYSTORE_PASS) # Trick so that --ks-pass is not passed if no password is given.
|
||||||
|
|
Loading…
Reference in New Issue