diff --git a/indra/cmake/Audio.cmake b/indra/cmake/Audio.cmake index 45436edacae1820fad7feb4027e407ab2724fdc8..87740811b37fb72c9a3b1b9037a30decd383ddf3 100644 --- a/indra/cmake/Audio.cmake +++ b/indra/cmake/Audio.cmake @@ -10,6 +10,7 @@ if (USESYSTEMLIBS) else (USESYSTEMLIBS) use_prebuilt_binary(ogg_vorbis) set(VORBIS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) + set(VORBISENC_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS}) set(VORBISFILE_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS}) if (WINDOWS) @@ -25,12 +26,14 @@ else (USESYSTEMLIBS) else (WINDOWS) set(OGG_LIBRARIES ogg) set(VORBIS_LIBRARIES vorbis) + set(VORBISENC_LIBRARIES vorbisenc) set(VORBISFILE_LIBRARIES vorbisfile) endif (WINDOWS) endif (USESYSTEMLIBS) link_directories( ${VORBIS_LIBRARY_DIRS} + ${VORBISENC_INCLUDE_DIRS} ${VORBISFILE_LIBRARY_DIRS} ${OGG_LIBRARY_DIRS} ) diff --git a/indra/cmake/LLAudio.cmake b/indra/cmake/LLAudio.cmake index 7b156c0cb0564dc30de43a15659ab5fa4a35ed48..1a9b1125bd5dc5dccb231cbead8d49cdb46cc5f6 100644 --- a/indra/cmake/LLAudio.cmake +++ b/indra/cmake/LLAudio.cmake @@ -7,4 +7,4 @@ set(LLAUDIO_INCLUDE_DIRS ) # be exhaustive here -set(LLAUDIO_LIBRARIES llaudio ${VORBISFILE_LIBRARIES} ${VORBIS_LIBRARIES} ${OGG_LIBRARIES} ${OPENAL_LIBRARIES}) +set(LLAUDIO_LIBRARIES llaudio ${VORBISENC_LIBRARIES} ${VORBISFILE_LIBRARIES} ${VORBIS_LIBRARIES} ${OGG_LIBRARIES} ${OPENAL_LIBRARIES}) diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt index c5a66d4151757271015cd5edc1805e7bb98cd80a..4b894d965b4308890ff63772d27092a31deee17e 100644 --- a/indra/llaudio/CMakeLists.txt +++ b/indra/llaudio/CMakeLists.txt @@ -18,6 +18,7 @@ include_directories( ${LLMESSAGE_INCLUDE_DIRS} ${LLVFS_INCLUDE_DIRS} ${OGG_INCLUDE_DIRS} + ${VORBISENC_INCLUDE_DIRS} ${VORBISFILE_INCLUDE_DIRS} ${VORBIS_INCLUDE_DIRS} ${OPENAL_LIB_INCLUDE_DIRS} @@ -87,6 +88,7 @@ target_link_libraries( ${LLMATH_LIBRARIES} ${LLMESSAGE_LIBRARIES} ${LLVFS_LIBRARIES} + ${VORBISENC_LIBRARIES} ${VORBISFILE_LIBRARIES} ${VORBIS_LIBRARIES} ${OGG_LIBRARIES}