Browse Source

plugins: Remove CMake legacy code paths for Windows modules

PatTheMav 1 year ago
parent
commit
46b5f7e6d0

+ 0 - 2
plugins/obs-text/CMakeLists.txt

@@ -1,7 +1,5 @@
 cmake_minimum_required(VERSION 3.24...3.25)
 
-legacy_check()
-
 add_library(obs-text MODULE)
 add_library(OBS::text ALIAS obs-text)
 

+ 0 - 19
plugins/obs-text/cmake/legacy.cmake

@@ -1,19 +0,0 @@
-project(obs-text)
-
-add_library(obs-text MODULE)
-add_library(OBS::text ALIAS obs-text)
-
-target_link_libraries(obs-text PRIVATE OBS::libobs)
-
-set_target_properties(obs-text PROPERTIES FOLDER "plugins")
-
-set(MODULE_DESCRIPTION "OBS GDI+ text module")
-configure_file(${CMAKE_SOURCE_DIR}/cmake/bundle/windows/obs-module.rc.in obs-text.rc)
-
-target_sources(obs-text PRIVATE gdiplus/obs-text.cpp obs-text.rc)
-
-target_link_libraries(obs-text PRIVATE gdiplus)
-
-target_compile_definitions(obs-text PRIVATE UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS)
-
-setup_plugin_target(obs-text)

+ 0 - 2
plugins/win-capture/CMakeLists.txt

@@ -1,7 +1,5 @@
 cmake_minimum_required(VERSION 3.24...3.25)
 
-legacy_check()
-
 if(NOT TARGET OBS::obfuscate)
   add_subdirectory("${CMAKE_SOURCE_DIR}/libobs" "${CMAKE_BINARY_DIR}/libobs")
 endif()

+ 0 - 3
plugins/win-capture/cmake/32bit-build.cmake

@@ -1,3 +0,0 @@
-add_subdirectory(graphics-hook)
-add_subdirectory(get-graphics-offsets)
-add_subdirectory(inject-helper)

+ 0 - 75
plugins/win-capture/cmake/legacy.cmake

@@ -1,75 +0,0 @@
-project(win-capture)
-
-option(ENABLE_COMPAT_UPDATES "Checks for capture compatibility data updates" ON)
-
-set(COMPAT_URL
-    "https://obsproject.com/obs2_update/win-capture"
-    CACHE STRING "Default services package URL")
-
-mark_as_advanced(COMPAT_URL)
-
-add_library(win-capture MODULE)
-add_library(OBS::capture ALIAS win-capture)
-
-find_package(Jansson 2.5 REQUIRED)
-
-if(NOT TARGET OBS::ipc-util)
-  add_subdirectory("${CMAKE_SOURCE_DIR}/shared/ipc-util" "${CMAKE_BINARY_DIR}/shared/ipc-util")
-endif()
-
-if(NOT TARGET OBS::file-updater)
-  add_subdirectory("${CMAKE_SOURCE_DIR}/shared/file-updater" "${CMAKE_BINARY_DIR}/shared/file-updater")
-endif()
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/compat-config.h.in ${CMAKE_BINARY_DIR}/config/compat-config.h)
-
-target_sources(
-  win-capture
-  PRIVATE plugin-main.c
-          app-helpers.c
-          app-helpers.h
-          audio-helpers.c
-          audio-helpers.h
-          cursor-capture.c
-          cursor-capture.h
-          dc-capture.c
-          dc-capture.h
-          duplicator-monitor-capture.c
-          game-capture.c
-          game-capture-file-init.c
-          graphics-hook-info.h
-          graphics-hook-ver.h
-          hook-helpers.h
-          inject-library.c
-          inject-library.h
-          load-graphics-offsets.c
-          monitor-capture.c
-          nt-stuff.c
-          nt-stuff.h
-          window-capture.c
-          compat-helpers.c
-          compat-helpers.h
-          compat-format-ver.h
-          ../../libobs/util/windows/obfuscate.c
-          ../../libobs/util/windows/obfuscate.h
-          ${CMAKE_BINARY_DIR}/config/compat-config.h)
-
-target_link_libraries(win-capture PRIVATE OBS::libobs OBS::ipc-util OBS::file-updater Jansson::Jansson)
-
-set_target_properties(win-capture PROPERTIES FOLDER "plugins/win-capture")
-
-if(MSVC)
-  target_link_libraries(win-capture PRIVATE OBS::w32-pthreads)
-  target_link_options(win-capture PRIVATE "LINKER:/IGNORE:4098")
-endif()
-
-target_compile_definitions(win-capture PRIVATE UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS
-                                               OBS_VERSION="${OBS_VERSION_CANONICAL}" OBS_LEGACY)
-
-set_property(GLOBAL APPEND PROPERTY OBS_MODULE_LIST "win-capture")
-
-setup_plugin_target(win-capture)
-
-add_subdirectory(graphics-hook)
-add_subdirectory(get-graphics-offsets)
-add_subdirectory(inject-helper)

