Skip to content
Snippets Groups Projects
Commit 73520e9b authored by Rye Mutt's avatar Rye Mutt :bread:
Browse files

Fix vorbis linkage on linux

parent c47e4a44
No related branches found
No related tags found
No related merge requests found
...@@ -10,6 +10,7 @@ if (USESYSTEMLIBS) ...@@ -10,6 +10,7 @@ if (USESYSTEMLIBS)
else (USESYSTEMLIBS) else (USESYSTEMLIBS)
use_prebuilt_binary(ogg_vorbis) use_prebuilt_binary(ogg_vorbis)
set(VORBIS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include) set(VORBIS_INCLUDE_DIRS ${LIBS_PREBUILT_DIR}/include)
set(VORBISENC_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS})
set(VORBISFILE_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS}) set(VORBISFILE_INCLUDE_DIRS ${VORBIS_INCLUDE_DIRS})
if (WINDOWS) if (WINDOWS)
...@@ -25,12 +26,14 @@ else (USESYSTEMLIBS) ...@@ -25,12 +26,14 @@ else (USESYSTEMLIBS)
else (WINDOWS) else (WINDOWS)
set(OGG_LIBRARIES ogg) set(OGG_LIBRARIES ogg)
set(VORBIS_LIBRARIES vorbis) set(VORBIS_LIBRARIES vorbis)
set(VORBISENC_LIBRARIES vorbisenc)
set(VORBISFILE_LIBRARIES vorbisfile) set(VORBISFILE_LIBRARIES vorbisfile)
endif (WINDOWS) endif (WINDOWS)
endif (USESYSTEMLIBS) endif (USESYSTEMLIBS)
link_directories( link_directories(
${VORBIS_LIBRARY_DIRS} ${VORBIS_LIBRARY_DIRS}
${VORBISENC_INCLUDE_DIRS}
${VORBISFILE_LIBRARY_DIRS} ${VORBISFILE_LIBRARY_DIRS}
${OGG_LIBRARY_DIRS} ${OGG_LIBRARY_DIRS}
) )
...@@ -7,4 +7,4 @@ set(LLAUDIO_INCLUDE_DIRS ...@@ -7,4 +7,4 @@ set(LLAUDIO_INCLUDE_DIRS
) )
# be exhaustive here # 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})
...@@ -18,6 +18,7 @@ include_directories( ...@@ -18,6 +18,7 @@ include_directories(
${LLMESSAGE_INCLUDE_DIRS} ${LLMESSAGE_INCLUDE_DIRS}
${LLVFS_INCLUDE_DIRS} ${LLVFS_INCLUDE_DIRS}
${OGG_INCLUDE_DIRS} ${OGG_INCLUDE_DIRS}
${VORBISENC_INCLUDE_DIRS}
${VORBISFILE_INCLUDE_DIRS} ${VORBISFILE_INCLUDE_DIRS}
${VORBIS_INCLUDE_DIRS} ${VORBIS_INCLUDE_DIRS}
${OPENAL_LIB_INCLUDE_DIRS} ${OPENAL_LIB_INCLUDE_DIRS}
...@@ -87,6 +88,7 @@ target_link_libraries( ...@@ -87,6 +88,7 @@ target_link_libraries(
${LLMATH_LIBRARIES} ${LLMATH_LIBRARIES}
${LLMESSAGE_LIBRARIES} ${LLMESSAGE_LIBRARIES}
${LLVFS_LIBRARIES} ${LLVFS_LIBRARIES}
${VORBISENC_LIBRARIES}
${VORBISFILE_LIBRARIES} ${VORBISFILE_LIBRARIES}
${VORBIS_LIBRARIES} ${VORBIS_LIBRARIES}
${OGG_LIBRARIES} ${OGG_LIBRARIES}
......
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