Author: akhaldi Date: Fri Dec 3 19:20:45 2010 New Revision: 49937
URL: http://svn.reactos.org/svn/reactos?rev=49937&view=rev Log: [CMAKE] - Improve some modules. - Convert notifyhook def into a spec, and add the import lib target. - Get rid of the import libs that we already generate (the rest are still just temporary)
Added: branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.spec - copied, changed from r49933, branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.def Removed: branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.def branches/cmake-bringup/importlibs/libadvapi32.a branches/cmake-bringup/importlibs/libbattc.a branches/cmake-bringup/importlibs/libbootvid.a branches/cmake-bringup/importlibs/libcabinet.a branches/cmake-bringup/importlibs/libclass2.a branches/cmake-bringup/importlibs/libcomctl32.a branches/cmake-bringup/importlibs/libcrypt32.a branches/cmake-bringup/importlibs/libcryptui.a branches/cmake-bringup/importlibs/libcsrsrv.a branches/cmake-bringup/importlibs/libd3d9.a branches/cmake-bringup/importlibs/libd3dx9_24.a branches/cmake-bringup/importlibs/libd3dx9_36.a branches/cmake-bringup/importlibs/libdbghelp.a branches/cmake-bringup/importlibs/libdevmgr.a branches/cmake-bringup/importlibs/libdhcpcsvc.a branches/cmake-bringup/importlibs/libdrmk.a branches/cmake-bringup/importlibs/libdxgthk.a branches/cmake-bringup/importlibs/libfmifs.a branches/cmake-bringup/importlibs/libftfd.a branches/cmake-bringup/importlibs/libgdi32.a branches/cmake-bringup/importlibs/libgdiplus.a branches/cmake-bringup/importlibs/libhal.a branches/cmake-bringup/importlibs/libimm32.a branches/cmake-bringup/importlibs/libkdcom.a branches/cmake-bringup/importlibs/libkernel32.a branches/cmake-bringup/importlibs/libks.a branches/cmake-bringup/importlibs/libloadperf.a branches/cmake-bringup/importlibs/liblsasrv.a branches/cmake-bringup/importlibs/libmlang.a branches/cmake-bringup/importlibs/libmpr.a branches/cmake-bringup/importlibs/libmsi.a branches/cmake-bringup/importlibs/libmsimg32.a branches/cmake-bringup/importlibs/libmsvcrt.a branches/cmake-bringup/importlibs/libnetapi32.a branches/cmake-bringup/importlibs/libnotifyhook.a branches/cmake-bringup/importlibs/libntdll.a branches/cmake-bringup/importlibs/libntoskrnl.a branches/cmake-bringup/importlibs/libole32.a branches/cmake-bringup/importlibs/liboleaut32.a branches/cmake-bringup/importlibs/libpciidex.a branches/cmake-bringup/importlibs/libriched20.a branches/cmake-bringup/importlibs/librpcrt4.a branches/cmake-bringup/importlibs/librsaenh.a branches/cmake-bringup/importlibs/libsamlib.a branches/cmake-bringup/importlibs/libscsiport.a branches/cmake-bringup/importlibs/libsetupapi.a branches/cmake-bringup/importlibs/libshdocvw.a branches/cmake-bringup/importlibs/libshell32.a branches/cmake-bringup/importlibs/libshlwapi.a branches/cmake-bringup/importlibs/libsmdll.a branches/cmake-bringup/importlibs/libsnmpapi.a branches/cmake-bringup/importlibs/libspoolss.a branches/cmake-bringup/importlibs/liburlmon.a branches/cmake-bringup/importlibs/libuser32.a branches/cmake-bringup/importlibs/libuserenv.a branches/cmake-bringup/importlibs/libvideoprt.a branches/cmake-bringup/importlibs/libwin32k.a branches/cmake-bringup/importlibs/libwindowscodecs.a branches/cmake-bringup/importlibs/libwined3d.a branches/cmake-bringup/importlibs/libwinspool.a branches/cmake-bringup/importlibs/libwintrust.a branches/cmake-bringup/importlibs/libwmilib.a branches/cmake-bringup/importlibs/libws2_32.a branches/cmake-bringup/importlibs/libws2help.a Modified: branches/cmake-bringup/base/shell/explorer/CMakeLists.txt branches/cmake-bringup/base/shell/explorer/notifyhook/CMakeLists.txt branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt
Modified: branches/cmake-bringup/base/shell/explorer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explore... ============================================================================== --- branches/cmake-bringup/base/shell/explorer/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/explorer/CMakeLists.txt [iso-8859-1] Fri Dec 3 19:20:45 2010 @@ -66,23 +66,12 @@ wine mingw_wmain mingw_common - uuid - -ladvapi32 - -lgdi32 - -luser32 - -lws2_32 - -lmsimg32 - -lcomctl32 - -lole32 - -loleaut32 - -lshell32 - -lnotifyhook - -lmsvcrt - -lkernel32 - -lntdll) + uuid) + +add_importlibs(explorer advapi32 gdi32 user32 ws2_32 msimg32 comctl32 ole32 oleaut32 shell32 notifyhook msvcrt kernel32 ntdll)
set_image_base(explorer 0x00400000)
add_dependencies(explorer psdk buildno_header) add_cab_target(explorer 4) -add_cab(${CMAKE_CURRENT_SOURCE_DIR}/explorer-cfg-template.xml 4) +add_cab(${CMAKE_CURRENT_SOURCE_DIR}/explorer-cfg-template.xml 4)
Modified: branches/cmake-bringup/base/shell/explorer/notifyhook/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explore... ============================================================================== --- branches/cmake-bringup/base/shell/explorer/notifyhook/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/explorer/notifyhook/CMakeLists.txt [iso-8859-1] Fri Dec 3 19:20:45 2010 @@ -1,13 +1,18 @@
add_definitions(-D_NOTIFYHOOK_IMPL)
-add_library(notifyhook SHARED +spec2def(notifyhook.dll notifyhook.spec) + +list(APPEND SOURCE notifyhook.c notifyhook.rc - notifyhook.def) + ${CMAKE_CURRENT_BINARY_DIR}/notifyhook.def) + +add_library(notifyhook SHARED ${SOURCE})
set_module_type(notifyhook win32dll)
add_importlibs(notifyhook user32 msvcrt kernel32) +add_importlib_target(notifyhook.spec)
add_cab_target(notifyhook 1)
Removed: branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.def URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explore... ============================================================================== --- branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.def [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.def (removed) @@ -1,6 +1,0 @@ -LIBRARY notifyhook.dll -EXPORTS -DeinstallNotifyHook -GetWindowModulePath -GetWindowModulePathCopyData -InstallNotifyHook
Copied: branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.spec (from r49933, branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.def) URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/shell/explore... ============================================================================== --- branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.def [iso-8859-1] (original) +++ branches/cmake-bringup/base/shell/explorer/notifyhook/notifyhook.spec [iso-8859-1] Fri Dec 3 19:20:45 2010 @@ -1,6 +1,4 @@ -LIBRARY notifyhook.dll -EXPORTS -DeinstallNotifyHook -GetWindowModulePath -GetWindowModulePathCopyData -InstallNotifyHook +@ cdecl DeinstallNotifyHook() +@ cdecl GetWindowModulePath(ptr) +@ cdecl GetWindowModulePathCopyData(ptr ptr ptr long) +@ cdecl InstallNotifyHook()
Modified: branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32/... ============================================================================== --- branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Fri Dec 3 19:20:45 2010 @@ -60,15 +60,19 @@
remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -add_definitions(-D_SHELL32_) -add_definitions(-DCOM_NO_WINDOWS_H) -add_definitions(-D_WINE)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -include_directories(${REACTOS_SOURCE_DIR}/lib/recyclebin) -include_directories(${REACTOS_SOURCE_DIR}) +add_definitions( + -D_SHELL32_ + -DCOM_NO_WINDOWS_H + -D_WINE) + +include_directories( + ${REACTOS_SOURCE_DIR}/include/reactos/wine + ${REACTOS_SOURCE_DIR}/lib/recyclebin + ${REACTOS_SOURCE_DIR})
add_pch(shell32 ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) + add_library(shell32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/shell32_precomp.h.gch ${SOURCE})
set_module_type(shell32 win32dll) @@ -94,7 +98,5 @@ msvcrt ntdll)
- add_cab_target(shell32 1) add_importlib_target(shell32.spec) -
Removed: branches/cmake-bringup/importlibs/libadvapi32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libadva... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libbattc.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libbatt... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libbootvid.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libboot... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libcabinet.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libcabi... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libclass2.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libclas... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libcomctl32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libcomc... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libcrypt32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libcryp... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libcryptui.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libcryp... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libcsrsrv.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libcsrs... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libd3d9.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libd3d9... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libd3dx9_24.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libd3dx... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libd3dx9_36.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libd3dx... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libdbghelp.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libdbgh... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libdevmgr.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libdevm... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libdhcpcsvc.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libdhcp... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libdrmk.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libdrmk... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libdxgthk.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libdxgt... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libfmifs.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libfmif... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libftfd.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libftfd... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libgdi32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libgdi3... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libgdiplus.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libgdip... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libhal.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libhal.... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libimm32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libimm3... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libkdcom.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libkdco... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libkernel32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libkern... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libks.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libks.a... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libloadperf.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libload... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/liblsasrv.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/liblsas... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libmlang.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libmlan... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libmpr.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libmpr.... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libmsi.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libmsi.... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libmsimg32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libmsim... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libmsvcrt.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libmsvc... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libnetapi32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libneta... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libnotifyhook.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libnoti... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libntdll.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libntdl... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libntoskrnl.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libntos... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libole32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libole3... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/liboleaut32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libolea... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libpciidex.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libpcii... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libriched20.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/librich... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/librpcrt4.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/librpcr... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/librsaenh.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/librsae... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libsamlib.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libsaml... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libscsiport.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libscsi... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libsetupapi.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libsetu... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libshdocvw.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libshdo... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libshell32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libshel... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libshlwapi.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libshlw... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libsmdll.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libsmdl... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libsnmpapi.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libsnmp... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libspoolss.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libspoo... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/liburlmon.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/liburlm... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libuser32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libuser... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libuserenv.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libuser... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libvideoprt.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libvide... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libwin32k.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libwin3... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libwindowscodecs.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libwind... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libwined3d.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libwine... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libwinspool.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libwins... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libwintrust.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libwint... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libwmilib.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libwmil... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libws2_32.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libws2_... ============================================================================== Binary file - no diff available.
Removed: branches/cmake-bringup/importlibs/libws2help.a URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libws2h... ============================================================================== Binary file - no diff available.