Merge branch 'master' of https://github.com/jp9000/obs-studio

libobs-opengl/CMakeLists.txt

@@ -31,6 +31,9 @@ elseif(APPLE)
 	set(libobs-opengl_PLATFORM_DEPS
 		${COCOA}
 		${IOSURF})
+else()
+	set(libobs-opengl_PLATFORM_SOURCES
+		gl-x11.c)
 endif()
 
 set(libobs-opengl_SOURCES

libobs-opengl/gl-x11.c

@@ -211,7 +211,7 @@ fail0:
 	return NULL;
 }
 
-extern void gl_platform_destroy(struct gl_platform *platform) 
+void gl_platform_destroy(struct gl_platform *platform) 
 {
 	if (!platform)
 		return; 

libobs/obs-nix.c

@@ -61,7 +61,7 @@ char *find_plugin(const char *plugin)
 	if (check_lib_path(plugin, "obs-plugins/", &output))
 		return output.array;
 
-	if (check_lib_path(plugin, OBS_INSTALL_PREFIX "lib/obs-plugins",
+	if (check_lib_path(plugin, OBS_INSTALL_PREFIX "lib/obs-plugins/",
 				&output))
 		return output.array;
 

obs/qt-wrappers.cpp

@@ -46,6 +46,6 @@ void QTToGSWindow(QWidget *widget, gs_window &gswindow)
 #elif __APPLE__
 	/* TODO: mac */
 #else
-	/* TODO: unix */
+	gswindow.id = widget->winId();
 #endif
 }