浏览代码

Rename linux-xshm module to linux-capture

jp9000 11 年之前
父节点
当前提交
a9cd60a78f
共有 37 个文件被更改,包括 31 次插入31 次删除
  1. 1 1
      plugins/CMakeLists.txt
  2. 30 0
      plugins/linux-capture/CMakeLists.txt
  3. 0 0
      plugins/linux-capture/README
  4. 0 0
      plugins/linux-capture/data/locale/ar-SA.ini
  5. 0 0
      plugins/linux-capture/data/locale/da-DK.ini
  6. 0 0
      plugins/linux-capture/data/locale/de-DE.ini
  7. 0 0
      plugins/linux-capture/data/locale/en-US.ini
  8. 0 0
      plugins/linux-capture/data/locale/es-ES.ini
  9. 0 0
      plugins/linux-capture/data/locale/eu-ES.ini
  10. 0 0
      plugins/linux-capture/data/locale/fi-FI.ini
  11. 0 0
      plugins/linux-capture/data/locale/fr-FR.ini
  12. 0 0
      plugins/linux-capture/data/locale/gl-ES.ini
  13. 0 0
      plugins/linux-capture/data/locale/hr-HR.ini
  14. 0 0
      plugins/linux-capture/data/locale/hu-HU.ini
  15. 0 0
      plugins/linux-capture/data/locale/it-IT.ini
  16. 0 0
      plugins/linux-capture/data/locale/ja-JP.ini
  17. 0 0
      plugins/linux-capture/data/locale/ko-KR.ini
  18. 0 0
      plugins/linux-capture/data/locale/nb-NO.ini
  19. 0 0
      plugins/linux-capture/data/locale/nl-NL.ini
  20. 0 0
      plugins/linux-capture/data/locale/pl-PL.ini
  21. 0 0
      plugins/linux-capture/data/locale/pt-BR.ini
  22. 0 0
      plugins/linux-capture/data/locale/pt-PT.ini
  23. 0 0
      plugins/linux-capture/data/locale/ro-RO.ini
  24. 0 0
      plugins/linux-capture/data/locale/ru-RU.ini
  25. 0 0
      plugins/linux-capture/data/locale/sl-SI.ini
  26. 0 0
      plugins/linux-capture/data/locale/sr-CS.ini
  27. 0 0
      plugins/linux-capture/data/locale/sr-SP.ini
  28. 0 0
      plugins/linux-capture/data/locale/sv-SE.ini
  29. 0 0
      plugins/linux-capture/data/locale/tr-TR.ini
  30. 0 0
      plugins/linux-capture/data/locale/zh-TW.ini
  31. 0 0
      plugins/linux-capture/linux-capture.c
  32. 0 0
      plugins/linux-capture/xcursor.c
  33. 0 0
      plugins/linux-capture/xcursor.h
  34. 0 0
      plugins/linux-capture/xhelpers.c
  35. 0 0
      plugins/linux-capture/xhelpers.h
  36. 0 0
      plugins/linux-capture/xshm-input.c
  37. 0 30
      plugins/linux-xshm/CMakeLists.txt

+ 1 - 1
plugins/CMakeLists.txt

