[SHELL32]
authorGiannis Adamopoulos <gadamopoulos@reactos.org>
Tue, 3 May 2016 14:36:04 +0000 (14:36 +0000)
committerGiannis Adamopoulos <gadamopoulos@reactos.org>
Tue, 3 May 2016 14:36:04 +0000 (14:36 +0000)
- Move recyclebin static lib in the shell32 folder and name it shellrecyclebin alongside shelldesktop and shellmenu static libs.

svn path=/trunk/; revision=71243

15 files changed:
reactos/dll/win32/shell32/CMakeLists.txt
reactos/dll/win32/shell32/precomp.h
reactos/dll/win32/shell32/shellrecyclebin/CMakeLists.txt [moved from reactos/sdk/lib/recyclebin/CMakeLists.txt with 100% similarity]
reactos/dll/win32/shell32/shellrecyclebin/guid.c [moved from reactos/sdk/lib/recyclebin/guid.c with 100% similarity]
reactos/dll/win32/shell32/shellrecyclebin/readme.txt [moved from reactos/sdk/lib/recyclebin/readme.txt with 100% similarity]
reactos/dll/win32/shell32/shellrecyclebin/recyclebin.c [moved from reactos/sdk/lib/recyclebin/recyclebin.c with 100% similarity]
reactos/dll/win32/shell32/shellrecyclebin/recyclebin.h [moved from reactos/sdk/lib/recyclebin/recyclebin.h with 100% similarity]
reactos/dll/win32/shell32/shellrecyclebin/recyclebin_generic.c [moved from reactos/sdk/lib/recyclebin/recyclebin_generic.c with 100% similarity]
reactos/dll/win32/shell32/shellrecyclebin/recyclebin_generic_enumerator.c [moved from reactos/sdk/lib/recyclebin/recyclebin_generic_enumerator.c with 100% similarity]
reactos/dll/win32/shell32/shellrecyclebin/recyclebin_private.h [moved from reactos/sdk/lib/recyclebin/recyclebin_private.h with 100% similarity]
reactos/dll/win32/shell32/shellrecyclebin/recyclebin_v5.c [moved from reactos/sdk/lib/recyclebin/recyclebin_v5.c with 100% similarity]
reactos/dll/win32/shell32/shellrecyclebin/recyclebin_v5.h [moved from reactos/sdk/lib/recyclebin/recyclebin_v5.h with 100% similarity]
reactos/dll/win32/shell32/shellrecyclebin/recyclebin_v5_enumerator.c [moved from reactos/sdk/lib/recyclebin/recyclebin_v5_enumerator.c with 100% similarity]
reactos/dll/win32/shell32/wine/shellord.c
reactos/sdk/lib/CMakeLists.txt

index 480c095..aef71c1 100644 (file)
@@ -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})
 
index f5a950d..b2c22f4 100644 (file)
@@ -20,7 +20,6 @@
 #include <shlwapi.h>
 #include <shlobj.h>
 #include <shobjidl.h>
-#include <recyclebin.h>
 #include <ndk/rtlfuncs.h>
 #include <fmifs/fmifs.h>
 #include <tchar.h>
@@ -41,6 +40,7 @@
 
 #include <shellutils.h>
 
+#include "shellrecyclebin/recyclebin.h"
 #include "wine/pidl.h"
 #include "debughlp.h"
 #include "wine/shell32_main.h"
index d0919c7..099c722 100644 (file)
@@ -34,7 +34,7 @@
 #include <shlwapi.h>
 #include <commdlg.h>
 #include <commoncontrols.h>
-#include <recyclebin.h>
+#include "../shellrecyclebin/recyclebin.h"
 
 #include <wine/debug.h>
 #include <wine/unicode.h>
index 36e606f..8a28add 100644 (file)
@@ -33,7 +33,6 @@ add_subdirectory(lsalib)
 add_subdirectory(nt)
 add_subdirectory(ppcmmu)
 add_subdirectory(pseh)
-add_subdirectory(recyclebin)
 
 if(KDBG)
     add_subdirectory(rossym)