diff --git a/UI/frontend-plugins/frontend-tools/CMakeLists.txt b/UI/frontend-plugins/frontend-tools/CMakeLists.txt index bdc6582ec..7db278041 100644 --- a/UI/frontend-plugins/frontend-tools/CMakeLists.txt +++ b/UI/frontend-plugins/frontend-tools/CMakeLists.txt @@ -51,7 +51,7 @@ target_link_libraries( $<$:X11::X11> $<$: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) diff --git a/UI/frontend-plugins/frontend-tools/cmake/legacy.cmake b/UI/frontend-plugins/frontend-tools/cmake/legacy.cmake index 0524ca042..9ded76029 100644 --- a/UI/frontend-plugins/frontend-tools/cmake/legacy.cmake +++ b/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) diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index bdb859254..1e5196ccc 100644 --- a/deps/CMakeLists.txt +++ b/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) diff --git a/deps/obs-scripting/CMakeLists.txt b/shared/obs-scripting/CMakeLists.txt similarity index 100% rename from deps/obs-scripting/CMakeLists.txt rename to shared/obs-scripting/CMakeLists.txt diff --git a/deps/obs-scripting/cmake/cstrcache.cmake b/shared/obs-scripting/cmake/cstrcache.cmake similarity index 100% rename from deps/obs-scripting/cmake/cstrcache.cmake rename to shared/obs-scripting/cmake/cstrcache.cmake diff --git a/deps/obs-scripting/cmake/legacy.cmake b/shared/obs-scripting/cmake/legacy.cmake similarity index 97% rename from deps/obs-scripting/cmake/legacy.cmake rename to shared/obs-scripting/cmake/legacy.cmake index bf4d9a4ef..75a7d72aa 100644 --- a/deps/obs-scripting/cmake/legacy.cmake +++ b/shared/obs-scripting/cmake/legacy.cmake @@ -176,3 +176,6 @@ target_compile_definitions(obs-scripting PRIVATE SCRIPT_DIR="${OBS_SCRIPT_PLUGIN $<$: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") diff --git a/deps/obs-scripting/cmake/lua.cmake b/shared/obs-scripting/cmake/lua.cmake similarity index 100% rename from deps/obs-scripting/cmake/lua.cmake rename to shared/obs-scripting/cmake/lua.cmake diff --git a/deps/obs-scripting/cmake/python.cmake b/shared/obs-scripting/cmake/python.cmake similarity index 100% rename from deps/obs-scripting/cmake/python.cmake rename to shared/obs-scripting/cmake/python.cmake diff --git a/deps/obs-scripting/cmake/windows/obs-module.rc.in b/shared/obs-scripting/cmake/windows/obs-module.rc.in similarity index 100% rename from deps/obs-scripting/cmake/windows/obs-module.rc.in rename to shared/obs-scripting/cmake/windows/obs-module.rc.in diff --git a/deps/obs-scripting/cstrcache.cpp b/shared/obs-scripting/cstrcache.cpp similarity index 100% rename from deps/obs-scripting/cstrcache.cpp rename to shared/obs-scripting/cstrcache.cpp diff --git a/deps/obs-scripting/cstrcache.h b/shared/obs-scripting/cstrcache.h similarity index 100% rename from deps/obs-scripting/cstrcache.h rename to shared/obs-scripting/cstrcache.h diff --git a/deps/obs-scripting/obs-scripting-callback.h b/shared/obs-scripting/obs-scripting-callback.h similarity index 100% rename from deps/obs-scripting/obs-scripting-callback.h rename to shared/obs-scripting/obs-scripting-callback.h diff --git a/deps/obs-scripting/obs-scripting-config.h.in b/shared/obs-scripting/obs-scripting-config.h.in similarity index 100% rename from deps/obs-scripting/obs-scripting-config.h.in rename to shared/obs-scripting/obs-scripting-config.h.in diff --git a/deps/obs-scripting/obs-scripting-internal.h b/shared/obs-scripting/obs-scripting-internal.h similarity index 100% rename from deps/obs-scripting/obs-scripting-internal.h rename to shared/obs-scripting/obs-scripting-internal.h diff --git a/deps/obs-scripting/obs-scripting-logging.c b/shared/obs-scripting/obs-scripting-logging.c similarity index 100% rename from deps/obs-scripting/obs-scripting-logging.c rename to shared/obs-scripting/obs-scripting-logging.c diff --git a/deps/obs-scripting/obs-scripting-lua-frontend.c b/shared/obs-scripting/obs-scripting-lua-frontend.c similarity index 100% rename from deps/obs-scripting/obs-scripting-lua-frontend.c rename to shared/obs-scripting/obs-scripting-lua-frontend.c diff --git a/deps/obs-scripting/obs-scripting-lua-source.c b/shared/obs-scripting/obs-scripting-lua-source.c similarity index 100% rename from deps/obs-scripting/obs-scripting-lua-source.c rename to shared/obs-scripting/obs-scripting-lua-source.c diff --git a/deps/obs-scripting/obs-scripting-lua.c b/shared/obs-scripting/obs-scripting-lua.c similarity index 100% rename from deps/obs-scripting/obs-scripting-lua.c rename to shared/obs-scripting/obs-scripting-lua.c diff --git a/deps/obs-scripting/obs-scripting-lua.h b/shared/obs-scripting/obs-scripting-lua.h similarity index 100% rename from deps/obs-scripting/obs-scripting-lua.h rename to shared/obs-scripting/obs-scripting-lua.h diff --git a/deps/obs-scripting/obs-scripting-python-frontend.c b/shared/obs-scripting/obs-scripting-python-frontend.c similarity index 100% rename from deps/obs-scripting/obs-scripting-python-frontend.c rename to shared/obs-scripting/obs-scripting-python-frontend.c diff --git a/deps/obs-scripting/obs-scripting-python-import.c b/shared/obs-scripting/obs-scripting-python-import.c similarity index 100% rename from deps/obs-scripting/obs-scripting-python-import.c rename to shared/obs-scripting/obs-scripting-python-import.c diff --git a/deps/obs-scripting/obs-scripting-python-import.h b/shared/obs-scripting/obs-scripting-python-import.h similarity index 100% rename from deps/obs-scripting/obs-scripting-python-import.h rename to shared/obs-scripting/obs-scripting-python-import.h diff --git a/deps/obs-scripting/obs-scripting-python.c b/shared/obs-scripting/obs-scripting-python.c similarity index 100% rename from deps/obs-scripting/obs-scripting-python.c rename to shared/obs-scripting/obs-scripting-python.c diff --git a/deps/obs-scripting/obs-scripting-python.h b/shared/obs-scripting/obs-scripting-python.h similarity index 100% rename from deps/obs-scripting/obs-scripting-python.h rename to shared/obs-scripting/obs-scripting-python.h diff --git a/deps/obs-scripting/obs-scripting.c b/shared/obs-scripting/obs-scripting.c similarity index 100% rename from deps/obs-scripting/obs-scripting.c rename to shared/obs-scripting/obs-scripting.c diff --git a/deps/obs-scripting/obs-scripting.h b/shared/obs-scripting/obs-scripting.h similarity index 100% rename from deps/obs-scripting/obs-scripting.h rename to shared/obs-scripting/obs-scripting.h diff --git a/deps/obs-scripting/obslua/CMakeLists.txt b/shared/obs-scripting/obslua/CMakeLists.txt similarity index 100% rename from deps/obs-scripting/obslua/CMakeLists.txt rename to shared/obs-scripting/obslua/CMakeLists.txt diff --git a/deps/obs-scripting/obslua/cmake/legacy.cmake b/shared/obs-scripting/obslua/cmake/legacy.cmake similarity index 100% rename from deps/obs-scripting/obslua/cmake/legacy.cmake rename to shared/obs-scripting/obslua/cmake/legacy.cmake diff --git a/deps/obs-scripting/obslua/obslua.i b/shared/obs-scripting/obslua/obslua.i similarity index 100% rename from deps/obs-scripting/obslua/obslua.i rename to shared/obs-scripting/obslua/obslua.i diff --git a/deps/obs-scripting/obspython/CMakeLists.txt b/shared/obs-scripting/obspython/CMakeLists.txt similarity index 100% rename from deps/obs-scripting/obspython/CMakeLists.txt rename to shared/obs-scripting/obspython/CMakeLists.txt diff --git a/deps/obs-scripting/obspython/cmake/legacy.cmake b/shared/obs-scripting/obspython/cmake/legacy.cmake similarity index 100% rename from deps/obs-scripting/obspython/cmake/legacy.cmake rename to shared/obs-scripting/obspython/cmake/legacy.cmake diff --git a/deps/obs-scripting/obspython/obspython.i b/shared/obs-scripting/obspython/obspython.i similarity index 100% rename from deps/obs-scripting/obspython/obspython.i rename to shared/obs-scripting/obspython/obspython.i