+ 0 - 2
plugins/win-capture/get-graphics-offsets/CMakeLists.txt

@@ -1,7 +1,5 @@
 cmake_minimum_required(VERSION 3.24...3.25)
 
-legacy_check()
-
 if(NOT TARGET OBS::d3d8-api)
   add_subdirectory("${CMAKE_SOURCE_DIR}/shared/obs-d3d8-api" obs-d3d8-api)
 endif()

+ 0 - 33
plugins/win-capture/get-graphics-offsets/cmake/legacy.cmake

@@ -1,33 +0,0 @@
-project(get-graphics-offsets)
-
-add_executable(get-graphics-offsets)
-
-target_sources(
-  get-graphics-offsets
-  PRIVATE get-graphics-offsets.c
-          get-graphics-offsets.h
-          dxgi-offsets.cpp
-          d3d8-offsets.cpp
-          d3d9-offsets.cpp
-          ../graphics-hook-info.h
-          ../hook-helpers.h)
-
-target_include_directories(get-graphics-offsets PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..
-                                                        ${CMAKE_CURRENT_SOURCE_DIR}/../d3d8-api)
-
-target_link_libraries(get-graphics-offsets d3d9.lib dxgi.lib d3d11.lib)
-
-target_compile_definitions(get-graphics-offsets PRIVATE OBS_LEGACY)
-
-if(MSVC)
-  target_compile_options(get-graphics-offsets PRIVATE "$<IF:$<CONFIG:Debug>,/MTd,/MT>")
-endif()
-
-set_target_properties(get-graphics-offsets PROPERTIES FOLDER "plugins/win-capture")
-set_target_properties(get-graphics-offsets
-                      PROPERTIES OUTPUT_NAME "get-graphics-offsets$<IF:$<EQUAL:${CMAKE_SIZEOF_VOID_P},8>,64,32>")
-
-set(OBS_PLUGIN_DESTINATION "${OBS_DATA_DESTINATION}/obs-plugins/win-capture/")
-setup_plugin_target(get-graphics-offsets)
-
-add_dependencies(win-capture get-graphics-offsets)

+ 0 - 2
plugins/win-capture/graphics-hook/CMakeLists.txt

@@ -1,7 +1,5 @@
 cmake_minimum_required(VERSION 3.24...3.25)
 
-legacy_check()
-
 find_package(Detours REQUIRED)
 find_package(Vulkan REQUIRED)
 

+ 0 - 62
plugins/win-capture/graphics-hook/cmake/legacy.cmake

