Skip to content

Commit 7cd3c82

Browse files
fix: don't require vorbis config and fix linking
1 parent f6c5789 commit 7cd3c82

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/CMakeLists.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ endif()
216216
if(TOGGLE_FRAMEWORK_SOUND)
217217
find_package(OpenAL CONFIG REQUIRED)
218218
find_package(VorbisFile REQUIRED)
219-
find_package(Vorbis CONFIG REQUIRED)
219+
find_package(Vorbis REQUIRED)
220220
find_package(Ogg CONFIG REQUIRED)
221221
endif()
222222
if(ANDROID)
@@ -471,9 +471,9 @@ if(MSVC)
471471
${OPENGL_LIBRARIES}
472472
${DirectX_LIBRARY}
473473
${DirectX_LIBRARIES}
474+
${OGG_LIBRARY}
474475
${VORBISFILE_LIBRARY}
475476
${VORBIS_LIBRARY}
476-
${OGG_LIBRARY}
477477
${GMP_LIBRARY}
478478
${OPENSSL_LIBRARIES}
479479
${DBGHELP_LIBRARY}
@@ -512,6 +512,8 @@ elseif(ANDROID)
512512
${NLOHMANN_JSON_LIBRARY}
513513
${EGL_LIBRARY}
514514
${OGG_LIBRARY}
515+
${VORBISFILE_LIBRARY}
516+
${VORBIS_LIBRARY}
515517
${GMP_LIBRARY}
516518
${OpenAL_LIBRARY}
517519
${OPENSSL_LIBRARIES}
@@ -521,8 +523,6 @@ elseif(ANDROID)
521523
Threads::Threads
522524
asio::asio
523525
OpenSLES
524-
Vorbis::vorbis
525-
Vorbis::vorbisfile
526526
LibLZMA::LibLZMA
527527
game-activity::game-activity
528528
GLESv3
@@ -556,6 +556,8 @@ else() # Linux
556556
${DirectX_LIBRARY}
557557
${DirectX_LIBRARIES}
558558
${OGG_LIBRARY}
559+
${VORBISFILE_LIBRARY}
560+
${VORBIS_LIBRARY}
559561
${GMP_LIBRARY}
560562
${STDUUID}
561563
${FOUNDATION}
@@ -568,8 +570,6 @@ else() # Linux
568570
X11::X11
569571
asio::asio
570572
OpenAL::OpenAL
571-
Vorbis::vorbis
572-
Vorbis::vorbisfile
573573
LibLZMA::LibLZMA
574574
pugixml::pugixml
575575
ZLIB::ZLIB

0 commit comments

Comments
 (0)