Răsfoiți Sursa

Move all data into the subdir it belongs to

Completely removes the build dir in favor of cmake based build layouting
BtbN 11 ani în urmă
părinte
comite
38c2fc87aa
100 a modificat fișierele cu 7 adăugiri și 21 ștergeri
  1. 1 1
      .gitignore
  2. 0 3
      build/.gitignore
  3. 0 0
      build/bin/32bit/.gitignore
  4. 0 0
      build/bin/64bit/.gitignore
  5. 0 5
      build/copy_debug64.bat
  6. 0 5
      build/copy_release64.bat
  7. 0 1
      build/data/.gitignore
  8. 0 0
      build/obs-plugins/32bit/.gitignore
  9. 0 0
      build/obs-plugins/64bit/.gitignore
  10. 1 1
      libobs/CMakeLists.txt
  11. 0 0
      libobs/data/default.effect
  12. 0 0
      libobs/data/format_conversion.effect
  13. 0 0
      libobs/data/solid.effect
  14. 1 1
      obs/CMakeLists.txt
  15. 0 0
      obs/data/license/gplv2.txt
  16. 0 0
      obs/data/locale.ini
  17. 0 0
      obs/data/locale/ar-SA.ini
  18. 0 0
      obs/data/locale/cs-CZ.ini
  19. 0 0
      obs/data/locale/da-DK.ini
  20. 0 0
      obs/data/locale/de-DE.ini
  21. 0 0
      obs/data/locale/en-US.ini
  22. 0 0
      obs/data/locale/es-ES.ini
  23. 0 0
      obs/data/locale/fi-FI.ini
  24. 0 0
      obs/data/locale/fr-FR.ini
  25. 0 0
      obs/data/locale/hu-HU.ini
  26. 0 0
      obs/data/locale/it-IT.ini
  27. 0 0
      obs/data/locale/ja-JP.ini
  28. 0 0
      obs/data/locale/ko-KR.ini
  29. 0 0
      obs/data/locale/nb-NO.ini
  30. 0 0
      obs/data/locale/nl-NL.ini
  31. 0 0
      obs/data/locale/pl-PL.ini
  32. 0 0
      obs/data/locale/pt-BR.ini
  33. 0 0
      obs/data/locale/pt-PT.ini
  34. 0 0
      obs/data/locale/ro-RO.ini
  35. 0 0
      obs/data/locale/ru-RU.ini
  36. 0 0
      obs/data/locale/sl-SI.ini
  37. 0 0
      obs/data/locale/sv-SE.ini
  38. 0 0
      obs/data/locale/tr-TR.ini
  39. 0 0
      obs/data/locale/zh-CN.ini
  40. 1 1
      plugins/image-source/CMakeLists.txt
  41. 0 0
      plugins/image-source/data/locale/de-DE.ini
  42. 0 0
      plugins/image-source/data/locale/en-US.ini
  43. 0 0
      plugins/image-source/data/locale/es-ES.ini
  44. 0 0
      plugins/image-source/data/locale/fi-FI.ini
  45. 0 0
      plugins/image-source/data/locale/fr-FR.ini
  46. 0 0
      plugins/image-source/data/locale/hu-HU.ini
  47. 0 0
      plugins/image-source/data/locale/it-IT.ini
  48. 0 0
      plugins/image-source/data/locale/ja-JP.ini
  49. 0 0
      plugins/image-source/data/locale/ko-KR.ini
  50. 0 0
      plugins/image-source/data/locale/nb-NO.ini
  51. 0 0
      plugins/image-source/data/locale/nl-NL.ini
  52. 0 0
      plugins/image-source/data/locale/pl-PL.ini
  53. 0 0
      plugins/image-source/data/locale/pt-BR.ini
  54. 0 0
      plugins/image-source/data/locale/pt-PT.ini
  55. 0 0
      plugins/image-source/data/locale/ro-RO.ini
  56. 0 0
      plugins/image-source/data/locale/ru-RU.ini
  57. 0 0
      plugins/image-source/data/locale/sl-SI.ini
  58. 0 0
      plugins/image-source/data/locale/sv-SE.ini
  59. 0 0
      plugins/image-source/data/locale/tr-TR.ini
  60. 1 1
      plugins/linux-pulseaudio/CMakeLists.txt
  61. 0 0
      plugins/linux-pulseaudio/data/locale/de-DE.ini
  62. 0 0
      plugins/linux-pulseaudio/data/locale/en-US.ini
  63. 0 0
      plugins/linux-pulseaudio/data/locale/es-ES.ini
  64. 0 0
      plugins/linux-pulseaudio/data/locale/fi-FI.ini
  65. 0 0
      plugins/linux-pulseaudio/data/locale/fr-FR.ini
  66. 0 0
      plugins/linux-pulseaudio/data/locale/hu-HU.ini
  67. 0 0
      plugins/linux-pulseaudio/data/locale/it-IT.ini
  68. 0 0
      plugins/linux-pulseaudio/data/locale/ja-JP.ini
  69. 0 0
      plugins/linux-pulseaudio/data/locale/ko-KR.ini
  70. 0 0
      plugins/linux-pulseaudio/data/locale/nb-NO.ini
  71. 0 0
      plugins/linux-pulseaudio/data/locale/nl-NL.ini
  72. 0 0
      plugins/linux-pulseaudio/data/locale/pl-PL.ini
  73. 0 0
      plugins/linux-pulseaudio/data/locale/pt-BR.ini
  74. 0 0
      plugins/linux-pulseaudio/data/locale/pt-PT.ini
  75. 0 0
      plugins/linux-pulseaudio/data/locale/ro-RO.ini
  76. 0 0
      plugins/linux-pulseaudio/data/locale/ru-RU.ini
  77. 0 0
      plugins/linux-pulseaudio/data/locale/sv-SE.ini
  78. 0 0
      plugins/linux-pulseaudio/data/locale/tr-TR.ini
  79. 1 1
      plugins/linux-v4l2/CMakeLists.txt
  80. 0 0
      plugins/linux-v4l2/data/locale/de-DE.ini
  81. 0 0
      plugins/linux-v4l2/data/locale/en-US.ini
  82. 0 0
      plugins/linux-v4l2/data/locale/es-ES.ini
  83. 0 0
      plugins/linux-v4l2/data/locale/fi-FI.ini
  84. 0 0
      plugins/linux-v4l2/data/locale/fr-FR.ini
  85. 0 0
      plugins/linux-v4l2/data/locale/hu-HU.ini
  86. 0 0
      plugins/linux-v4l2/data/locale/it-IT.ini
  87. 0 0
      plugins/linux-v4l2/data/locale/ja-JP.ini
  88. 0 0
      plugins/linux-v4l2/data/locale/ko-KR.ini
  89. 0 0
      plugins/linux-v4l2/data/locale/nb-NO.ini
  90. 0 0
      plugins/linux-v4l2/data/locale/nl-NL.ini
  91. 0 0
      plugins/linux-v4l2/data/locale/pl-PL.ini
  92. 0 0
      plugins/linux-v4l2/data/locale/pt-BR.ini
  93. 0 0
      plugins/linux-v4l2/data/locale/pt-PT.ini
  94. 0 0
      plugins/linux-v4l2/data/locale/ro-RO.ini
  95. 0 0
      plugins/linux-v4l2/data/locale/ru-RU.ini
  96. 0 0
      plugins/linux-v4l2/data/locale/sv-SE.ini
  97. 0 0
      plugins/linux-v4l2/data/locale/tr-TR.ini
  98. 1 1
      plugins/linux-xcomposite/CMakeLists.txt
  99. 0 0
      plugins/linux-xcomposite/data/locale/de-DE.ini
  100. 0 0
      plugins/linux-xcomposite/data/locale/en-US.ini