@@ -1,62 +0,0 @@
-project(graphics-hook)
-
-find_package(Detours REQUIRED)
-find_package(Vulkan REQUIRED)
-
-add_library(graphics-hook MODULE)
-add_library(OBS::graphics-hook ALIAS graphics-hook)
-
-if(NOT TARGET OBS::ipc-util)
-  add_subdirectory("${CMAKE_SOURCE_DIR}/shared/ipc-util" "${CMAKE_BINARY_DIR}/shared/ipc-util")
-endif()
-
-target_sources(
-  graphics-hook
-  PRIVATE graphics-hook.c
-          graphics-hook.h
-          gl-capture.c
-          gl-decs.h
-          d3d8-capture.cpp
-          d3d9-capture.cpp
-          d3d9-patches.hpp
-          dxgi-capture.cpp
-          d3d10-capture.cpp
-          d3d11-capture.cpp
-          d3d12-capture.cpp
-          ../../../libobs/util/windows/obfuscate.c
-          ../../../libobs/util/windows/obfuscate.h
-          ../graphics-hook-ver.h
-          ../graphics-hook-info.h
-          ../hook-helpers.h
-          graphics-hook.rc)
-
-target_include_directories(graphics-hook PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_SOURCE_DIR}/libobs
-                                                 ${CMAKE_CURRENT_SOURCE_DIR}/../d3d8-api)
-
-target_link_libraries(graphics-hook PRIVATE OBS::ipc-util Detours::Detours dxguid)
-target_link_options(graphics-hook PRIVATE "LINKER:/IGNORE:4099")
-
-if(MSVC)
-  target_compile_options(graphics-hook PRIVATE "$<IF:$<CONFIG:Debug>,/MTd,/MT>")
-endif()
-
-set_target_properties(graphics-hook PROPERTIES FOLDER "plugins/win-capture"
-                                               OUTPUT_NAME "graphics-hook$<IF:$<EQUAL:${CMAKE_SIZEOF_VOID_P},8>,64,32>")
-
-target_compile_definitions(graphics-hook PRIVATE COMPILE_D3D12_HOOK OBS_LEGACY)
-
-if(TARGET Vulkan::Vulkan)
-  target_sources(graphics-hook PRIVATE vulkan-capture.c vulkan-capture.h)
-
-  target_link_libraries(graphics-hook PRIVATE Vulkan::Vulkan)
-
-  target_compile_definitions(graphics-hook PRIVATE COMPILE_VULKAN_HOOK)
-
-  add_target_resource(graphics-hook "${CMAKE_CURRENT_SOURCE_DIR}/obs-vulkan64.json" "obs-plugins/win-capture/")
-  add_target_resource(graphics-hook "${CMAKE_CURRENT_SOURCE_DIR}/obs-vulkan32.json" "obs-plugins/win-capture/")
-endif()
-
-set(OBS_PLUGIN_DESTINATION "${OBS_DATA_DESTINATION}/obs-plugins/win-capture/")
-setup_plugin_target(graphics-hook)
-
-add_dependencies(win-capture graphics-hook)

+ 0 - 2
plugins/win-capture/inject-helper/CMakeLists.txt

@@ -1,7 +1,5 @@
 cmake_minimum_required(VERSION 3.24...3.25)
 
-legacy_check()
-
 if(NOT TARGET OBS::obfuscate)
   add_subdirectory("${CMAKE_SOURCE_DIR}/libobs" "${CMAKE_BINARY_DIR}/libobs")
 endif()

+ 0 - 21
plugins/win-capture/inject-helper/cmake/legacy.cmake

@@ -1,21 +0,0 @@
-project(inject-helper)
-
-add_executable(inject-helper)
-
-target_sources(inject-helper PRIVATE inject-helper.c ../inject-library.c ../inject-library.h
-                                     ../../../libobs/util/windows/obfuscate.c ../../../libobs/util/windows/obfuscate.h)
-
-target_include_directories(inject-helper PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_SOURCE_DIR}/libobs)
-
-target_compile_definitions(inject-helper PRIVATE OBS_LEGACY)
-if(MSVC)
-  target_compile_options(inject-helper PRIVATE "$<IF:$<CONFIG:Debug>,/MTd,/MT>")
-endif()
-
-set_target_properties(inject-helper PROPERTIES FOLDER "plugins/win-capture"
-                                               OUTPUT_NAME "inject-helper$<IF:$<EQUAL:${CMAKE_SIZEOF_VOID_P},8>,64,32>")
-
-set(OBS_PLUGIN_DESTINATION "${OBS_DATA_DESTINATION}/obs-plugins/win-capture/")
-setup_plugin_target(inject-helper)
-
-add_dependencies(win-capture inject-helper)

