From 61aeaa5ca39264a7606d065c58d29b150032efb8 Mon Sep 17 00:00:00 2001
From: Clayton Groeneveld <claytong1214@gmail.com>
Date: Mon, 18 Mar 2019 14:45:05 -0500
Subject: [PATCH] obs-browser: Enable Linux support

This requires CEF >= 3683
---
 UI/obs-app.cpp         |  4 ++++
 plugins/CMakeLists.txt | 20 ++++++++++----------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/UI/obs-app.cpp b/UI/obs-app.cpp
index 330d26e7e..bcee173b3 100644
--- a/UI/obs-app.cpp
+++ b/UI/obs-app.cpp
@@ -1763,6 +1763,10 @@ static int run_program(fstream &logFile, int argc, char *argv[])
 	QGuiApplication::setAttribute(Qt::AA_EnableHighDpiScaling);
 #endif
 
+#if !defined(_WIN32) && !defined(__APPLE__) && BROWSER_AVAILABLE
+	setenv("QT_NO_GLIB", "1", true);
+#endif
+
 	QCoreApplication::addLibraryPath(".");
 
 #if __APPLE__
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 2091e3f67..b08112150 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -48,20 +48,20 @@ elseif("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
 	add_subdirectory(linux-jack)
 endif()
 
-if(WIN32 OR APPLE)
-	option(BUILD_BROWSER "Build browser plugin" OFF)
-	if (BUILD_BROWSER)
-		if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/obs-browser/CMakeLists.txt")
-			add_subdirectory(obs-browser)
-			set(BROWSER_AVAILABLE_INTERNAL ON CACHE BOOL "Internal global cmake variable" FORCE)
-		else()
-			message(STATUS "obs-browser submodule not found!  Please fetch submodules.  obs-browser plugin disabled.")
-			set(BROWSER_AVAILABLE_INTERNAL OFF CACHE BOOL "Internal global cmake variable" FORCE)
-		endif()
+option(BUILD_BROWSER "Build browser plugin" OFF)
+if (BUILD_BROWSER)
+	if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/obs-browser/CMakeLists.txt")
+		add_subdirectory(obs-browser)
+		set(BROWSER_AVAILABLE_INTERNAL ON CACHE BOOL "Internal global cmake variable" FORCE)
 	else()
+		message(STATUS "obs-browser submodule not found!  Please fetch submodules.  obs-browser plugin disabled.")
 		set(BROWSER_AVAILABLE_INTERNAL OFF CACHE BOOL "Internal global cmake variable" FORCE)
 	endif()
+else()
+	set(BROWSER_AVAILABLE_INTERNAL OFF CACHE BOOL "Internal global cmake variable" FORCE)
+endif()
 
+if(WIN32 OR APPLE)
 	if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/obs-vst/CMakeLists.txt")
 		add_subdirectory(obs-vst)
 	else()