+ 1 - 1
.gitignore

@@ -45,7 +45,6 @@ libtool
 ltmain.sh
 
 *.dmg
-*.json
 *.app
 .DS_Store
 
@@ -95,6 +94,7 @@ tags
 
 #cmake
 cmbuild/
+build/
 
 #xcode
 *.xcodeproj/

+ 0 - 3
build/.gitignore

@@ -1,3 +0,0 @@
-CMakeFiles
-CMakeCache.txt
-*.cmake

+ 0 - 0
build/bin/32bit/.gitignore


+ 0 - 0
build/bin/64bit/.gitignore


+ 0 - 5
build/copy_debug64.bat

@@ -1,5 +0,0 @@
-copy ..\vs\2010\x64\Debug\libobs.dll bin\64bit
-copy ..\vs\2010\x64\Debug\libobs-opengl.dll bin\64bit
-copy ..\vs\2010\x64\Debug\libobs-d3d11.dll bin\64bit
-copy ..\vs\2010\x64\Debug\wintest.exe bin\64bit
-copy ..\vs\2010\x64\Debug\test-input.dll plugins\64bit

+ 0 - 5
build/copy_release64.bat

@@ -1,5 +0,0 @@
-copy ..\vs\2010\x64\Release\libobs.dll bin\64bit
-copy ..\vs\2010\x64\Release\libobs-opengl.dll bin\64bit
-copy ..\vs\2010\x64\Release\libobs-d3d11.dll bin\64bit
-copy ..\vs\2010\x64\Release\wintest.exe bin\64bit
-copy ..\vs\2010\x64\Release\test-input.dll plugins\64bit

