Skip to content
Snippets Groups Projects
Commit 432bf69a authored by Tofu Linden's avatar Tofu Linden
Browse files

DEV-43897 linux viewer2 corrupted vorbis problem

we were accidentally linking the duff fmod vorbis first because our dependancies weren't well-defined.
parent 98111a40
No related branches found
No related tags found
No related merge requests found
...@@ -6,4 +6,5 @@ set(LLAUDIO_INCLUDE_DIRS ...@@ -6,4 +6,5 @@ set(LLAUDIO_INCLUDE_DIRS
${LIBS_OPEN_DIR}/llaudio ${LIBS_OPEN_DIR}/llaudio
) )
set(LLAUDIO_LIBRARIES llaudio ${OPENAL_LIBRARIES}) # be exhaustive here
set(LLAUDIO_LIBRARIES llaudio ${VORBISFILE_LIBRARIES} ${VORBIS_LIBRARIES} ${VORBISENC_LIBRARIES} ${OGG_LIBRARIES} ${OPENAL_LIBRARIES})
...@@ -1523,7 +1523,7 @@ target_link_libraries(${VIEWER_BINARY_NAME} ...@@ -1523,7 +1523,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
${BOOST_REGEX_LIBRARY} ${BOOST_REGEX_LIBRARY}
${DBUSGLIB_LIBRARIES} ${DBUSGLIB_LIBRARIES}
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
${FMODWRAPPER_LIBRARY} ${FMODWRAPPER_LIBRARY} # must come after LLAudio
${OPENGL_LIBRARIES} ${OPENGL_LIBRARIES}
${SDL_LIBRARY} ${SDL_LIBRARY}
${SMARTHEAP_LIBRARY} ${SMARTHEAP_LIBRARY}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment