diff --git a/CMakeLists.txt b/CMakeLists.txt index 079bb84..e37611a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -15,12 +15,12 @@ configure_file(${PROJECT_SOURCE_DIR}/menu.rc.in ${PROJECT_BINARY_DIR}/menu.rc @O set(CMAKE_SHARED_LIBRARY_PREFIX "") add_library(menu SHARED - mpv/misc/bstr.c - mpv/misc/dispatch.c - mpv/misc/node.c - mpv/ta/ta.c - mpv/ta/ta_talloc.c - mpv/ta/ta_utils.c + src/mpv/misc/bstr.c + src/mpv/misc/dispatch.c + src/mpv/misc/node.c + src/mpv/ta/ta.c + src/mpv/ta/ta_talloc.c + src/mpv/ta/ta_utils.c src/dialog.c src/menu.c @@ -30,7 +30,7 @@ add_library(menu SHARED ) set_property(TARGET menu PROPERTY POSITION_INDEPENDENT_CODE ON) -target_include_directories(menu PRIVATE mpv ${MPV_INCLUDE_DIRS}) +target_include_directories(menu PRIVATE src/mpv ${MPV_INCLUDE_DIRS}) target_link_libraries(menu PRIVATE shlwapi) target_compile_definitions(menu PRIVATE MPV_CPLUGIN_DYNAMIC_SYM) @@ -38,5 +38,5 @@ install(TARGETS menu RUNTIME DESTINATION .) set(CPACK_GENERATOR ZIP) set(CPACK_PACKAGE_FILE_NAME menu) -set(CPACK_INSTALLED_DIRECTORIES ${CMAKE_SOURCE_DIR}/lua .) +set(CPACK_INSTALLED_DIRECTORIES ${CMAKE_SOURCE_DIR}/src/lua .) include(CPack) diff --git a/lua/dialog.lua b/src/lua/dialog.lua similarity index 100% rename from lua/dialog.lua rename to src/lua/dialog.lua diff --git a/lua/dyn_menu.lua b/src/lua/dyn_menu.lua similarity index 100% rename from lua/dyn_menu.lua rename to src/lua/dyn_menu.lua diff --git a/mpv/misc/bstr.c b/src/mpv/misc/bstr.c similarity index 100% rename from mpv/misc/bstr.c rename to src/mpv/misc/bstr.c diff --git a/mpv/misc/bstr.h b/src/mpv/misc/bstr.h similarity index 100% rename from mpv/misc/bstr.h rename to src/mpv/misc/bstr.h diff --git a/mpv/misc/ctype.h b/src/mpv/misc/ctype.h similarity index 100% rename from mpv/misc/ctype.h rename to src/mpv/misc/ctype.h diff --git a/mpv/misc/dispatch.c b/src/mpv/misc/dispatch.c similarity index 100% rename from mpv/misc/dispatch.c rename to src/mpv/misc/dispatch.c diff --git a/mpv/misc/dispatch.h b/src/mpv/misc/dispatch.h similarity index 100% rename from mpv/misc/dispatch.h rename to src/mpv/misc/dispatch.h diff --git a/mpv/misc/node.c b/src/mpv/misc/node.c similarity index 100% rename from mpv/misc/node.c rename to src/mpv/misc/node.c diff --git a/mpv/misc/node.h b/src/mpv/misc/node.h similarity index 100% rename from mpv/misc/node.h rename to src/mpv/misc/node.h diff --git a/mpv/mpv_talloc.h b/src/mpv/mpv_talloc.h similarity index 100% rename from mpv/mpv_talloc.h rename to src/mpv/mpv_talloc.h diff --git a/mpv/osdep/compiler.h b/src/mpv/osdep/compiler.h similarity index 100% rename from mpv/osdep/compiler.h rename to src/mpv/osdep/compiler.h diff --git a/mpv/osdep/threads-win32.h b/src/mpv/osdep/threads-win32.h similarity index 100% rename from mpv/osdep/threads-win32.h rename to src/mpv/osdep/threads-win32.h diff --git a/mpv/osdep/threads.h b/src/mpv/osdep/threads.h similarity index 100% rename from mpv/osdep/threads.h rename to src/mpv/osdep/threads.h diff --git a/mpv/ta/README b/src/mpv/ta/README similarity index 100% rename from mpv/ta/README rename to src/mpv/ta/README diff --git a/mpv/ta/ta.c b/src/mpv/ta/ta.c similarity index 100% rename from mpv/ta/ta.c rename to src/mpv/ta/ta.c diff --git a/mpv/ta/ta.h b/src/mpv/ta/ta.h similarity index 100% rename from mpv/ta/ta.h rename to src/mpv/ta/ta.h diff --git a/mpv/ta/ta_talloc.c b/src/mpv/ta/ta_talloc.c similarity index 100% rename from mpv/ta/ta_talloc.c rename to src/mpv/ta/ta_talloc.c diff --git a/mpv/ta/ta_talloc.h b/src/mpv/ta/ta_talloc.h similarity index 100% rename from mpv/ta/ta_talloc.h rename to src/mpv/ta/ta_talloc.h diff --git a/mpv/ta/ta_utils.c b/src/mpv/ta/ta_utils.c similarity index 100% rename from mpv/ta/ta_utils.c rename to src/mpv/ta/ta_utils.c