From: Kamil Hornicek <kamil.hornicek@reactos.org>
Date: Tue, 31 May 2011 16:55:10 +0000 (+0000)
Subject: [SHELL32_NEW]
X-Git-Tag: backups/reactx@60648^2~16^2~27
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=4cf027e1a0864e7bf598587c814dc45e60801593

[SHELL32_NEW]
Fix building with CMake. Had to turn PCH off as Amine suggested, it needs more work.

svn path=/branches/shell32_new-bringup/; revision=52021
---

diff --git a/dll/win32/shell32/CMakeLists.txt b/dll/win32/shell32/CMakeLists.txt
index 9bdd9f16463..ecc3efb5bb4 100644
--- a/dll/win32/shell32/CMakeLists.txt
+++ b/dll/win32/shell32/CMakeLists.txt
@@ -1,3 +1,5 @@
+set_unicode()
+set_cpp()
 
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
@@ -10,6 +12,7 @@ add_definitions(
 include_directories(
     ${REACTOS_SOURCE_DIR}/include/reactos/wine
     ${REACTOS_SOURCE_DIR}/lib/recyclebin
+    ${REACTOS_SOURCE_DIR}/lib/atl
     ${REACTOS_SOURCE_DIR})
 
 generate_idl_iids(shobjidl_local.idl)
@@ -17,71 +20,73 @@ generate_idl_iids(shobjidl_local.idl)
 spec2def(shell32.dll shell32.spec)
 
 list(APPEND SOURCE
-    authors.c
-    autocomplete.c
-    brsfolder.c
-    changenotify.c
-    classes.c
-    clipboard.c
-    control.c
-    dataobject.c
-    dde.c
-    debughlp.c
-    desktop.c
-    dialogs.c
-    dragdrophelper.c
-    enumidlist.c
-    extracticon.c
-    folders.c
-    iconcache.c
-    pidl.c
-    regsvr.c
-    shell32_main.c
-    shellitem.c
-    shelllink.c
-    shellole.c
-    shellord.c
-    shellpath.c
-    shellreg.c
-    shellstring.c
-    shfldr_desktop.c
-    shfldr_fs.c
-    shfldr_mycomp.c
-    shfldr_mydocuments.c
-    shfldr_printers.c
-    shfldr_admintools.c
-    shfldr_netplaces.c
-    shfldr_fonts.c
-    shfldr_cpanel.c
-    shfldr_recyclebin.c
-    shlexec.c
-    shlfileop.c
-    shlfolder.c
-    shlfsbind.c
-    shlmenu.c
-    shlview.c
-    shpolicy.c
-    shv_def_cmenu.c
-    startmenu.c
-    stubs.c
-    ros-systray.c
-    fprop.c
-    drive.c
-    she_ocmenu.c
-    shv_item_new.c
-    folder_options.c
+    authors.cpp
+    autocomplete.cpp
+    brsfolder.cpp
+    changenotify.cpp
+    classes.cpp
+    clipboard.cpp
+    control.cpp
+    dataobject.cpp
+    dde.cpp
+    debughlp.cpp
+    desktop.cpp
+    dialogs.cpp
+    dragdrophelper.cpp
+    enumidlist.cpp
+    extracticon.cpp
+    folders.cpp
+    iconcache.cpp
+    pidl.cpp
+    shell32_main.cpp
+    shellitem.cpp
+    shelllink.cpp
+    shellole.cpp
+    shellord.cpp
+    shellpath.cpp
+    shellreg.cpp
+    shellstring.cpp
+    shfldr_desktop.cpp
+    shfldr_fs.cpp
+    shfldr_mycomp.cpp
+    shfldr_mydocuments.cpp
+    shfldr_printers.cpp
+    shfldr_admintools.cpp
+    shfldr_netplaces.cpp
+    shfldr_fonts.cpp
+    shfldr_cpanel.cpp
+    shfldr_recyclebin.cpp
+    shlexec.cpp
+    shlfileop.cpp
+    shlfolder.cpp
+    shlfsbind.cpp
+    shlmenu.cpp
+    shlview.cpp
+    shpolicy.cpp
+    shv_def_cmenu.cpp
+    startmenu.cpp
+    stubs.cpp
+    ros-systray.cpp
+    fprop.cpp
+    drive.cpp
+    she_ocmenu.cpp
+    shv_item_new.cpp
+    folder_options.cpp
     shell32.rc
     ${CMAKE_CURRENT_BINARY_DIR}/shobjidl_local_i.c
     ${CMAKE_CURRENT_BINARY_DIR}/shell32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/shell32.def)
 
-add_pch(shell32 ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
+# FIXME
+#add_pch(shell32 ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
+#add_library(shell32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/shell32_precomp.h.gch ${SOURCE})
 
-add_library(shell32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/shell32_precomp.h.gch ${SOURCE})
+add_library(shell32 SHARED ${SOURCE})
 
 set_module_type(shell32 win32dll)
 
 target_link_libraries(shell32
+    atlnew
     wine
     uuid
     recyclebin)