Browse Source

cmake: Fix configuration errors with Windows legacy path

By default Windows builds use the legacy CMake code paths, which ideally
work as-is with existing build directories.
PatTheMav 2 years ago
parent
commit
89625715fc

+ 15 - 0
libobs/cmake/legacy.cmake

@@ -324,6 +324,21 @@ if(OS_WINDOWS)
     target_compile_options(libobs PRIVATE "$<$<COMPILE_LANGUAGE:C>:/EHc->" "$<$<COMPILE_LANGUAGE:CXX>:/EHc->")
 
     target_link_options(libobs PRIVATE "LINKER:/IGNORE:4098" "LINKER:/SAFESEH:NO")
+
+    add_library(obs-obfuscate INTERFACE)
+    add_library(OBS::obfuscate ALIAS obs-obfuscate)
+    target_sources(obs-obfuscate INTERFACE util/windows/obfuscate.c util/windows/obfuscate.h)
+    target_include_directories(obs-obfuscate INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
+
+    add_library(obs-comutils INTERFACE)
+    add_library(OBS::COMutils ALIAS obs-comutils)
+    target_sources(obs-comutils INTERFACE util/windows/ComPtr.hpp)
+    target_include_directories(obs-comutils INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
+
+    add_library(obs-winhandle INTERFACE)
+    add_library(OBS::winhandle ALIAS obs-winhandle)
+    target_sources(obs-winhandle INTERFACE util/windows/WinHandle.hpp)
+    target_include_directories(obs-winhandle INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
   endif()
 
 elseif(OS_MACOS)

+ 1 - 0
plugins/obs-ffmpeg/obs-nvenc-test/cmake/legacy.cmake

@@ -5,6 +5,7 @@ add_executable(obs-nvenc-test)
 find_package(FFnvcodec 12 REQUIRED)
 
 target_sources(obs-nvenc-test PRIVATE obs-nvenc-test.c ../obs-nvenc-ver.h)
+target_compile_definitions(obs-nvenc-test PRIVATE OBS_LEGACY)
 target_link_libraries(obs-nvenc-test d3d11 dxgi dxguid FFnvcodec::FFnvcodec)
 
 set_target_properties(obs-nvenc-test PROPERTIES FOLDER "plugins/obs-ffmpeg")

+ 1 - 1
plugins/win-capture/cmake/legacy.cmake

@@ -52,7 +52,7 @@ if(MSVC)
 endif()
 
 target_compile_definitions(win-capture PRIVATE UNICODE _UNICODE _CRT_SECURE_NO_WARNINGS _CRT_NONSTDC_NO_WARNINGS
-                                               OBS_VERSION="${OBS_VERSION_CANONICAL}")
+                                               OBS_VERSION="${OBS_VERSION_CANONICAL}" OBS_LEGACY)
 
 set_property(GLOBAL APPEND PROPERTY OBS_MODULE_LIST "win-capture")
 

+ 2 - 1
plugins/win-dshow/cmake/legacy.cmake

@@ -201,7 +201,8 @@ if(ENABLE_VIRTUALCAM AND VIRTUALCAM_AVAILABLE)
 
   target_include_directories(win-dshow PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/config)
 
-  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/virtualcam-guid.h.in ${CMAKE_CURRENT_BINARY_DIR}/config/virtualcam-guid.h)
+  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)