Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-10-21 21:34:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CMAKE]

Browse source 
- Fix and enable browseui.

svn path=/branches/cmake-bringup/; revision=49504
This commit is contained in:
Amine Khaldi 2010-11-05 23:25:51 +00:00
parent 7393a02b74
commit 117bdf56ae
2 changed files with 17 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dll/win32/CMakeLists.txt
View file

@ -12,7 +12,7 @@ add_subdirectory(avifil32)
add_subdirectory(batt) add_subdirectory(batt)
add_subdirectory(bcrypt) add_subdirectory(bcrypt)
add_subdirectory(beepmidi) 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(cabinet)
add_subdirectory(cards) add_subdirectory(cards)
add_subdirectory(cfgmgr32) add_subdirectory(cfgmgr32)
@ -40,7 +40,7 @@ add_subdirectory(fusion)
add_subdirectory(gdi32) add_subdirectory(gdi32)
add_subdirectory(gdiplus) add_subdirectory(gdiplus)
add_subdirectory(getuname) add_subdirectory(getuname)
add_subdirectory(glu32)# FIXME: set_cpp()? add_subdirectory(glu32)
add_subdirectory(hhctrl.ocx) add_subdirectory(hhctrl.ocx)
add_subdirectory(hid) add_subdirectory(hid)
add_subdirectory(hlink) add_subdirectory(hlink)

19
dll/win32/browseui/CMakeLists.txt
View file

@ -1,11 +1,17 @@
set_unicode() set_unicode()
add_definitions(-D__WINESRC__) add_definitions(
-D__WINESRC__
-DUNICODE -D_UNICODE
-DROS_Headers)
remove_definitions(-D_WIN32_WINNT=0x502) remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600) 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) spec2def(browseui.dll browseui.spec)
@ -34,13 +40,16 @@ add_library(browseui SHARED
set_module_type(browseui win32dll) set_module_type(browseui win32dll)
target_link_libraries(browseui stlport -lsupc++ -lgcc)
target_link_libraries(browseui target_link_libraries(browseui
atlnew atlnew
uuid uuid
wine) wine)
add_importlibs(browseui add_importlibs(browseui
msvcrt mingw32
coldname
shlwapi shlwapi
shell32 shell32
comctl32 comctl32
@ -49,6 +58,8 @@ add_importlibs(browseui
oleaut32 oleaut32
user32 user32
advapi32 advapi32
msvcrt
kernel32
ntdll) ntdll)
add_cab_target(browseui 1) add_cab_target(browseui 1)