+ 0 - 1
build/data/.gitignore

@@ -1 +0,0 @@
-!*.json

+ 0 - 0
build/obs-plugins/32bit/.gitignore


+ 0 - 0
build/obs-plugins/64bit/.gitignore


+ 1 - 1
libobs/CMakeLists.txt

@@ -285,5 +285,5 @@ target_link_libraries(libobs
 		${LIBAVUTIL_LIBRARIES})
 
 install_obs_core(libobs EXPORT LibObs)
-install_obs_data(libobs ../build/data/libobs libobs)
+install_obs_data(libobs data libobs)
 install_obs_headers(${libobs_HEADERS})

+ 0 - 0
build/data/libobs/default.effect → libobs/data/default.effect


+ 0 - 0
build/data/libobs/format_conversion.effect → libobs/data/format_conversion.effect


+ 0 - 0
build/data/libobs/solid.effect → libobs/data/solid.effect


+ 1 - 1
obs/CMakeLists.txt

@@ -128,5 +128,5 @@ target_link_libraries(obs
 	${obs_PLATFORM_LIBRARIES})
 
 install_obs_core(obs)
-install_obs_data(obs ../build/data/obs-studio obs-studio)
+install_obs_data(obs data obs-studio)
 

+ 0 - 0
build/data/obs-studio/license/gplv2.txt → obs/data/license/gplv2.txt


+ 0 - 0
build/data/obs-studio/locale.ini → obs/data/locale.ini


+ 0 - 0
build/data/obs-studio/locale/ar-SA.ini → obs/data/locale/ar-SA.ini


+ 0 - 0
build/data/obs-studio/locale/cs-CZ.ini → obs/data/locale/cs-CZ.ini


+ 0 - 0
build/data/obs-studio/locale/da-DK.ini → obs/data/locale/da-DK.ini


+ 0 - 0
build/data/obs-studio/locale/de-DE.ini → obs/data/locale/de-DE.ini


+ 0 - 0
build/data/obs-studio/locale/en-US.ini → obs/data/locale/en-US.ini


+ 0 - 0
build/data/obs-studio/locale/es-ES.ini → obs/data/locale/es-ES.ini


+ 0 - 0
build/data/obs-studio/locale/fi-FI.ini → obs/data/locale/fi-FI.ini


+ 0 - 0
build/data/obs-studio/locale/fr-FR.ini → obs/data/locale/fr-FR.ini


+ 0 - 0
build/data/obs-studio/locale/hu-HU.ini → obs/data/locale/hu-HU.ini


+ 0 - 0
build/data/obs-studio/locale/it-IT.ini → obs/data/locale/it-IT.ini


+ 0 - 0
build/data/obs-studio/locale/ja-JP.ini → obs/data/locale/ja-JP.ini


