소스 검색

Added rudimentary support for Qt on Linux

Zachary Lund 11 년 전
부모
커밋
e3299d5662
4개의 변경된 파일6개의 추가작업 그리고 3개의 파일을 삭제
  1. 3 0
      libobs-opengl/CMakeLists.txt
  2. 1 1
      libobs-opengl/gl-x11.c
  3. 1 1
      libobs/obs-nix.c
  4. 1 1
      obs/qt-wrappers.cpp

+ 3 - 0
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

+ 1 - 1
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; 

+ 1 - 1
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;
 

+ 1 - 1
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
 }