browser merge fix

stream-labs · Dec 19, 2024 · c77bf3b · c77bf3b
1 parent 47b9e1c
commit c77bf3b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 6 deletions.
diff --git a/cmake/Modules/ObsHelpers_Windows.cmake b/cmake/Modules/ObsHelpers_Windows.cmake
@@ -189,12 +189,12 @@ function(setup_obs_app target)
     if(MSVC)
       target_compile_options(obs-browser PRIVATE $<IF:$<CONFIG:DEBUG>,/MTd,/MT>)
 
-      target_compile_options(obs-browser-page PRIVATE $<IF:$<CONFIG:DEBUG>,/MTd,/MT>)
+      target_compile_options(obs-browser-helper PRIVATE $<IF:$<CONFIG:DEBUG>,/MTd,/MT>)
     endif()
 
     target_link_options(obs-browser PRIVATE "LINKER:/IGNORE:4099")
 
-    target_link_options(obs-browser-page PRIVATE "LINKER:/IGNORE:4099" "LINKER:/SUBSYSTEM:WINDOWS")
+    target_link_options(obs-browser-helper PRIVATE "LINKER:/IGNORE:4099" "LINKER:/SUBSYSTEM:WINDOWS")
   endif()
 
   _setup_obs_app(${ARGV})

diff --git a/cmake/windows/helpers.cmake b/cmake/windows/helpers.cmake
@@ -53,9 +53,6 @@ function(set_target_properties_obs target)
     elseif(target STREQUAL obs-browser-helper)
       set_property(GLOBAL APPEND PROPERTY _OBS_EXECUTABLES ${target})
       return()
-    elseif(target STREQUAL obs-browser-page)
-      set_property(GLOBAL APPEND PROPERTY _OBS_EXECUTABLES ${target})
-      return()
     else()
       set_property(GLOBAL APPEND PROPERTY _OBS_EXECUTABLES ${target})
     endif()

diff --git a/plugins/obs-browser b/plugins/obs-browser