Force Vorbis to link before FMODEx

2012-09-01 03:10:26 +02:00
parent e460bd9a69
commit b4a7fa1ad9
3 changed files with 10 additions and 7 deletions
--- a/indra/cmake/Audio.cmake
+++ b/indra/cmake/Audio.cmake
@@ -40,3 +40,11 @@ link_directories(
    ${VORBISFILE_LIBRARY_DIRS}
    ${OGG_LIBRARY_DIRS}
    )
+
+set(LLAUDIO_VORBIS_LIBRARIES
+    ${VORBISENC_LIBRARIES}
+    ${VORBISFILE_LIBRARIES}
+    ${VORBIS_LIBRARIES}
+    ${OGG_LIBRARIES}
+    )
+
--- a/indra/llaudio/CMakeLists.txt
+++ b/indra/llaudio/CMakeLists.txt
@@ -111,10 +111,4 @@ list(APPEND llaudio_SOURCE_FILES ${llaudio_HEADER_FILES})

 add_library (llaudio ${llaudio_SOURCE_FILES})
 add_dependencies(llaudio prepare)
-target_link_libraries(
-    llaudio
-    ${VORBISENC_LIBRARIES}
-    ${VORBISFILE_LIBRARIES}
-    ${VORBIS_LIBRARIES}
-    ${OGG_LIBRARIES}
-    )
+
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1540,6 +1540,7 @@ endif (WINDOWS)
 target_link_libraries(${VIEWER_BINARY_NAME}
    ${GOOGLE_PERFTOOLS_LIBRARIES}
    ${LLAUDIO_LIBRARIES}
+    ${LLAUDIO_VORBIS_LIBRARIES}
    ${LLCHARACTER_LIBRARIES}
    ${LLIMAGE_LIBRARIES}
    ${LLIMAGEJ2COJ_LIBRARIES}