diff --git a/CMakeLists.txt b/CMakeLists.txt index 6e048f9b6..554979af4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -17,7 +17,7 @@ find_package(nlohmann_json REQUIRED) add_library(obs-browser MODULE) add_library(OBS::browser ALIAS obs-browser) -option(ENABLE_BROWSER_PANELS "Enable Qt web browser panel support" ON) +option(ENABLE_BROWSER_PANELS "Enable Qt web browser panel support" OFF) mark_as_advanced(ENABLE_BROWSER_PANELS) target_sources( diff --git a/cmake/os-macos.cmake b/cmake/os-macos.cmake index 8a66f76be..d95832e45 100644 --- a/cmake/os-macos.cmake +++ b/cmake/os-macos.cmake @@ -31,7 +31,7 @@ foreach(helper IN LISTS helper_suffixes) target_sources( ${target_name} PRIVATE # cmake-format: sortable - browser-app.cpp browser-app.hpp browser-mac.mm browser-mac.h cef-headers.hpp obs-browser-page/obs-browser-page-main.cpp) + browser-app.cpp browser-app.hpp cef-headers.hpp obs-browser-page/obs-browser-page-main.cpp) target_compile_definitions(${target_name} PRIVATE ENABLE_BROWSER_SHARED_TEXTURE) diff --git a/cmake/os-windows.cmake b/cmake/os-windows.cmake index db3c18760..a1c829e86 100644 --- a/cmake/os-windows.cmake +++ b/cmake/os-windows.cmake @@ -22,9 +22,14 @@ target_compile_definitions(obs-browser-helper PRIVATE ENABLE_BROWSER_SHARED_TEXT target_link_libraries(obs-browser-helper PRIVATE CEF::Wrapper CEF::Library nlohmann_json::nlohmann_json) target_link_options(obs-browser-helper PRIVATE /IGNORE:4099 /SUBSYSTEM:WINDOWS) +message(STATUS "Buiding browser source plugin helper for Windows") + set(OBS_EXECUTABLE_DESTINATION "${OBS_PLUGIN_DESTINATION}") set_target_properties_obs( obs-browser-helper PROPERTIES FOLDER plugins/obs-browser PREFIX "" OUTPUT_NAME obs-browser-page) + +#make it dependence for obs-browser +add_dependencies(obs-browser obs-browser-helper) \ No newline at end of file diff --git a/obs-browser-source.cpp b/obs-browser-source.cpp index 7e386d2b6..7f2058735 100644 --- a/obs-browser-source.cpp +++ b/obs-browser-source.cpp @@ -231,7 +231,7 @@ bool BrowserSource::CreateBrowser() obs_get_video_info(&ovi); canvas_fps = (double)ovi.fps_num / (double)ovi.fps_den; cefBrowserSettings.windowless_frame_rate = - (fps_custom) ? fps : canvas_fps; + (fps_custom) ? fps : (int)canvas_fps; #endif #else cefBrowserSettings.windowless_frame_rate = fps; @@ -656,7 +656,7 @@ void BrowserSource::Tick() if (!fps_custom) { if (!!cefBrowser && canvas_fps != video_fps) { cefBrowser->GetHost()->SetWindowlessFrameRate( - video_fps); + (int)video_fps); canvas_fps = video_fps; } }