[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)

svn path=/branches/cmake-bringup/; revision=49937

base/shell/explorer/CMakeLists.txt

@@ -66,23 +66,12 @@ target_link_libraries(explorer
     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)

base/shell/explorer/notifyhook/CMakeLists.txt

@@ -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)

base/shell/explorer/notifyhook/notifyhook.def

@@ -1,6 +0,0 @@
-LIBRARY notifyhook.dll
-EXPORTS
-DeinstallNotifyHook
-GetWindowModulePath
-GetWindowModulePathCopyData
-InstallNotifyHook

base/shell/explorer/notifyhook/notifyhook.spec

@@ -0,0 +1,4 @@
+@ cdecl DeinstallNotifyHook()
+@ cdecl GetWindowModulePath(ptr)
+@ cdecl GetWindowModulePathCopyData(ptr ptr ptr long)
+@ cdecl InstallNotifyHook()

dll/win32/shell32/CMakeLists.txt

@@ -60,15 +60,19 @@ list(APPEND SOURCE
 
 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 @@ add_importlibs(shell32
     msvcrt
     ntdll)
 
-
 add_cab_target(shell32 1)
 add_importlib_target(shell32.spec)
-