diff --git a/reactos/dll/win32/shell32/CMakeLists.txt b/reactos/dll/win32/shell32/CMakeLists.txt index 480c095ca76..aef71c11928 100644 --- a/reactos/dll/win32/shell32/CMakeLists.txt +++ b/reactos/dll/win32/shell32/CMakeLists.txt @@ -2,6 +2,7 @@ PROJECT(SHELL) add_subdirectory(shelldesktop) add_subdirectory(shellmenu) +add_subdirectory(shellrecyclebin) set_cpp(WITH_RUNTIME) spec2def(shell32.dll shell32.spec ADD_IMPORTLIB) @@ -19,7 +20,6 @@ add_definitions( -D_WINE) include_directories( - ${REACTOS_SOURCE_DIR}/sdk/lib/recyclebin ${REACTOS_SOURCE_DIR}/sdk/lib/atl ${REACTOS_SOURCE_DIR}) diff --git a/reactos/dll/win32/shell32/precomp.h b/reactos/dll/win32/shell32/precomp.h index f5a950d92c3..b2c22f496c9 100644 --- a/reactos/dll/win32/shell32/precomp.h +++ b/reactos/dll/win32/shell32/precomp.h @@ -20,7 +20,6 @@ #include #include #include -#include #include #include #include @@ -41,6 +40,7 @@ #include +#include "shellrecyclebin/recyclebin.h" #include "wine/pidl.h" #include "debughlp.h" #include "wine/shell32_main.h" diff --git a/reactos/sdk/lib/recyclebin/CMakeLists.txt b/reactos/dll/win32/shell32/shellrecyclebin/CMakeLists.txt similarity index 100% rename from reactos/sdk/lib/recyclebin/CMakeLists.txt rename to reactos/dll/win32/shell32/shellrecyclebin/CMakeLists.txt diff --git a/reactos/sdk/lib/recyclebin/guid.c b/reactos/dll/win32/shell32/shellrecyclebin/guid.c similarity index 100% rename from reactos/sdk/lib/recyclebin/guid.c rename to reactos/dll/win32/shell32/shellrecyclebin/guid.c diff --git a/reactos/sdk/lib/recyclebin/readme.txt b/reactos/dll/win32/shell32/shellrecyclebin/readme.txt similarity index 100% rename from reactos/sdk/lib/recyclebin/readme.txt rename to reactos/dll/win32/shell32/shellrecyclebin/readme.txt diff --git a/reactos/sdk/lib/recyclebin/recyclebin.c b/reactos/dll/win32/shell32/shellrecyclebin/recyclebin.c similarity index 100% rename from reactos/sdk/lib/recyclebin/recyclebin.c rename to reactos/dll/win32/shell32/shellrecyclebin/recyclebin.c diff --git a/reactos/sdk/lib/recyclebin/recyclebin.h b/reactos/dll/win32/shell32/shellrecyclebin/recyclebin.h similarity index 100% rename from reactos/sdk/lib/recyclebin/recyclebin.h rename to reactos/dll/win32/shell32/shellrecyclebin/recyclebin.h diff --git a/reactos/sdk/lib/recyclebin/recyclebin_generic.c b/reactos/dll/win32/shell32/shellrecyclebin/recyclebin_generic.c similarity index 100% rename from reactos/sdk/lib/recyclebin/recyclebin_generic.c rename to reactos/dll/win32/shell32/shellrecyclebin/recyclebin_generic.c diff --git a/reactos/sdk/lib/recyclebin/recyclebin_generic_enumerator.c b/reactos/dll/win32/shell32/shellrecyclebin/recyclebin_generic_enumerator.c similarity index 100% rename from reactos/sdk/lib/recyclebin/recyclebin_generic_enumerator.c rename to reactos/dll/win32/shell32/shellrecyclebin/recyclebin_generic_enumerator.c diff --git a/reactos/sdk/lib/recyclebin/recyclebin_private.h b/reactos/dll/win32/shell32/shellrecyclebin/recyclebin_private.h similarity index 100% rename from reactos/sdk/lib/recyclebin/recyclebin_private.h rename to reactos/dll/win32/shell32/shellrecyclebin/recyclebin_private.h diff --git a/reactos/sdk/lib/recyclebin/recyclebin_v5.c b/reactos/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c similarity index 100% rename from reactos/sdk/lib/recyclebin/recyclebin_v5.c rename to reactos/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c diff --git a/reactos/sdk/lib/recyclebin/recyclebin_v5.h b/reactos/dll/win32/shell32/shellrecyclebin/recyclebin_v5.h similarity index 100% rename from reactos/sdk/lib/recyclebin/recyclebin_v5.h rename to reactos/dll/win32/shell32/shellrecyclebin/recyclebin_v5.h diff --git a/reactos/sdk/lib/recyclebin/recyclebin_v5_enumerator.c b/reactos/dll/win32/shell32/shellrecyclebin/recyclebin_v5_enumerator.c similarity index 100% rename from reactos/sdk/lib/recyclebin/recyclebin_v5_enumerator.c rename to reactos/dll/win32/shell32/shellrecyclebin/recyclebin_v5_enumerator.c diff --git a/reactos/dll/win32/shell32/wine/shellord.c b/reactos/dll/win32/shell32/wine/shellord.c index d0919c73e27..099c722a713 100644 --- a/reactos/dll/win32/shell32/wine/shellord.c +++ b/reactos/dll/win32/shell32/wine/shellord.c @@ -34,7 +34,7 @@ #include #include #include -#include +#include "../shellrecyclebin/recyclebin.h" #include #include diff --git a/reactos/sdk/lib/CMakeLists.txt b/reactos/sdk/lib/CMakeLists.txt index 36e606f5cdf..8a28adde77b 100644 --- a/reactos/sdk/lib/CMakeLists.txt +++ b/reactos/sdk/lib/CMakeLists.txt @@ -33,7 +33,6 @@ add_subdirectory(lsalib) add_subdirectory(nt) add_subdirectory(ppcmmu) add_subdirectory(pseh) -add_subdirectory(recyclebin) if(KDBG) add_subdirectory(rossym)