Author: spetreolle Date: Thu Oct 14 17:40:25 2010 New Revision: 49143
URL: http://svn.reactos.org/svn/reactos?rev=49143&view=rev Log: [CMAKE] Enable comctl32.
Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt branches/cmake-bringup/dll/win32/comctl32/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] Thu Oct 14 17:40:25 2010 @@ -18,7 +18,7 @@ add_subdirectory(cfgmgr32) add_subdirectory(clusapi) add_subdirectory(comcat) -#add_subdirectory(comctl32)#FIXME: comctl32\dpa.c:531: error: conflicting types for 'DPA_GetPtr' +add_subdirectory(comctl32) #add_subdirectory(comdlg32)#FIXME: comdlg32\/cdlg_Es.rc:396: unrecognized escape sequence add_subdirectory(compstui) #add_subdirectory(credui)#FIXME: \cryptui\/cryptui_Fr.rc:432: syntax error @@ -147,7 +147,7 @@ add_subdirectory(resutils) add_subdirectory(riched20) add_subdirectory(riched32) -#add_subdirectory(rpcrt4) +add_subdirectory(rpcrt4) add_subdirectory(rsabase) add_subdirectory(rsaenh) add_subdirectory(samlib)
Modified: branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/comctl32... ============================================================================== --- branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/comctl32/CMakeLists.txt [iso-8859-1] Thu Oct 14 17:40:25 2010 @@ -6,8 +6,7 @@ add_definitions(-D_COMCTL32_) remove_definitions(-D_WIN32_WINNT=0x502) add_definitions(-D_WIN32_WINNT=0x600) -add_definitions(-D_DLL -D__USE_CRTIMP) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(comctl32 ${CMAKE_CURRENT_SOURCE_DIR}/comctl32.spec ${CMAKE_CURRENT_BINARY_DIR}/comctl32.def)
@@ -63,6 +62,8 @@ advapi32 winmm uxtheme + msvcrt + kernel32 ntdll)
add_dependencies(comctl32 comctl32_def)