@@ -7,7 +7,7 @@ elseif(APPLE)
 	add_subdirectory(mac-avcapture)
 	add_subdirectory(mac-capture)
 elseif("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
-	add_subdirectory(linux-xshm)
+	add_subdirectory(linux-capture)
 	add_subdirectory(linux-xcomposite)
 	add_subdirectory(linux-pulseaudio)
 	add_subdirectory(linux-v4l2)

+ 30 - 0
plugins/linux-capture/CMakeLists.txt

@@ -0,0 +1,30 @@
+project(linux-capture)
+
+find_package(X11 REQUIRED)
+
+include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/libobs")
+
+set(linux-capture_SOURCES
+	linux-capture.c
+	xcursor.c
+	xhelpers.c
+	capture-input.c
+)
+set(linux-capture_HEADERS
+	xcursor.h
+	xhelpers.h
+)
+
+add_library(linux-capture MODULE
+	${linux-capture_SOURCES}
+	${linux-capture_HEADERS}
+)
+target_link_libraries(linux-capture
+	libobs
+	${X11_LIBRARIES}
+	${X11_XShm_LIB}
+	${X11_Xfixes_LIB}
+	${X11_Xinerama_LIB}
+)
+
+install_obs_plugin_with_data(linux-capture data)

+ 0 - 0
plugins/linux-xshm/README → plugins/linux-capture/README


+ 0 - 0
plugins/linux-xshm/data/locale/ar-SA.ini → plugins/linux-capture/data/locale/ar-SA.ini


+ 0 - 0
plugins/linux-xshm/data/locale/da-DK.ini → plugins/linux-capture/data/locale/da-DK.ini


+ 0 - 0
plugins/linux-xshm/data/locale/de-DE.ini → plugins/linux-capture/data/locale/de-DE.ini


+ 0 - 0
plugins/linux-xshm/data/locale/en-US.ini → plugins/linux-capture/data/locale/en-US.ini


+ 0 - 0
plugins/linux-xshm/data/locale/es-ES.ini → plugins/linux-capture/data/locale/es-ES.ini


+ 0 - 0
plugins/linux-xshm/data/locale/eu-ES.ini → plugins/linux-capture/data/locale/eu-ES.ini


+ 0 - 0
plugins/linux-xshm/data/locale/fi-FI.ini → plugins/linux-capture/data/locale/fi-FI.ini


+ 0 - 0
plugins/linux-xshm/data/locale/fr-FR.ini → plugins/linux-capture/data/locale/fr-FR.ini


+ 0 - 0
plugins/linux-xshm/data/locale/gl-ES.ini → plugins/linux-capture/data/locale/gl-ES.ini


+ 0 - 0
plugins/linux-xshm/data/locale/hr-HR.ini → plugins/linux-capture/data/locale/hr-HR.ini


+ 0 - 0
plugins/linux-xshm/data/locale/hu-HU.ini → plugins/linux-capture/data/locale/hu-HU.ini


+ 0 - 0
plugins/linux-xshm/data/locale/it-IT.ini → plugins/linux-capture/data/locale/it-IT.ini


+ 0 - 0
plugins/linux-xshm/data/locale/ja-JP.ini → plugins/linux-capture/data/locale/ja-JP.ini


+ 0 - 0
plugins/linux-xshm/data/locale/ko-KR.ini → plugins/linux-capture/data/locale/ko-KR.ini


+ 0 - 0
plugins/linux-xshm/data/locale/nb-NO.ini → plugins/linux-capture/data/locale/nb-NO.ini


+ 0 - 0
plugins/linux-xshm/data/locale/nl-NL.ini → plugins/linux-capture/data/locale/nl-NL.ini


+ 0 - 0
plugins/linux-xshm/data/locale/pl-PL.ini → plugins/linux-capture/data/locale/pl-PL.ini


+ 0 - 0
plugins/linux-xshm/data/locale/pt-BR.ini → plugins/linux-capture/data/locale/pt-BR.ini


+ 0 - 0
plugins/linux-xshm/data/locale/pt-PT.ini → plugins/linux-capture/data/locale/pt-PT.ini


+ 0 - 0
plugins/linux-xshm/data/locale/ro-RO.ini → plugins/linux-capture/data/locale/ro-RO.ini


+ 0 - 0
plugins/linux-xshm/data/locale/ru-RU.ini → plugins/linux-capture/data/locale/ru-RU.ini


+ 0 - 0
plugins/linux-xshm/data/locale/sl-SI.ini → plugins/linux-capture/data/locale/sl-SI.ini


+ 0 - 0
plugins/linux-xshm/data/locale/sr-CS.ini → plugins/linux-capture/data/locale/sr-CS.ini


+ 0 - 0
plugins/linux-xshm/data/locale/sr-SP.ini → plugins/linux-capture/data/locale/sr-SP.ini


+ 0 - 0
plugins/linux-xshm/data/locale/sv-SE.ini → plugins/linux-capture/data/locale/sv-SE.ini


+ 0 - 0
plugins/linux-xshm/data/locale/tr-TR.ini → plugins/linux-capture/data/locale/tr-TR.ini


+ 0 - 0
plugins/linux-xshm/data/locale/zh-TW.ini → plugins/linux-capture/data/locale/zh-TW.ini


+ 0 - 0
plugins/linux-xshm/linux-xshm.c → plugins/linux-capture/linux-capture.c


+ 0 - 0
plugins/linux-xshm/xcursor.c → plugins/linux-capture/xcursor.c


+ 0 - 0
plugins/linux-xshm/xcursor.h → plugins/linux-capture/xcursor.h


+ 0 - 0
plugins/linux-xshm/xhelpers.c → plugins/linux-capture/xhelpers.c


+ 0 - 0
plugins/linux-xshm/xhelpers.h → plugins/linux-capture/xhelpers.h


+ 0 - 0
plugins/linux-xshm/xshm-input.c → plugins/linux-capture/xshm-input.c


+ 0 - 30
plugins/linux-xshm/CMakeLists.txt

@@ -1,30 +0,0 @@
-project(linux-xshm)
-
-find_package(X11 REQUIRED)
-
-include_directories(SYSTEM "${CMAKE_SOURCE_DIR}/libobs")
-
-set(linux-xshm_SOURCES
-	linux-xshm.c
-	xcursor.c
-	xhelpers.c
-	xshm-input.c
-)
-set(linux-xshm_HEADERS
-	xcursor.h
-	xhelpers.h
-)
-
-add_library(linux-xshm MODULE
-	${linux-xshm_SOURCES}
-	${linux-xshm_HEADERS}
-)
-target_link_libraries(linux-xshm
-	libobs
-	${X11_LIBRARIES}
-	${X11_XShm_LIB}
-	${X11_Xfixes_LIB}
-	${X11_Xinerama_LIB}
-)
-
-install_obs_plugin_with_data(linux-xshm data)