PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

CMakeLists.txt & vcpkg.json update

Browse Source
This commit is contained in:
MihailRis 2024-02-28 13:34:59 +03:00
parent 145ebf8468
commit 6ba638fad6
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
CMakeLists.txt
View File

@ -89,11 +89,12 @@ if (WIN32)
find_package(glfw3 REQUIRED) find_package(glfw3 REQUIRED)
find_package(spng REQUIRED) find_package(spng REQUIRED)
find_package(glm REQUIRED) find_package(glm REQUIRED)
find_package(libogg REQUIRED) find_package(vorbis REQUIRED)
set(PNGLIB spng::spng) set(PNGLIB spng::spng)
else() else()
find_package(Lua REQUIRED) find_package(Lua REQUIRED)
set(PNGLIB spng) set(PNGLIB spng)
set(VORBISLIB vorbis vorbisfile) # not tested
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/glfw) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/glfw)
endif() endif()
else() else()
@ -101,6 +102,7 @@ else()
find_package(Lua REQUIRED) find_package(Lua REQUIRED)
find_package(PNG REQUIRED) find_package(PNG REQUIRED)
set(PNGLIB PNG::PNG) set(PNGLIB PNG::PNG)
set(VORBISLIB vorbis vorbisfile)
endif() endif()
if (APPLE) if (APPLE)
@ -119,7 +121,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
endif() endif()
include_directories(${LUA_INCLUDE_DIR}) 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}) file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/res DESTINATION ${CMAKE_CURRENT_BINARY_DIR})

3
vcpkg.json
View File

@ -9,6 +9,7 @@
"glm", "glm",
"libspng", "libspng",
"zlib", "zlib",
"luajit" "luajit",
"libvorbis"
] ]
} }