diff --git a/CMakeLists.txt b/CMakeLists.txt index 46bc1ad..f72c068 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,17 +7,18 @@ pkg_search_module(MPV REQUIRED mpv>=0.37.0) set(CMAKE_SHARED_LIBRARY_PREFIX "") add_library(menu SHARED - src/misc/bstr.c - src/misc/dispatch.c - src/ta/ta.c - src/ta/ta_talloc.c - src/ta/ta_utils.c + mpv/misc/bstr.c + mpv/misc/dispatch.c + mpv/ta/ta.c + mpv/ta/ta_talloc.c + mpv/ta/ta_utils.c + src/types.c src/menu.c src/plugin.c ) set_property(TARGET menu PROPERTY POSITION_INDEPENDENT_CODE ON) -target_include_directories(menu PRIVATE src ${MPV_INCLUDE_DIRS}) +target_include_directories(menu PRIVATE mpv ${MPV_INCLUDE_DIRS}) target_link_libraries(menu PRIVATE shlwapi) target_compile_definitions(menu PRIVATE MPV_CPLUGIN_DYNAMIC_SYM) diff --git a/src/misc/bstr.c b/mpv/misc/bstr.c similarity index 100% rename from src/misc/bstr.c rename to mpv/misc/bstr.c diff --git a/src/misc/bstr.h b/mpv/misc/bstr.h similarity index 100% rename from src/misc/bstr.h rename to mpv/misc/bstr.h diff --git a/src/misc/ctype.h b/mpv/misc/ctype.h similarity index 100% rename from src/misc/ctype.h rename to mpv/misc/ctype.h diff --git a/src/misc/dispatch.c b/mpv/misc/dispatch.c similarity index 100% rename from src/misc/dispatch.c rename to mpv/misc/dispatch.c diff --git a/src/misc/dispatch.h b/mpv/misc/dispatch.h similarity index 100% rename from src/misc/dispatch.h rename to mpv/misc/dispatch.h diff --git a/src/mpv_talloc.h b/mpv/mpv_talloc.h similarity index 100% rename from src/mpv_talloc.h rename to mpv/mpv_talloc.h diff --git a/src/osdep/compiler.h b/mpv/osdep/compiler.h similarity index 100% rename from src/osdep/compiler.h rename to mpv/osdep/compiler.h diff --git a/src/osdep/threads-win32.h b/mpv/osdep/threads-win32.h similarity index 100% rename from src/osdep/threads-win32.h rename to mpv/osdep/threads-win32.h diff --git a/src/osdep/threads.h b/mpv/osdep/threads.h similarity index 100% rename from src/osdep/threads.h rename to mpv/osdep/threads.h diff --git a/src/ta/README b/mpv/ta/README similarity index 100% rename from src/ta/README rename to mpv/ta/README diff --git a/src/ta/ta.c b/mpv/ta/ta.c similarity index 100% rename from src/ta/ta.c rename to mpv/ta/ta.c diff --git a/src/ta/ta.h b/mpv/ta/ta.h similarity index 100% rename from src/ta/ta.h rename to mpv/ta/ta.h diff --git a/src/ta/ta_talloc.c b/mpv/ta/ta_talloc.c similarity index 100% rename from src/ta/ta_talloc.c rename to mpv/ta/ta_talloc.c diff --git a/src/ta/ta_talloc.h b/mpv/ta/ta_talloc.h similarity index 100% rename from src/ta/ta_talloc.h rename to mpv/ta/ta_talloc.h diff --git a/src/ta/ta_utils.c b/mpv/ta/ta_utils.c similarity index 100% rename from src/ta/ta_utils.c rename to mpv/ta/ta_utils.c