Jelajahi Sumber

deps,shared,frontend-tools: Move obs-scripting to shared folder

tytan652 2 tahun lalu
induk
melakukan
f5e2f15d28
32 mengubah file dengan 6 tambahan dan 2 penghapusan
  1. 1 1
      UI/frontend-plugins/frontend-tools/CMakeLists.txt
  2. 2 0
      UI/frontend-plugins/frontend-tools/cmake/legacy.cmake
  3. 0 1
      deps/CMakeLists.txt
  4. 0 0
      shared/obs-scripting/CMakeLists.txt
  5. 0 0
      shared/obs-scripting/cmake/cstrcache.cmake
  6. 3 0
      shared/obs-scripting/cmake/legacy.cmake
  7. 0 0
      shared/obs-scripting/cmake/lua.cmake
  8. 0 0
      shared/obs-scripting/cmake/python.cmake
  9. 0 0
      shared/obs-scripting/cmake/windows/obs-module.rc.in
  10. 0 0
      shared/obs-scripting/cstrcache.cpp
  11. 0 0
      shared/obs-scripting/cstrcache.h
  12. 0 0
      shared/obs-scripting/obs-scripting-callback.h
  13. 0 0
      shared/obs-scripting/obs-scripting-config.h.in
  14. 0 0
      shared/obs-scripting/obs-scripting-internal.h
  15. 0 0
      shared/obs-scripting/obs-scripting-logging.c
  16. 0 0
      shared/obs-scripting/obs-scripting-lua-frontend.c
  17. 0 0
      shared/obs-scripting/obs-scripting-lua-source.c
  18. 0 0
      shared/obs-scripting/obs-scripting-lua.c
  19. 0 0
      shared/obs-scripting/obs-scripting-lua.h
  20. 0 0
      shared/obs-scripting/obs-scripting-python-frontend.c
  21. 0 0
      shared/obs-scripting/obs-scripting-python-import.c
  22. 0 0
      shared/obs-scripting/obs-scripting-python-import.h
  23. 0 0
      shared/obs-scripting/obs-scripting-python.c
  24. 0 0
      shared/obs-scripting/obs-scripting-python.h
  25. 0 0
      shared/obs-scripting/obs-scripting.c
  26. 0 0
      shared/obs-scripting/obs-scripting.h
  27. 0 0
      shared/obs-scripting/obslua/CMakeLists.txt
  28. 0 0
      shared/obs-scripting/obslua/cmake/legacy.cmake
  29. 0 0
      shared/obs-scripting/obslua/obslua.i
  30. 0 0
      shared/obs-scripting/obspython/CMakeLists.txt
  31. 0 0
      shared/obs-scripting/obspython/cmake/legacy.cmake
  32. 0 0
      shared/obs-scripting/obspython/obspython.i

+ 1 - 1
UI/frontend-plugins/frontend-tools/CMakeLists.txt

@@ -51,7 +51,7 @@ target_link_libraries(
           $<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD>:X11::X11>
           $<$<PLATFORM_ID:Linux,FreeBSD,OpenBSD>:Qt::GuiPrivate>)
 
-add_subdirectory("${CMAKE_SOURCE_DIR}/deps/obs-scripting" "${CMAKE_BINARY_DIR}/deps/obs-scripting")
+add_subdirectory("${CMAKE_SOURCE_DIR}/shared/obs-scripting" "${CMAKE_BINARY_DIR}/shared/obs-scripting")
 
 if(ENABLE_SCRIPTING AND TARGET OBS::scripting)
   target_sources(frontend-tools PRIVATE scripts.cpp scripts.hpp)

+ 2 - 0
UI/frontend-plugins/frontend-tools/cmake/legacy.cmake

@@ -53,6 +53,8 @@ if(OS_POSIX AND NOT OS_MACOS)
   target_link_libraries(frontend-tools PRIVATE Qt::GuiPrivate)
 endif()
 
+add_subdirectory("${CMAKE_SOURCE_DIR}/shared/obs-scripting" "${CMAKE_BINARY_DIR}/shared/obs-scripting")
+
 if(ENABLE_SCRIPTING AND TARGET OBS::scripting)
   target_compile_definitions(frontend-tools PRIVATE ENABLE_SCRIPTING)
 

+ 0 - 1
deps/CMakeLists.txt

@@ -5,5 +5,4 @@ endif()
 add_subdirectory(blake2)
 add_subdirectory(glad)
 add_subdirectory(libcaption)