+ 0 - 2
plugins/win-dshow/CMakeLists.txt

@@ -1,7 +1,5 @@
 cmake_minimum_required(VERSION 3.24...3.25)
 
-legacy_check()
-
 find_package(FFmpeg REQUIRED avcodec avutil)
 
 add_library(win-dshow MODULE)

+ 0 - 240
plugins/win-dshow/cmake/legacy.cmake

@@ -1,240 +0,0 @@
-if(NOT EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/libdshowcapture/dshowcapture.hpp")
-  obs_status(FATAL_ERROR "libdshowcapture submodule not found! Please fetch submodules. win-dshow plugin disabled.")
-  return()
-endif()
-
-option(ENABLE_VIRTUALCAM "Enable building with Virtual Camera (Windows)" ON)
-
-if(NOT ENABLE_VIRTUALCAM)
-  obs_status(DISABLED "Windows Virtual Camera")
-endif()
-
-if(ENABLE_VIRTUALCAM AND NOT VIRTUALCAM_GUID)
-  set(VIRTUALCAM_GUID "" CACHE STRING "Virtual Camera GUID" FORCE)
-  mark_as_advanced(VIRTUALCAM_GUID)
-endif()
-
-project(win-dshow)
-
-find_package(FFmpeg REQUIRED COMPONENTS avcodec avutil)
-
-add_library(win-dshow MODULE)
-add_library(OBS::dshow ALIAS win-dshow)
-
-target_sources(
-  win-dshow
-  PRIVATE encode-dstr.hpp win-dshow.cpp win-dshow-encoder.cpp dshow-plugin.cpp ffmpeg-decode.c ffmpeg-decode.h
-)
-
-add_library(libdshowcapture-external INTERFACE)
-add_library(libdshowcapture INTERFACE)
-add_library(OBS::libdshowcapture-external ALIAS libdshowcapture-external)
-add_library(OBS::libdshowcapture ALIAS libdshowcapture)
-
-target_sources(
-  libdshowcapture-external
-  INTERFACE
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/external/capture-device-support/Library/EGAVResult.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/external/capture-device-support/Library/ElgatoUVCDevice.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/external/capture-device-support/Library/win/EGAVHIDImplementation.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/external/capture-device-support/SampleCode/DriverInterface.cpp
-)
-
-target_sources(
-  libdshowcapture
-  INTERFACE
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/dshowcapture.hpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/source/capture-filter.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/source/capture-filter.hpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/source/output-filter.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/source/output-filter.hpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/source/dshowcapture.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/source/dshowencode.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/source/device.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/source/device.hpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/source/device-vendor.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/source/encoder.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/source/encoder.hpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/source/dshow-base.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/source/dshow-base.hpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/source/dshow-demux.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/source/dshow-demux.hpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/source/dshow-device-defs.hpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/source/dshow-enum.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/source/dshow-enum.hpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/source/dshow-formats.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/source/dshow-formats.hpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/source/dshow-media-type.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/source/dshow-encoded-device.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/source/dshow-media-type.hpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/source/log.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/source/log.hpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/source/external/IVideoCaptureFilter.h
-)
-
-target_include_directories(
-  libdshowcapture
-  INTERFACE
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/external/capture-device-support/Library
-)
-
-target_compile_definitions(libdshowcapture-external INTERFACE _UP_WINDOWS=1)
-target_compile_definitions(libdshowcapture INTERFACE _UP_WINDOWS=1)
-target_compile_options(libdshowcapture-external INTERFACE /wd4018)
-
-set(MODULE_DESCRIPTION "OBS DirectShow module")
-
-configure_file(${CMAKE_SOURCE_DIR}/cmake/bundle/windows/obs-module.rc.in win-dshow.rc)
-
-target_sources(win-dshow PRIVATE win-dshow.rc)
-
-target_compile_definitions(
-  win-dshow
-  PRIVATE UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS OBS_LEGACY
-)
-
-set(VIRTUALCAM_AVAILABLE OFF)
-if(ENABLE_VIRTUALCAM)
-  if(VIRTUALCAM_GUID STREQUAL "")
-    obs_status(WARNING "Windows Virtual Camera - GUID not set. Specify as 'VIRTUALCAM_GUID' to enable.")
-  else()
-    set(INVALID_GUID ON)
-
-    string(REPLACE "-" ";" GUID_VALS ${VIRTUALCAM_GUID})
-
-    list(LENGTH GUID_VALS GUID_VAL_COUNT)
-    if(GUID_VAL_COUNT EQUAL 5)
-      string(REPLACE ";" "0" GUID_HEX ${GUID_VALS})
-      string(REGEX MATCH "[0-9a-fA-F]+" GUID_ACTUAL_HEX ${GUID_HEX})
-      if(GUID_ACTUAL_HEX STREQUAL GUID_HEX)
-        list(GET GUID_VALS 0 GUID_VALS_DATA1)
-        list(GET GUID_VALS 1 GUID_VALS_DATA2)
-        list(GET GUID_VALS 2 GUID_VALS_DATA3)
-        list(GET GUID_VALS 3 GUID_VALS_DATA4)
-        list(GET GUID_VALS 4 GUID_VALS_DATA5)
-        string(LENGTH ${GUID_VALS_DATA1} GUID_VALS_DATA1_LENGTH)
-        string(LENGTH ${GUID_VALS_DATA2} GUID_VALS_DATA2_LENGTH)
-        string(LENGTH ${GUID_VALS_DATA3} GUID_VALS_DATA3_LENGTH)
-        string(LENGTH ${GUID_VALS_DATA4} GUID_VALS_DATA4_LENGTH)
-        string(LENGTH ${GUID_VALS_DATA5} GUID_VALS_DATA5_LENGTH)
-        if(
-          GUID_VALS_DATA1_LENGTH EQUAL 8
-          AND GUID_VALS_DATA2_LENGTH EQUAL 4
-          AND GUID_VALS_DATA3_LENGTH EQUAL 4
-          AND GUID_VALS_DATA4_LENGTH EQUAL 4
-          AND GUID_VALS_DATA5_LENGTH EQUAL 12
-        )
-          set(GUID_VAL01 ${GUID_VALS_DATA1})
-          set(GUID_VAL02 ${GUID_VALS_DATA2})
-          set(GUID_VAL03 ${GUID_VALS_DATA3})
-          string(SUBSTRING ${GUID_VALS_DATA4} 0 2 GUID_VAL04)
-          string(SUBSTRING ${GUID_VALS_DATA4} 2 2 GUID_VAL05)
-          string(SUBSTRING ${GUID_VALS_DATA5} 0 2 GUID_VAL06)
-          string(SUBSTRING ${GUID_VALS_DATA5} 2 2 GUID_VAL07)
-          string(SUBSTRING ${GUID_VALS_DATA5} 4 2 GUID_VAL08)
-          string(SUBSTRING ${GUID_VALS_DATA5} 6 2 GUID_VAL09)
-          string(SUBSTRING ${GUID_VALS_DATA5} 8 2 GUID_VAL10)
-          string(SUBSTRING ${GUID_VALS_DATA5} 10 2 GUID_VAL11)
-          set(VIRTUALCAM_AVAILABLE ON)
-          set(INVALID_GUID OFF)
-        endif()
-      endif()
-    endif()
-  endif()
-
-  if(INVALID_GUID)
-    obs_status(WARNING "Windows Virtual Camera - invalid GUID supplied")
-  endif()
-endif()
-
-target_link_libraries(
-  win-dshow
-  PRIVATE
-    OBS::libobs
-    OBS::w32-pthreads
-    OBS::libdshowcapture-external
-    OBS::libdshowcapture
-    setupapi
-    strmiids
-    ksuser
-    winmm
-    wmcodecdspuuid
-    FFmpeg::avcodec
-    FFmpeg::avutil
-)
-
-source_group(
-  "libdshowcapture-external\\Source Files"
-  FILES
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/external/capture-device-support/Library/EGAVResult.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/external/capture-device-support/Library/ElgatoUVCDevice.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/external/capture-device-support/Library/win/EGAVHIDImplementation.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/external/capture-device-support/SampleCode/DriverInterface.cpp
-)
-source_group(
-  "libdshowcapture\\Source Files"
-  FILES
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/capture-filter.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/output-filter.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/dshowcapture.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/dshowencode.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/device.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/device-vendor.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/encoder.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/dshow-base.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/dshow-demux.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/dshow-enum.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/dshow-formats.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/dshow-media-type.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/dshow-encoded-device.cpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/log.cpp
-)
-source_group(
-  "libdshowcapture\\Header Files"
-  FILES
-    libdshowcapture/dshowcapture.hpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/capture-filter.hpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/output-filter.hpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/device.hpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/encoder.hpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/dshow-base.hpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/dshow-demux.hpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/dshow-device-defs.hpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/dshow-enum.hpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/dshow-formats.hpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/dshow-media-type.hpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/log.hpp
-    ${CMAKE_SOURCE_DIR}/deps/libdshowcapture/src/external/IVideoCaptureFilter.h
-)
-
-set_target_properties(win-dshow PROPERTIES FOLDER "plugins/win-dshow")
-
-setup_plugin_target(win-dshow)
-
-if(ENABLE_VIRTUALCAM AND VIRTUALCAM_AVAILABLE)
-  target_sources(
-    win-dshow
-    PRIVATE tiny-nv12-scale.c tiny-nv12-scale.h shared-memory-queue.c shared-memory-queue.h virtualcam.c
-  )
-
-  target_compile_definitions(win-dshow PRIVATE VIRTUALCAM_AVAILABLE)
-
-  target_include_directories(win-dshow PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/config)
-
-  configure_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/virtualcam-module/virtualcam-guid.h.in
-    ${CMAKE_CURRENT_BINARY_DIR}/config/virtualcam-guid.h
-  )
-
-  target_sources(win-dshow PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/config/virtualcam-guid.h)
-
-  configure_file(virtualcam-module/virtualcam-install.bat.in "${CMAKE_CURRENT_BINARY_DIR}/virtualcam-install.bat")
-
-  configure_file(virtualcam-module/virtualcam-uninstall.bat.in "${CMAKE_CURRENT_BINARY_DIR}/virtualcam-uninstall.bat")
-
-  add_target_resource(win-dshow "${CMAKE_CURRENT_BINARY_DIR}/virtualcam-install.bat" "obs-plugins/win-dshow/")
-  add_target_resource(win-dshow "${CMAKE_CURRENT_BINARY_DIR}/virtualcam-uninstall.bat" "obs-plugins/win-dshow/")
-
-  add_subdirectory(virtualcam-module)
-endif()

