jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added rudimentary support for Qt on Linux

Browse Source
This commit is contained in:
Zachary Lund 2014-01-24 21:55:10 -06:00
parent f2d0c98ffe
commit e3299d5662
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libobs-opengl/CMakeLists.txt
View File

@ -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

2
libobs-opengl/gl-x11.c
View File

@ -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;

2
libobs/obs-nix.c
View File

@ -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;

2
obs/qt-wrappers.cpp
View File

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