From fd7ac0d4a391d4972dd040b49efbe64187a65eaf Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 28 Mar 2018 09:57:46 -0400 Subject: [PATCH] VideoCommon/CMakeLists: Migrate off add_dolphin_library Continues the migration work started in 3a4c3bbe01e7a44ec997f4fbf0b678fba6f2d46c --- Source/Core/VideoCommon/CMakeLists.txt | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/Source/Core/VideoCommon/CMakeLists.txt b/Source/Core/VideoCommon/CMakeLists.txt index 04c4d6c3c2..6fddab82bd 100644 --- a/Source/Core/VideoCommon/CMakeLists.txt +++ b/Source/Core/VideoCommon/CMakeLists.txt @@ -1,4 +1,4 @@ -set(SRCS +add_library(videocommon AbstractFramebuffer.cpp AbstractStagingTexture.cpp AbstractTexture.cpp @@ -59,21 +59,29 @@ set(SRCS XFStructs.cpp ) -set(LIBS +target_link_libraries(videocommon +PUBLIC core +PRIVATE png ) if(_M_X86) - set(SRCS ${SRCS} TextureDecoder_x64.cpp VertexLoaderX64.cpp) + target_sources(videocommon PRIVATE + TextureDecoder_x64.cpp + VertexLoaderX64.cpp + ) elseif(_M_ARM_64) - set(SRCS ${SRCS} VertexLoaderARM64.cpp TextureDecoder_Generic.cpp) + target_sources(videocommon PRIVATE + VertexLoaderARM64.cpp + TextureDecoder_Generic.cpp + ) else() - set(SRCS ${SRCS} TextureDecoder_Generic.cpp) + target_sources(videocommon PRIVATE + TextureDecoder_Generic.cpp + ) endif() -add_dolphin_library(videocommon "${SRCS}" "${LIBS}") - if(FFmpeg_FOUND) target_sources(videocommon PRIVATE AVIDump.cpp) target_link_libraries(videocommon PRIVATE