+ 0 - 2
plugins/win-dshow/virtualcam-module/CMakeLists.txt

@@ -1,7 +1,5 @@
 cmake_minimum_required(VERSION 3.24...3.25)
 
-legacy_check()
-
 option(ENABLE_VIRTUALCAM "Enable Windows Virtual Camera" ON)
 if(NOT ENABLE_VIRTUALCAM)
   target_disable_feature(obs-virtualcam-module "Virtual Camera Support")

+ 0 - 60
plugins/win-dshow/virtualcam-module/cmake/legacy.cmake

@@ -1,60 +0,0 @@
-cmake_minimum_required(VERSION 3.5)
-project(obs-virtualcam-module)
-
-if(CMAKE_SIZEOF_VOID_P EQUAL 8)
-  set(_output_suffix "64")
-else()
-  set(_output_suffix "32")
-endif()
-
-add_library(obs-virtualcam-module MODULE)
-add_library(OBS::virtualcam-module ALIAS obs-virtualcam-module)
-
-target_sources(
-  obs-virtualcam-module
-  PRIVATE sleepto.c
-          sleepto.h
-          placeholder.cpp
-          virtualcam-module.cpp
-          virtualcam-filter.cpp
-          virtualcam-filter.hpp
-          virtualcam-module.rc
-          ../shared-memory-queue.c
-          ../shared-memory-queue.h
-          ../tiny-nv12-scale.c
-          ../tiny-nv12-scale.h)
-
-target_include_directories(obs-virtualcam-module PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..)
-
-set(MODULE_DESCRIPTION "OBS Virtual Camera output module")
-
-configure_file(${CMAKE_SOURCE_DIR}/cmake/bundle/windows/obs-module.rc.in virtualcam-module.rc)
-
-target_sources(obs-virtualcam-module PRIVATE virtualcam-module.rc)
-
-target_link_libraries(obs-virtualcam-module PRIVATE OBS::libdshowcapture OBS::libdshowcapture-external setupapi winmm
-                                                    strmiids gdiplus)
-
-target_link_options(obs-virtualcam-module PRIVATE "LINKER:/ignore:4104")
-
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/virtualcam-module.def.in ${CMAKE_CURRENT_BINARY_DIR}/virtualcam-module.def)
-
-target_sources(obs-virtualcam-module PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/virtualcam-module.def)
-
-target_include_directories(obs-virtualcam-module PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/../config
-                                                         ${CMAKE_SOURCE_DIR}/libobs)
-
-target_compile_definitions(obs-virtualcam-module PRIVATE VIRTUALCAM_AVAILABLE UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS
-                                                         _CRT_NONSTDC_NO_WARNINGS OBS_LEGACY)
-
-if(MSVC)
-  target_compile_options(obs-virtualcam-module PRIVATE "$<IF:$<CONFIG:Debug>,/MTd,/MT>")
-  add_target_resource(win-dshow "$<TARGET_PDB_FILE:obs-virtualcam-module>" "obs-plugins/win-dshow/" OPTIONAL)
-
-endif()
-
-set_target_properties(obs-virtualcam-module PROPERTIES FOLDER "plugins/win-dshow")
-
-set_target_properties(obs-virtualcam-module PROPERTIES OUTPUT_NAME "obs-virtualcam-module${_output_suffix}")
-
-add_target_resource(win-dshow "$<TARGET_FILE:obs-virtualcam-module>" "obs-plugins/win-dshow/")