+ 0 - 0
build/data/obs-studio/locale/ko-KR.ini → obs/data/locale/ko-KR.ini


+ 0 - 0
build/data/obs-studio/locale/nb-NO.ini → obs/data/locale/nb-NO.ini


+ 0 - 0
build/data/obs-studio/locale/nl-NL.ini → obs/data/locale/nl-NL.ini


+ 0 - 0
build/data/obs-studio/locale/pl-PL.ini → obs/data/locale/pl-PL.ini


+ 0 - 0
build/data/obs-studio/locale/pt-BR.ini → obs/data/locale/pt-BR.ini


+ 0 - 0
build/data/obs-studio/locale/pt-PT.ini → obs/data/locale/pt-PT.ini


+ 0 - 0
build/data/obs-studio/locale/ro-RO.ini → obs/data/locale/ro-RO.ini


+ 0 - 0
build/data/obs-studio/locale/ru-RU.ini → obs/data/locale/ru-RU.ini


+ 0 - 0
build/data/obs-studio/locale/sl-SI.ini → obs/data/locale/sl-SI.ini


+ 0 - 0
build/data/obs-studio/locale/sv-SE.ini → obs/data/locale/sv-SE.ini


+ 0 - 0
build/data/obs-studio/locale/tr-TR.ini → obs/data/locale/tr-TR.ini


+ 0 - 0
build/data/obs-studio/locale/zh-CN.ini → obs/data/locale/zh-CN.ini


+ 1 - 1
plugins/image-source/CMakeLists.txt

@@ -9,4 +9,4 @@ target_link_libraries(image-source
 	libobs)
 
 install_obs_plugin(image-source)
-install_obs_plugin_data(image-source ../../build/data/obs-plugins/image-source)
+install_obs_plugin_data(image-source data)

+ 0 - 0
build/data/obs-plugins/image-source/locale/de-DE.ini → plugins/image-source/data/locale/de-DE.ini


+ 0 - 0
build/data/obs-plugins/image-source/locale/en-US.ini → plugins/image-source/data/locale/en-US.ini


+ 0 - 0
build/data/obs-plugins/image-source/locale/es-ES.ini → plugins/image-source/data/locale/es-ES.ini


+ 0 - 0
build/data/obs-plugins/image-source/locale/fi-FI.ini → plugins/image-source/data/locale/fi-FI.ini


+ 0 - 0
build/data/obs-plugins/image-source/locale/fr-FR.ini → plugins/image-source/data/locale/fr-FR.ini


+ 0 - 0
build/data/obs-plugins/image-source/locale/hu-HU.ini → plugins/image-source/data/locale/hu-HU.ini


+ 0 - 0
build/data/obs-plugins/image-source/locale/it-IT.ini → plugins/image-source/data/locale/it-IT.ini


+ 0 - 0
build/data/obs-plugins/image-source/locale/ja-JP.ini → plugins/image-source/data/locale/ja-JP.ini


+ 0 - 0
build/data/obs-plugins/image-source/locale/ko-KR.ini → plugins/image-source/data/locale/ko-KR.ini


+ 0 - 0
build/data/obs-plugins/image-source/locale/nb-NO.ini → plugins/image-source/data/locale/nb-NO.ini


+ 0 - 0
build/data/obs-plugins/image-source/locale/nl-NL.ini → plugins/image-source/data/locale/nl-NL.ini


+ 0 - 0
build/data/obs-plugins/image-source/locale/pl-PL.ini → plugins/image-source/data/locale/pl-PL.ini


+ 0 - 0
build/data/obs-plugins/image-source/locale/pt-BR.ini → plugins/image-source/data/locale/pt-BR.ini


+ 0 - 0
build/data/obs-plugins/image-source/locale/pt-PT.ini → plugins/image-source/data/locale/pt-PT.ini


+ 0 - 0
build/data/obs-plugins/image-source/locale/ro-RO.ini → plugins/image-source/data/locale/ro-RO.ini


+ 0 - 0
build/data/obs-plugins/image-source/locale/ru-RU.ini → plugins/image-source/data/locale/ru-RU.ini