-add_subdirectory(obs-scripting)
 add_subdirectory(opts-parser)

+ 0 - 0
deps/obs-scripting/CMakeLists.txt → shared/obs-scripting/CMakeLists.txt


+ 0 - 0
deps/obs-scripting/cmake/cstrcache.cmake → shared/obs-scripting/cmake/cstrcache.cmake


+ 3 - 0
deps/obs-scripting/cmake/legacy.cmake → shared/obs-scripting/cmake/legacy.cmake

@@ -176,3 +176,6 @@ target_compile_definitions(obs-scripting PRIVATE SCRIPT_DIR="${OBS_SCRIPT_PLUGIN
                                                  $<$<BOOL:${ENABLE_UI}>:ENABLE_UI>)
 
 setup_binary_target(obs-scripting)
+
+# Dirty workaround: CMake 2.0 seems to fail without this file
+file(TOUCH "${CMAKE_BINARY_DIR}/shared/cmake_install.cmake")

+ 0 - 0
deps/obs-scripting/cmake/lua.cmake → shared/obs-scripting/cmake/lua.cmake


+ 0 - 0
deps/obs-scripting/cmake/python.cmake → shared/obs-scripting/cmake/python.cmake


+ 0 - 0
deps/obs-scripting/cmake/windows/obs-module.rc.in → shared/obs-scripting/cmake/windows/obs-module.rc.in


+ 0 - 0
deps/obs-scripting/cstrcache.cpp → shared/obs-scripting/cstrcache.cpp


+ 0 - 0
deps/obs-scripting/cstrcache.h → shared/obs-scripting/cstrcache.h


+ 0 - 0
deps/obs-scripting/obs-scripting-callback.h → shared/obs-scripting/obs-scripting-callback.h


+ 0 - 0
deps/obs-scripting/obs-scripting-config.h.in → shared/obs-scripting/obs-scripting-config.h.in


+ 0 - 0
deps/obs-scripting/obs-scripting-internal.h → shared/obs-scripting/obs-scripting-internal.h


+ 0 - 0
deps/obs-scripting/obs-scripting-logging.c → shared/obs-scripting/obs-scripting-logging.c


+ 0 - 0
deps/obs-scripting/obs-scripting-lua-frontend.c → shared/obs-scripting/obs-scripting-lua-frontend.c


+ 0 - 0
deps/obs-scripting/obs-scripting-lua-source.c → shared/obs-scripting/obs-scripting-lua-source.c


+ 0 - 0
deps/obs-scripting/obs-scripting-lua.c → shared/obs-scripting/obs-scripting-lua.c


+ 0 - 0
deps/obs-scripting/obs-scripting-lua.h → shared/obs-scripting/obs-scripting-lua.h


+ 0 - 0
deps/obs-scripting/obs-scripting-python-frontend.c → shared/obs-scripting/obs-scripting-python-frontend.c


+ 0 - 0
deps/obs-scripting/obs-scripting-python-import.c → shared/obs-scripting/obs-scripting-python-import.c


+ 0 - 0
deps/obs-scripting/obs-scripting-python-import.h → shared/obs-scripting/obs-scripting-python-import.h


+ 0 - 0
deps/obs-scripting/obs-scripting-python.c → shared/obs-scripting/obs-scripting-python.c


+ 0 - 0
deps/obs-scripting/obs-scripting-python.h → shared/obs-scripting/obs-scripting-python.h


+ 0 - 0
deps/obs-scripting/obs-scripting.c → shared/obs-scripting/obs-scripting.c


+ 0 - 0
deps/obs-scripting/obs-scripting.h → shared/obs-scripting/obs-scripting.h


+ 0 - 0
deps/obs-scripting/obslua/CMakeLists.txt → shared/obs-scripting/obslua/CMakeLists.txt


+ 0 - 0
deps/obs-scripting/obslua/cmake/legacy.cmake → shared/obs-scripting/obslua/cmake/legacy.cmake


+ 0 - 0
deps/obs-scripting/obslua/obslua.i → shared/obs-scripting/obslua/obslua.i


+ 0 - 0
deps/obs-scripting/obspython/CMakeLists.txt → shared/obs-scripting/obspython/CMakeLists.txt


+ 0 - 0
deps/obs-scripting/obspython/cmake/legacy.cmake → shared/obs-scripting/obspython/cmake/legacy.cmake


+ 0 - 0
deps/obs-scripting/obspython/obspython.i → shared/obs-scripting/obspython/obspython.i