+ 0 - 2
plugins/win-wasapi/CMakeLists.txt

@@ -1,7 +1,5 @@
 cmake_minimum_required(VERSION 3.24...3.25)
 
-legacy_check()
-
 add_library(win-wasapi MODULE)
 add_library(OBS::wasapi ALIAS win-wasapi)
 

+ 0 - 19
plugins/win-wasapi/cmake/legacy.cmake

@@ -1,19 +0,0 @@
-project(win-wasapi)
-
-add_library(win-wasapi MODULE)
-add_library(OBS::wasapi ALIAS win-wasapi)
-
-target_sources(win-wasapi PRIVATE win-wasapi.cpp wasapi-notify.cpp wasapi-notify.hpp enum-wasapi.cpp enum-wasapi.hpp
-                                  plugin-main.cpp)
-
-set(MODULE_DESCRIPTION "OBS WASAPI module")
-
-configure_file(${CMAKE_SOURCE_DIR}/cmake/bundle/windows/obs-module.rc.in win-wasapi.rc)
-
-target_sources(win-wasapi PRIVATE win-wasapi.rc)
-
-target_link_libraries(win-wasapi PRIVATE OBS::libobs Avrt)
-
-set_target_properties(win-wasapi PROPERTIES FOLDER "plugins")
-
-setup_plugin_target(win-wasapi)