+ 0 - 0
build/data/obs-plugins/image-source/locale/sl-SI.ini → plugins/image-source/data/locale/sl-SI.ini


+ 0 - 0
build/data/obs-plugins/image-source/locale/sv-SE.ini → plugins/image-source/data/locale/sv-SE.ini


+ 0 - 0
build/data/obs-plugins/image-source/locale/tr-TR.ini → plugins/image-source/data/locale/tr-TR.ini


+ 1 - 1
plugins/linux-pulseaudio/CMakeLists.txt

@@ -23,4 +23,4 @@ target_link_libraries(linux-pulseaudio
 )
 
 install_obs_plugin(linux-pulseaudio)
-install_obs_plugin_data(linux-pulseaudio ../../build/data/obs-plugins/linux-pulseaudio)
+install_obs_plugin_data(linux-pulseaudio data)

+ 0 - 0
build/data/obs-plugins/linux-pulseaudio/locale/de-DE.ini → plugins/linux-pulseaudio/data/locale/de-DE.ini


+ 0 - 0
build/data/obs-plugins/linux-pulseaudio/locale/en-US.ini → plugins/linux-pulseaudio/data/locale/en-US.ini


+ 0 - 0
build/data/obs-plugins/linux-pulseaudio/locale/es-ES.ini → plugins/linux-pulseaudio/data/locale/es-ES.ini


+ 0 - 0
build/data/obs-plugins/linux-pulseaudio/locale/fi-FI.ini → plugins/linux-pulseaudio/data/locale/fi-FI.ini


+ 0 - 0
build/data/obs-plugins/linux-pulseaudio/locale/fr-FR.ini → plugins/linux-pulseaudio/data/locale/fr-FR.ini


+ 0 - 0
build/data/obs-plugins/linux-pulseaudio/locale/hu-HU.ini → plugins/linux-pulseaudio/data/locale/hu-HU.ini


+ 0 - 0
build/data/obs-plugins/linux-pulseaudio/locale/it-IT.ini → plugins/linux-pulseaudio/data/locale/it-IT.ini


+ 0 - 0
build/data/obs-plugins/linux-pulseaudio/locale/ja-JP.ini → plugins/linux-pulseaudio/data/locale/ja-JP.ini


+ 0 - 0
build/data/obs-plugins/linux-pulseaudio/locale/ko-KR.ini → plugins/linux-pulseaudio/data/locale/ko-KR.ini


+ 0 - 0
build/data/obs-plugins/linux-pulseaudio/locale/nb-NO.ini → plugins/linux-pulseaudio/data/locale/nb-NO.ini


+ 0 - 0
build/data/obs-plugins/linux-pulseaudio/locale/nl-NL.ini → plugins/linux-pulseaudio/data/locale/nl-NL.ini


+ 0 - 0
build/data/obs-plugins/linux-pulseaudio/locale/pl-PL.ini → plugins/linux-pulseaudio/data/locale/pl-PL.ini


+ 0 - 0
build/data/obs-plugins/linux-pulseaudio/locale/pt-BR.ini → plugins/linux-pulseaudio/data/locale/pt-BR.ini


+ 0 - 0
build/data/obs-plugins/linux-pulseaudio/locale/pt-PT.ini → plugins/linux-pulseaudio/data/locale/pt-PT.ini


+ 0 - 0
build/data/obs-plugins/linux-pulseaudio/locale/ro-RO.ini → plugins/linux-pulseaudio/data/locale/ro-RO.ini


+ 0 - 0
build/data/obs-plugins/linux-pulseaudio/locale/ru-RU.ini → plugins/linux-pulseaudio/data/locale/ru-RU.ini


+ 0 - 0
build/data/obs-plugins/linux-pulseaudio/locale/sv-SE.ini → plugins/linux-pulseaudio/data/locale/sv-SE.ini


+ 0 - 0
build/data/obs-plugins/linux-pulseaudio/locale/tr-TR.ini → plugins/linux-pulseaudio/data/locale/tr-TR.ini


+ 1 - 1
plugins/linux-v4l2/CMakeLists.txt

