diff --git a/CMakeLists.txt b/CMakeLists.txt index db1dc456..82a81fec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,11 +89,12 @@ if (WIN32) find_package(glfw3 REQUIRED) find_package(spng REQUIRED) find_package(glm REQUIRED) - find_package(libogg REQUIRED) + find_package(vorbis REQUIRED) set(PNGLIB spng::spng) else() find_package(Lua REQUIRED) set(PNGLIB spng) + set(VORBISLIB vorbis vorbisfile) # not tested add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/glfw) endif() else() @@ -101,6 +102,7 @@ else() find_package(Lua REQUIRED) find_package(PNG REQUIRED) set(PNGLIB PNG::PNG) + set(VORBISLIB vorbis vorbisfile) endif() if (APPLE) @@ -119,7 +121,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU") endif() include_directories(${LUA_INCLUDE_DIR}) -target_link_libraries(${PROJECT_NAME} ${LIBS} glfw OpenGL::GL ${OPENAL_LIBRARY} GLEW::GLEW ZLIB::ZLIB vorbis vorbisfile ${PNGLIB} ${LUA_LIBRARIES} ${CMAKE_DL_LIBS}) +target_link_libraries(${PROJECT_NAME} ${LIBS} glfw OpenGL::GL ${OPENAL_LIBRARY} GLEW::GLEW ZLIB::ZLIB ${VORBISLIB} ${PNGLIB} ${LUA_LIBRARIES} ${CMAKE_DL_LIBS}) file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/res DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) diff --git a/vcpkg.json b/vcpkg.json index 626e06e6..8a5f6049 100644 --- a/vcpkg.json +++ b/vcpkg.json @@ -9,6 +9,7 @@ "glm", "libspng", "zlib", - "luajit" + "luajit", + "libvorbis" ] }