Merge pull request #6554 from lioncash/videocommon-cmake

VideoCommon/CMakeLists: Migrate off add_dolphin_library
This commit is contained in:
Léo Lam 2018-03-28 19:42:58 +02:00 committed by GitHub
commit a81c6b0380
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 7 deletions

View File

@ -1,4 +1,4 @@
set(SRCS add_library(videocommon
AbstractFramebuffer.cpp AbstractFramebuffer.cpp
AbstractStagingTexture.cpp AbstractStagingTexture.cpp
AbstractTexture.cpp AbstractTexture.cpp
@ -59,21 +59,29 @@ set(SRCS
XFStructs.cpp XFStructs.cpp
) )
set(LIBS target_link_libraries(videocommon
PUBLIC
core core
PRIVATE
png png
) )
if(_M_X86) if(_M_X86)
set(SRCS ${SRCS} TextureDecoder_x64.cpp VertexLoaderX64.cpp) target_sources(videocommon PRIVATE
TextureDecoder_x64.cpp
VertexLoaderX64.cpp
)
elseif(_M_ARM_64) elseif(_M_ARM_64)
set(SRCS ${SRCS} VertexLoaderARM64.cpp TextureDecoder_Generic.cpp) target_sources(videocommon PRIVATE
VertexLoaderARM64.cpp
TextureDecoder_Generic.cpp
)
else() else()
set(SRCS ${SRCS} TextureDecoder_Generic.cpp) target_sources(videocommon PRIVATE
TextureDecoder_Generic.cpp
)
endif() endif()
add_dolphin_library(videocommon "${SRCS}" "${LIBS}")
if(FFmpeg_FOUND) if(FFmpeg_FOUND)
target_sources(videocommon PRIVATE AVIDump.cpp) target_sources(videocommon PRIVATE AVIDump.cpp)
target_link_libraries(videocommon PRIVATE target_link_libraries(videocommon PRIVATE