[ros-diffs] [akhaldi] 49504: [CMAKE] - Fix and enable browseui.

Author: akhaldi
Date: Fri Nov  5 23:25:51 2010
New Revision: 49504

URL: http://svn.reactos.org/svn/reactos?rev=49504&view=rev
Log:
[CMAKE]
- Fix and enable browseui.

Modified:
    branches/cmake-bringup/dll/win32/CMakeLists.txt
    branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt

Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLis...
==============================================================================
--- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Fri Nov  5 23:25:51 2010
@@ -12,7 +12,7 @@
 add_subdirectory(batt)
 add_subdirectory(bcrypt)
 add_subdirectory(beepmidi)
-#add_subdirectory(browseui) #FIXME: shellbrowser.cpp:152: error: expected constructor, destructor, or type conversion before 'SHAlloc'
+add_subdirectory(browseui)
 add_subdirectory(cabinet)
 add_subdirectory(cards)
 add_subdirectory(cfgmgr32)
@@ -40,7 +40,7 @@
 add_subdirectory(gdi32)
 add_subdirectory(gdiplus)
 add_subdirectory(getuname)
-add_subdirectory(glu32)# FIXME: set_cpp()?
+add_subdirectory(glu32)
 add_subdirectory(hhctrl.ocx)
 add_subdirectory(hid)
 add_subdirectory(hlink)

Modified: branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/browseui...
==============================================================================
--- branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/browseui/CMakeLists.txt [iso-8859-1] Fri Nov  5 23:25:51 2010
@@ -1,11 +1,17 @@

set_unicode()

-add_definitions(-D__WINESRC__)
+add_definitions(
+    -D__WINESRC__
+    -DUNICODE -D_UNICODE
+    -DROS_Headers)
+
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
-include_directories(${REACTOS_SOURCE_DIR}/lib/atl)
+
+include_directories(
+    ${REACTOS_SOURCE_DIR}/include/reactos/wine
+    ${REACTOS_SOURCE_DIR}/lib/atl)

spec2def(browseui.dll browseui.spec)

@@ -34,13 +40,16 @@

set_module_type(browseui win32dll)

+target_link_libraries(browseui stlport -lsupc++ -lgcc)
+
 target_link_libraries(browseui
     atlnew
     uuid
     wine)

add_importlibs(browseui
-    msvcrt
+    mingw32
+    coldname
     shlwapi
     shell32
     comctl32
@@ -49,6 +58,8 @@
     oleaut32
     user32
     advapi32
+    msvcrt
+    kernel32
     ntdll)

add_cab_target(browseui 1)