Author: spetreolle Date: Fri Nov 5 13:25:28 2010 New Revision: 49482
URL: http://svn.reactos.org/svn/reactos?rev=49482&view=rev Log: [CMAKE] Add dlls to bootcd. Fix hhctrl build.
Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt branches/cmake-bringup/dll/win32/security/CMakeLists.txt branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt branches/cmake-bringup/dll/win32/softpub/CMakeLists.txt branches/cmake-bringup/dll/win32/srclient/CMakeLists.txt branches/cmake-bringup/dll/win32/sxs/CMakeLists.txt branches/cmake-bringup/dll/win32/tapi32/CMakeLists.txt branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt branches/cmake-bringup/dll/win32/updspapi/CMakeLists.txt branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt branches/cmake-bringup/dll/win32/wshtcpip/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 13:25:28 2010 @@ -41,7 +41,7 @@ add_subdirectory(gdiplus) add_subdirectory(getuname) #add_subdirectory(glu32)# FIXME: set_cpp()? -#add_subdirectory(hhctrl.ocx)#FIXME: regsvr.c.obj:regsvr.c:(.text+0x393): undefined reference to `RegDeleteTreeW' +add_subdirectory(hhctrl.ocx) add_subdirectory(hid) add_subdirectory(hlink) add_subdirectory(hnetcfg)
Modified: branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/glu32/CM... ============================================================================== --- branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/glu32/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -1,3 +1,4 @@ +set_cpp()
add_definitions(-DRESOLVE_3D_TEXTURE_SUPPORT) add_definitions(-DBUILD_GL32)
Modified: branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/hhctrl.o... ============================================================================== --- branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/hhctrl.ocx/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -1,5 +1,8 @@
add_definitions(-D__WINESRC__) +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) + include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(hhctrl.ocx hhctrl.ocx.spec) @@ -34,4 +37,4 @@ kernel32 ntdll)
- +add_cab_target(hhctrl 1)
Modified: branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msisys.o... ============================================================================== --- branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msisys.ocx/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -16,3 +16,4 @@
add_importlibs(msisys kernel32 ntdll)
+add_cab_target(msisys 1)
Modified: branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/samsrv/C... ============================================================================== --- branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/samsrv/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -11,3 +11,5 @@
add_importlibs(samsrv kernel32 ntdll) add_dependencies(samsrv psdk buildno_header) + +add_cab_target(samsrv 1)
Modified: branches/cmake-bringup/dll/win32/security/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/security... ============================================================================== --- branches/cmake-bringup/dll/win32/security/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/security/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -12,3 +12,4 @@
add_importlibs(security advapi32 ntdll)
+add_cab_target(security 1)
Modified: branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shdoclc/... ============================================================================== --- branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shdoclc/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -12,3 +12,5 @@
add_importlibs(shdoclc kernel32 ntdll) add_dependencies(shdoclc psdk buildno_header) + +add_cab_target(shdoclc 1)
Modified: branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shfolder... ============================================================================== --- branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/shfolder/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -14,3 +14,5 @@
add_importlibs(shfolder shell32 kernel32 ntdll) add_dependencies(shfolder psdk buildno_header) + +add_cab_target(shfolder 1)
Modified: branches/cmake-bringup/dll/win32/softpub/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/softpub/... ============================================================================== --- branches/cmake-bringup/dll/win32/softpub/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/softpub/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -13,4 +13,4 @@
add_importlibs(softpub wintrust)
- +add_cab_target(softpub 1)
Modified: branches/cmake-bringup/dll/win32/srclient/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/srclient... ============================================================================== --- branches/cmake-bringup/dll/win32/srclient/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/srclient/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -8,3 +8,5 @@
add_importlibs(srclient kernel32 ntdll) add_dependencies(srclient psdk) + +add_cab_target(srclient 1)
Modified: branches/cmake-bringup/dll/win32/sxs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/sxs/CMak... ============================================================================== --- branches/cmake-bringup/dll/win32/sxs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/sxs/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -13,3 +13,5 @@
add_importlibs(sxs kernel32 ntdll) add_dependencies(sxs psdk) + +add_cab_target(sxs 1)
Modified: branches/cmake-bringup/dll/win32/tapi32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/tapi32/C... ============================================================================== --- branches/cmake-bringup/dll/win32/tapi32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/tapi32/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -17,3 +17,5 @@
add_importlibs(tapi32 advapi32 kernel32 ntdll) add_dependencies(tapi32 psdk buildno_header) + +add_cab_target(tapi32 1)
Modified: branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/tapiui/C... ============================================================================== --- branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/tapiui/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -2,3 +2,5 @@ add_library(tapiui SHARED tapiui.rc) set_entrypoint(tapiui 0) add_dependencies(tapiui psdk buildno_header) + +add_cab_target(tapiui 1)
Modified: branches/cmake-bringup/dll/win32/updspapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/updspapi... ============================================================================== --- branches/cmake-bringup/dll/win32/updspapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/updspapi/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -13,3 +13,5 @@
add_importlibs(updspapi setupapi kernel32 ntdll) add_dependencies(updspapi psdk buildno_header) + +add_cab_target(updspapi 1)
Modified: branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wdmaud.d... ============================================================================== --- branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wdmaud.drv/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -31,3 +31,5 @@ mmixer)
add_importlibs(wdmaud.drv user32 winmm advapi32 msvcrt setupapi ksuser kernel32 ntdll) + +add_cab_target(wdmaud.drv 1)
Modified: branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winemp3.... ============================================================================== --- branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winemp3.acm/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -26,3 +26,5 @@ ntdll)
add_dependencies(winemp3.acm psdk) + +add_cab_target(winemp3.acm 1)
Modified: branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winfax/C... ============================================================================== --- branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winfax/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -10,3 +10,5 @@ add_importlibs(winfax kernel32 ntdll)
add_dependencies(winfax psdk) + +add_cab_target(winfax 1)
Modified: branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wing32/C... ============================================================================== --- branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wing32/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -10,3 +10,5 @@ set_entrypoint(wing32 0) add_importlibs(wing32 user32 gdi32) add_dependencies(wing32 psdk) + +add_cab_target(wing32 1)
Modified: branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wlanapi/... ============================================================================== --- branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wlanapi/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -15,3 +15,5 @@
add_importlibs(wlanapi rpcrt4 kernel32 ntdll) add_dependencies(wlanapi psdk buildno_header) + +add_cab_target(wlanapi 1)
Modified: branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wmi/CMak... ============================================================================== --- branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wmi/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -9,3 +9,5 @@
add_importlibs(wmi advapi32) add_dependencies(wmi psdk buildno_header) + +add_cab_target(wmi 1)
Modified: branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/wshtcpip... ============================================================================== --- branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/wshtcpip/CMakeLists.txt [iso-8859-1] Fri Nov 5 13:25:28 2010 @@ -16,4 +16,4 @@ add_importlibs(wshtcpip ws2_32 kernel32 ntdll) add_dependencies(wshtcpip psdk buildno_header)
-add_livecd_target(wshtcpip reactos/system32) +add_cab_target(wshtcpip 1)