@@ -13,4 +13,4 @@ target_link_libraries(linux-v4l2
 )
 
 install_obs_plugin(linux-v4l2)
-install_obs_plugin_data(linux-v4l2 ../../build/data/obs-plugins/linux-v4l2)
+install_obs_plugin_data(linux-v4l2 data)

+ 0 - 0
build/data/obs-plugins/linux-v4l2/locale/de-DE.ini → plugins/linux-v4l2/data/locale/de-DE.ini


+ 0 - 0
build/data/obs-plugins/linux-v4l2/locale/en-US.ini → plugins/linux-v4l2/data/locale/en-US.ini


+ 0 - 0
build/data/obs-plugins/linux-v4l2/locale/es-ES.ini → plugins/linux-v4l2/data/locale/es-ES.ini


+ 0 - 0
build/data/obs-plugins/linux-v4l2/locale/fi-FI.ini → plugins/linux-v4l2/data/locale/fi-FI.ini


+ 0 - 0
build/data/obs-plugins/linux-v4l2/locale/fr-FR.ini → plugins/linux-v4l2/data/locale/fr-FR.ini


+ 0 - 0
build/data/obs-plugins/linux-v4l2/locale/hu-HU.ini → plugins/linux-v4l2/data/locale/hu-HU.ini


+ 0 - 0
build/data/obs-plugins/linux-v4l2/locale/it-IT.ini → plugins/linux-v4l2/data/locale/it-IT.ini


+ 0 - 0
build/data/obs-plugins/linux-v4l2/locale/ja-JP.ini → plugins/linux-v4l2/data/locale/ja-JP.ini


+ 0 - 0
build/data/obs-plugins/linux-v4l2/locale/ko-KR.ini → plugins/linux-v4l2/data/locale/ko-KR.ini


+ 0 - 0
build/data/obs-plugins/linux-v4l2/locale/nb-NO.ini → plugins/linux-v4l2/data/locale/nb-NO.ini


+ 0 - 0
build/data/obs-plugins/linux-v4l2/locale/nl-NL.ini → plugins/linux-v4l2/data/locale/nl-NL.ini


+ 0 - 0
build/data/obs-plugins/linux-v4l2/locale/pl-PL.ini → plugins/linux-v4l2/data/locale/pl-PL.ini


+ 0 - 0
build/data/obs-plugins/linux-v4l2/locale/pt-BR.ini → plugins/linux-v4l2/data/locale/pt-BR.ini


+ 0 - 0
build/data/obs-plugins/linux-v4l2/locale/pt-PT.ini → plugins/linux-v4l2/data/locale/pt-PT.ini


+ 0 - 0
build/data/obs-plugins/linux-v4l2/locale/ro-RO.ini → plugins/linux-v4l2/data/locale/ro-RO.ini


+ 0 - 0
build/data/obs-plugins/linux-v4l2/locale/ru-RU.ini → plugins/linux-v4l2/data/locale/ru-RU.ini


+ 0 - 0
build/data/obs-plugins/linux-v4l2/locale/sv-SE.ini → plugins/linux-v4l2/data/locale/sv-SE.ini


+ 0 - 0
build/data/obs-plugins/linux-v4l2/locale/tr-TR.ini → plugins/linux-v4l2/data/locale/tr-TR.ini


+ 1 - 1
plugins/linux-xcomposite/CMakeLists.txt

@@ -26,4 +26,4 @@ target_link_libraries(linux-xcomposite
 	${X11_Xcomposite_LIB})
 
 install_obs_plugin(linux-xcomposite)
-install_obs_plugin_data(linux-xcomposite ../../build/data/obs-plugins/linux-xcomposite)
+install_obs_plugin_data(linux-xcomposite data)

+ 0 - 0
build/data/obs-plugins/linux-xcomposite/locale/de-DE.ini → plugins/linux-xcomposite/data/locale/de-DE.ini


+ 0 - 0
build/data/obs-plugins/linux-xcomposite/locale/en-US.ini → plugins/linux-xcomposite/data/locale/en-US.ini


Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff