Author: gadamopoulos Date: Tue May 3 14:36:04 2016 New Revision: 71243 URL: http://svn.reactos.org/svn/reactos?rev=71243&view=rev Log: [SHELL32] - Move recyclebin static lib in the shell32 folder and name it shellrecyclebin alongside shelldesktop and shellmenu static libs.
Added: trunk/reactos/dll/win32/shell32/shellrecyclebin/ - copied from r71220, trunk/reactos/sdk/lib/recyclebin/ Removed: trunk/reactos/sdk/lib/recyclebin/ Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt trunk/reactos/dll/win32/shell32/precomp.h trunk/reactos/dll/win32/shell32/wine/shellord.c trunk/reactos/sdk/lib/CMakeLists.txt Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLists.txt?rev=71243&r1=71242&r2=71243&view=diff ============================================================================== --- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Tue May 3 14:36:04 2016 @@ -2,6 +2,7 @@ add_subdirectory(shelldesktop) add_subdirectory(shellmenu) +add_subdirectory(shellrecyclebin) set_cpp(WITH_RUNTIME) spec2def(shell32.dll shell32.spec ADD_IMPORTLIB) @@ -19,7 +20,6 @@ -D_WINE) include_directories( - ${REACTOS_SOURCE_DIR}/sdk/lib/recyclebin ${REACTOS_SOURCE_DIR}/sdk/lib/atl ${REACTOS_SOURCE_DIR}) Modified: trunk/reactos/dll/win32/shell32/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/precomp.h?rev=71243&r1=71242&r2=71243&view=diff ============================================================================== --- trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/precomp.h [iso-8859-1] Tue May 3 14:36:04 2016 @@ -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" Modified: trunk/reactos/dll/win32/shell32/wine/shellord.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/wine/shellord.c?rev=71243&r1=71242&r2=71243&view=diff ============================================================================== --- trunk/reactos/dll/win32/shell32/wine/shellord.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/wine/shellord.c [iso-8859-1] Tue May 3 14:36:04 2016 @@ -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> Modified: trunk/reactos/sdk/lib/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/sdk/lib/CMakeLists.txt?rev=71243&r1=71242&r2=71243&view=diff ============================================================================== --- trunk/reactos/sdk/lib/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/sdk/lib/CMakeLists.txt [iso-8859-1] Tue May 3 14:36:04 2016 @@ -33,7 +33,6 @@ add_subdirectory(nt) add_subdirectory(ppcmmu) add_subdirectory(pseh) -add_subdirectory(recyclebin) if(KDBG) add_subdirectory(rossym)