ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6556 from lioncash/video-libs 

VideoCommon/Vulkan: Explicitly link in xxhash
This commit is contained in:
Markus Wick 2018-03-29 13:25:30 +02:00 committed by GitHub
parent 03a6a9b240 b818cc682c
commit c697b7d435
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -588,7 +588,6 @@ if(NOT XXHASH_FOUND)
add_subdirectory(Externals/xxhash) add_subdirectory(Externals/xxhash)
include_directories(Externals/xxhash) include_directories(Externals/xxhash)
endif() endif()
LIST(APPEND LIBS xxhash)
find_package(ZLIB) find_package(ZLIB)
if(ZLIB_FOUND) if(ZLIB_FOUND)

6
Source/Core/VideoBackends/Vulkan/CMakeLists.txt
View File

@ -41,5 +41,9 @@ include_directories(SYSTEM ${CMAKE_SOURCE_DIR}/Externals/glslang/SPIRV)
# Link against glslang, the other necessary libraries are referenced by the executable. # Link against glslang, the other necessary libraries are referenced by the executable.
add_dolphin_library(videovulkan "${SRCS}" "${LIBS}") add_dolphin_library(videovulkan "${SRCS}" "${LIBS}")
target_link_libraries(videovulkan PRIVATE glslang) target_link_libraries(videovulkan
PRIVATE
glslang
xxhash
)

1
Source/Core/VideoCommon/CMakeLists.txt
View File

@ -64,6 +64,7 @@ PUBLIC
core core
PRIVATE PRIVATE
png png
xxhash
) )
if(_M_X86) if(_M_X86)