Ros-diffs

ros-diffs@reactos.org

81390 discussions

[fireball] 49229: [MSI] - Fix freed memory access and fix freeing of invalid pointer. (from http://www.winehq.org/pipermail/wine-patches/2010-October/094849.html ) See issue #3755 for more details.
by fireball＠svn.reactos.org 22 Oct '10

22 Oct '10

Author: fireball Date: Fri Oct 22 16:22:21 2010 New Revision: 49229 URL: http://svn.reactos.org/svn/reactos?rev=49229&view=rev Log: [MSI] - Fix freed memory access and fix freeing of invalid pointer. (from http://www.winehq.org/pipermail/wine-patches/2010-October/094849.html ) See issue #3755 for more details. Modified: trunk/reactos/dll/win32/msi/action.c Modified: trunk/reactos/dll/win32/msi/action.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msi/action.c?rev… ============================================================================== --- trunk/reactos/dll/win32/msi/action.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msi/action.c [iso-8859-1] Fri Oct 22 16:22:21 2010 @@ -1985,7 +1985,7 @@ VS_FIXEDFILEINFO *msi_get_disk_file_version( LPCWSTR filename ) { static const WCHAR name[] = {'\\',0}; - VS_FIXEDFILEINFO *ret; + VS_FIXEDFILEINFO *ptr, *ret; LPVOID version; DWORD versize, handle; UINT sz; @@ -2002,11 +2002,14 @@ GetFileVersionInfoW( filename, 0, versize, version ); - if (!VerQueryValueW( version, name, (LPVOID *)&ret, &sz )) + if (!VerQueryValueW( version, name, (LPVOID *)&ptr, &sz )) { msi_free( version ); return NULL; } + + ret = msi_alloc( sz ); + memcpy( ret, ptr, sz ); msi_free( version ); return ret;

1 0

[akhaldi] 49228: [CMAKE] - Fix comdlg32 and add it to build.
by akhaldi＠svn.reactos.org 22 Oct '10

22 Oct '10

Author: akhaldi Date: Fri Oct 22 15:20:41 2010 New Revision: 49228 URL: http://svn.reactos.org/svn/reactos?rev=49228&view=rev Log: [CMAKE] - Fix comdlg32 and add it to build. Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt branches/cmake-bringup/dll/win32/comdlg32/cdlg_Da.rc branches/cmake-bringup/dll/win32/comdlg32/cdlg_No.rc Modified: branches/cmake-bringup/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/CMakeLists.txt [iso-8859-1] Fri Oct 22 15:20:41 2010 @@ -19,7 +19,7 @@ add_subdirectory(clusapi) add_subdirectory(comcat) add_subdirectory(comctl32) -#add_subdirectory(comdlg32)#FIXME: comdlg32\\/cdlg_Es.rc:396: unrecognized escape sequence +add_subdirectory(comdlg32) add_subdirectory(compstui) #add_subdirectory(credui)#FIXME: \\cryptui\\/cryptui_Fr.rc:432: syntax error add_subdirectory(crtdll) Modified: branches/cmake-bringup/dll/win32/comdlg32/cdlg_Da.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/comdlg3… ============================================================================== --- branches/cmake-bringup/dll/win32/comdlg32/cdlg_Da.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/comdlg32/cdlg_Da.rc [iso-8859-1] Fri Oct 22 15:20:41 2010 @@ -258,7 +258,7 @@ EDITTEXT edt3, 237,106, 35,12, WS_GROUP | ES_NUMBER GROUPBOX "Udskriv omrÃ¥de", grp1, 8,92, 144,64, WS_GROUP - CONTROL "&Alle" rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 + CONTROL "&Alle", rad1,"Button",BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,16,106,64,12 CONTROL "Si&der", rad3,"Button",BS_AUTORADIOBUTTON,16,122,36,12 CONTROL "&Markeret", rad2,"Button",BS_AUTORADIOBUTTON,16,138,64,12 EDITTEXT edt1, 74,122, 26,12, WS_GROUP | ES_NUMBER Modified: branches/cmake-bringup/dll/win32/comdlg32/cdlg_No.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/comdlg3… ============================================================================== --- branches/cmake-bringup/dll/win32/comdlg32/cdlg_No.rc [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/comdlg32/cdlg_No.rc [iso-8859-1] Fri Oct 22 15:20:41 2010 @@ -405,7 +405,7 @@ PD32_GENERIC_ERROR "En feil har oppstått." PD32_DRIVER_UNKNOWN "Ukjent skriverdriver." PD32_NO_DEVICES "Du må installere en skriver før du \ - kan gjøre skriver-relaterte oppgaver som å endre \ sideoppsettet og skrive ut et dokument. \ + kan gjøre skriver-relaterte oppgaver som å endre sideoppsettet og skrive ut et dokument. \ Installer en og prøv på nytt." PD32_DEFAULT_PRINTER "Standardskriver; "

1 0

[spetreolle] 49227: [CMAKE] Add comdlg32, ole32, oleaut32, rpcrt4, shell32, urlmon to build. comdlg32 remains disabled due to build error in Danish resources.
by spetreolle＠svn.reactos.org 22 Oct '10

22 Oct '10

Author: spetreolle Date: Fri Oct 22 15:17:45 2010 New Revision: 49227 URL: http://svn.reactos.org/svn/reactos?rev=49227&view=rev Log: [CMAKE] Add comdlg32, ole32, oleaut32, rpcrt4, shell32,urlmon to build. comdlg32 remains disabled due to build error in Danish resources. Added: branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt (with props) branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt (with props) Modified: branches/cmake-bringup/dll/win32/comdlg32/CMakeLists.txt branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt Modified: branches/cmake-bringup/dll/win32/comdlg32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/comdlg3… ============================================================================== --- branches/cmake-bringup/dll/win32/comdlg32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/comdlg32/CMakeLists.txt [iso-8859-1] Fri Oct 22 15:17:45 2010 @@ -33,6 +33,8 @@ gdi32 advapi32 ole32 + msvcrt + kernel32 ntdll) add_dependencies(comdlg32 comdlg32_def) Added: branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/ole32/C… ============================================================================== --- branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt [iso-8859-1] Fri Oct 22 15:17:45 2010 @@ -1,0 +1,75 @@ +list(APPEND SOURCE + antimoniker.c + bindctx.c + classmoniker.c + clipboard.c + comcat.c + compobj.c + compositemoniker.c + datacache.c + defaulthandler.c + dictionary.c + enumx.c + errorinfo.c + filelockbytes.c + filemoniker.c + ftmarshal.c + git.c + hglobalstream.c + ifs.c + itemmoniker.c + marshal.c + memlockbytes.c + moniker.c + ole2.c + ole2stubs.c + ole2impl.c + ole32_main.c + oleobj.c + oleproxy.c + pointermoniker.c + regsvr.c + rpc.c + stg_prop.c + stg_stream.c + storage32.c + stubmanager.c + usrmarshal.c + ole32res.rc) + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D__WINESRC__) +add_definitions(-D_OLE32_) +add_definitions(-DENTRY_PREFIX=OLE32_) +add_definitions(-DPROXY_CLSID=CLSID_PSFactoryBuffer) +add_definitions(-DREGISTER_PROXY_DLL) +add_definitions(-DCOM_NO_WINDOWS_H) + +include_directories(${CMAKE_CURRENT_BINARY_DIR}) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +ADD_INTERFACE_DEFINITIONS(ole32idl dcom.idl irot.idl) +rpcproxy(ole32 + dcom.idl + ole32_unknwn.idl + ole32_objidl.idl + ole32_oleidl.idl) + +spec2def(ole32 ${CMAKE_CURRENT_SOURCE_DIR}/ole32.spec ${CMAKE_CURRENT_BINARY_DIR}/ole32.def) + +add_library(ole32 SHARED ${SOURCE}) + +set_module_type(ole32 win32dll) + +target_link_libraries(ole32 + ${CMAKE_CURRENT_BINARY_DIR}/ole32.def + wine + irot_client + ole32_proxy + uuid + pseh) + +add_importlibs(ole32 advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 ntdll) + +add_dependencies(ole32 ole32_def ole32idl) Propchange: branches/cmake-bringup/dll/win32/ole32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/oleaut3… ============================================================================== --- branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt [iso-8859-1] Fri Oct 22 15:17:45 2010 @@ -1,0 +1,59 @@ +list(APPEND SOURCE + connpt.c + dispatch.c + hash.c + oleaut.c + olefont.c + olepicture.c + recinfo.c + regsvr.c + safearray.c + stubs.c + tmarshal.c + typelib.c + typelib2.c + ungif.c + usrmarshal.c + varformat.c + variant.c + vartype.c + oleaut32.rc + oleaut32_oaidl.idl) + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D__WINESRC__) +add_definitions(-DPROXY_CLSID_IS={0xb196b286,0xbab4,0x101a,{0xb6,0x9c,0x00,0xaa,0x00,0x34,0x1d,0x07}}) +add_definitions(-DCOM_NO_WINDOWS_H) +add_definitions(-D_OLEAUT32_) +add_definitions(-DPROXY_DELEGATION) +add_definitions(-DREGISTER_PROXY_DLL) +add_definitions(-DENTRY_PREFIX=OLEAUTPS_) +if(MSC) +# seems to work, but is this correct ? +# <compilerflag compilerset="msc">/FIwine/typeof.h</compilerflag> +add_definitions(/FIwine/typeof.h) +endif(MSC) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg) +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) + +spec2def(oleaut32 ${CMAKE_CURRENT_SOURCE_DIR}/oleaut32.spec ${CMAKE_CURRENT_BINARY_DIR}/oleaut32.def) + +add_library(oleaut32 SHARED ${SOURCE}) + +set_module_type(oleaut32 win32dll) + +target_link_libraries(oleaut32 + ${CMAKE_CURRENT_BINARY_DIR}/oleaut32.def + oleaut32_proxy + wine + wineldr + uuid + pseh) + +add_importlibs(oleaut32 windowscodecs ole32 rpcrt4 user32 gdi32 advapi32 comctl32 urlmon msvcrt kernel32 ntdll) +add_dependencies(oleaut32 oleaut32_def) + +rpcproxy(oleaut32 oleaut32_oaidl.idl oleaut32_ocidl.idl) + Propchange: branches/cmake-bringup/dll/win32/oleaut32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/rpcrt4/… ============================================================================== --- branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt [iso-8859-1] Fri Oct 22 15:17:45 2010 @@ -1,0 +1,46 @@ + +list(APPEND SOURCE + cproxy.c + cpsf.c + cstub.c + ndr_clientserver.c + ndr_contexthandle.c + ndr_es.c + ndr_fullpointer.c + ndr_marshall.c + ndr_ole.c + ndr_stubless.c + rpc_assoc.c + rpc_async.c + rpc_binding.c + rpc_epmap.c + rpc_message.c + rpcrt4.rc + rpcrt4_main.c + rpc_server.c + rpc_transport.c + unix_func.c) + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D_RPCRT4_) +add_definitions(-DCOM_NO_WINDOWS_H) +add_definitions(-DMSWMSG) + +spec2def(rpcrt4 ${CMAKE_CURRENT_SOURCE_DIR}/rpcrt4.spec ${CMAKE_CURRENT_BINARY_DIR}/rpcrt4.def) + +add_library(rpcrt4 SHARED ${SOURCE}) + +set_module_type(rpcrt4 win32dll) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(${REACTOS_BINARY_DIR}/include/reactos/wine) +target_link_libraries(rpcrt4 + ${CMAKE_CURRENT_BINARY_DIR}/rpcrt4.def + wine + uuid + epm_client + pseh) + +add_importlibs(rpcrt4 msvcrt user32 advapi32 secur32 iphlpapi ws2_32 kernel32 ntdll) +add_dependencies(rpcrt4 rpcrt4_def winesdk) Propchange: branches/cmake-bringup/dll/win32/rpcrt4/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/shell32… ============================================================================== --- branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt (added) +++ branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Fri Oct 22 15:17:45 2010 @@ -1,0 +1,96 @@ +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 + shell32.rc) + +remove_definitions(-D_WIN32_WINNT=0x502) +add_definitions(-D_WIN32_WINNT=0x600) +add_definitions(-D_SHELL32_) +add_definitions(-DCOM_NO_WINDOWS_H) +add_definitions(-D_WINE) + +spec2def(shell32 ${CMAKE_CURRENT_SOURCE_DIR}/shell32.spec ${CMAKE_CURRENT_BINARY_DIR}/shell32.def) + +include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) +include_directories(${REACTOS_SOURCE_DIR}/lib/recyclebin) +include_directories(${REACTOS_SOURCE_DIR}) + +add_pch(shell32 ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) +add_library(shell32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/shell32_precomp.h.gch ${SOURCE}) + +set_module_type(shell32 win32dll) + +target_link_libraries(shell32 + ${CMAKE_CURRENT_BINARY_DIR}/shell32.def + wine + uuid + recyclebin) + +add_importlibs(shell32 + advapi32 + gdi32 + user32 + comctl32 + comdlg32 + shlwapi + ole32 + version + devmgr + winspool + winmm + kernel32 + msvcrt + ntdll) + +add_dependencies(shell32 shell32_def) Propchange: branches/cmake-bringup/dll/win32/shell32/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/urlmon/… ============================================================================== --- branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/urlmon/CMakeLists.txt [iso-8859-1] Fri Oct 22 15:17:45 2010 @@ -55,3 +55,13 @@ ntdll) add_dependencies(urlmon urlmon_def) +add_definitions(-DENTRY_PREFIX=URLMON_) +add_definitions(-DPROXY_DELEGATION) +add_definitions(-DREGISTER_PROXY_DLL) +add_definitions(-D_URLMON_) + +# FIXME : this should be quotes enclosed +add_definitions(-DPROXY_CLSID_IS={0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}) +#add_definitions(-DPROXY_CLSID_IS="{0x79EAC9F1,0xBAF9,0x11CE,{0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B}}") + +rpcproxy(urlmon urlmon_urlmon.idl)

1 0

[spetreolle] 49226: [CMAKE] Add rpcss to build.
by spetreolle＠svn.reactos.org 22 Oct '10

22 Oct '10

Author: spetreolle Date: Fri Oct 22 14:55:38 2010 New Revision: 49226 URL: http://svn.reactos.org/svn/reactos?rev=49226&view=rev Log: [CMAKE] Add rpcss to build. Modified: branches/cmake-bringup/base/services/CMakeLists.txt branches/cmake-bringup/base/services/rpcss/CMakeLists.txt Modified: branches/cmake-bringup/base/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/CMa… ============================================================================== --- branches/cmake-bringup/base/services/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:55:38 2010 @@ -1,7 +1,7 @@ add_subdirectory(audiosrv) add_subdirectory(eventlog) -#add_subdirectory(rpcss) +add_subdirectory(rpcss) add_subdirectory(spoolsv) add_subdirectory(svchost) add_subdirectory(tcpsvcs) Modified: branches/cmake-bringup/base/services/rpcss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/rpc… ============================================================================== --- branches/cmake-bringup/base/services/rpcss/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/rpcss/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:55:38 2010 @@ -1,7 +1,7 @@ set_unicode() -add_executable(rpcss +list(APPEND SOURCE epmp.c irotp.c rpcss_main.c @@ -10,10 +10,13 @@ irot.idl rpcss.rc) -target_link_libraries(rpcss rpcss_epm_server rpcss_irot_server pseh) +include_directories(${REACTOS_BINARY_DIR}/include/reactos/wine) -add_pch(rpcss ${CMAKE_CURRENT_SOURCE_DIR}/rpcss.h ${SOURCE}) +add_executable(rpcss ${SOURCE}) + +target_link_libraries(rpcss epm_server irot_server pseh wine) set_module_type(rpcss win32cui) add_importlibs(rpcss advapi32 rpcrt4 msvcrt kernel32 ntdll) +add_livecd_target(rpcss reactos/system32)

1 0

[spetreolle] 49225: [CMAKE] Livecd: Add hal, ntoskrnl, csrss, csrsrv, win32k.
by spetreolle＠svn.reactos.org 22 Oct '10

22 Oct '10

Author: spetreolle Date: Fri Oct 22 14:15:01 2010 New Revision: 49225 URL: http://svn.reactos.org/svn/reactos?rev=49225&view=rev Log: [CMAKE] Livecd: Add hal, ntoskrnl, csrss, csrsrv, win32k. Modified: branches/cmake-bringup/hal/CMakeLists.txt branches/cmake-bringup/ntoskrnl/CMakeLists.txt branches/cmake-bringup/subsystems/win32/csrss/CMakeLists.txt branches/cmake-bringup/subsystems/win32/csrss/csrsrv/CMakeLists.txt branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt Modified: branches/cmake-bringup/hal/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/CMakeLists.tx… ============================================================================== --- branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:15:01 2010 @@ -99,6 +99,7 @@ set_property(TARGET mini_hal PROPERTY COMPILE_DEFINITIONS "_BLDR_;_MINIHAL_") add_dependencies(mini_hal psdk bugcodes) add_minicd_target(hal reactos hal.dll) +add_livecd_target(hal reactos/system32 hal.dll) else() #TBD endif(ARCH MATCHES i386) Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLis… ============================================================================== --- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:15:01 2010 @@ -425,4 +425,5 @@ set_source_files_properties(${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S PROPERTIES GENERATED TRUE) add_dependencies(ntoskrnl psdk bugcodes kernel_zw kernel_napi) -add_minicd_target(ntoskrnl reactos ntoskrnl.exe) +add_minicd_target(ntoskrnl reactos ntoskrnl.exe) +add_livecd_target(ntoskrnl reactos/system32) Modified: branches/cmake-bringup/subsystems/win32/csrss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/csrss/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/csrss/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:15:01 2010 @@ -15,3 +15,4 @@ add_subdirectory(csrsrv) add_subdirectory(win32csr) +add_livecd_target(csrss reactos/system32) Modified: branches/cmake-bringup/subsystems/win32/csrss/csrsrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/csrss/csrsrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/csrss/csrsrv/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:15:01 2010 @@ -25,3 +25,4 @@ add_pch(csrsrv ${CMAKE_CURRENT_SOURCE_DIR}/srv.h ${SOURCE}) add_dependencies(csrsrv csrsrv_def psdk bugcodes) +add_livecd_target(csrsrv reactos/system32) Modified: branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/subsystems/win32/… ============================================================================== --- branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/subsystems/win32/win32k/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:15:01 2010 @@ -188,3 +188,4 @@ add_pch(win32k ${CMAKE_CURRENT_SOURCE_DIR}/pch.h ${SOURCE}) add_dependencies(win32k psdk gendib_generated bugcodes subsystem_napi buildno_header) +add_livecd_target(win32k reactos/system32)

1 0

[spetreolle] 49224: [CMAKE] Livecd: Add base/ modules.
by spetreolle＠svn.reactos.org 22 Oct '10

22 Oct '10

Author: spetreolle Date: Fri Oct 22 14:10:12 2010 New Revision: 49224 URL: http://svn.reactos.org/svn/reactos?rev=49224&view=rev Log: [CMAKE] Livecd: Add base/ modules. Modified: branches/cmake-bringup/base/services/audiosrv/CMakeLists.txt branches/cmake-bringup/base/services/eventlog/CMakeLists.txt branches/cmake-bringup/base/services/spoolsv/CMakeLists.txt branches/cmake-bringup/base/services/svchost/CMakeLists.txt branches/cmake-bringup/base/setup/setup/CMakeLists.txt branches/cmake-bringup/base/system/autochk/CMakeLists.txt branches/cmake-bringup/base/system/lsass/CMakeLists.txt branches/cmake-bringup/base/system/services/CMakeLists.txt branches/cmake-bringup/base/system/smss/CMakeLists.txt branches/cmake-bringup/base/system/winlogon/CMakeLists.txt Modified: branches/cmake-bringup/base/services/audiosrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/aud… ============================================================================== --- branches/cmake-bringup/base/services/audiosrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/audiosrv/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:10:12 2010 @@ -12,4 +12,4 @@ set_module_type(audiosrv win32cui) add_importlibs(audiosrv advapi32 user32 setupapi msvcrt kernel32) - +add_livecd_target(audiosrv reactos/system32) Modified: branches/cmake-bringup/base/services/eventlog/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/eve… ============================================================================== --- branches/cmake-bringup/base/services/eventlog/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/eventlog/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:10:12 2010 @@ -19,3 +19,4 @@ set_module_type(eventlog win32cui) add_importlibs(eventlog advapi32 rpcrt4 msvcrt kernel32 ntdll) +add_livecd_target(eventlog reactos/system32) Modified: branches/cmake-bringup/base/services/spoolsv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/spo… ============================================================================== --- branches/cmake-bringup/base/services/spoolsv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/spoolsv/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:10:12 2010 @@ -7,3 +7,4 @@ set_module_type(spoolsv win32cui) add_importlibs(spoolsv advapi32 msvcrt kernel32 ntdll) +add_livecd_target(spoolsv reactos/system32) Modified: branches/cmake-bringup/base/services/svchost/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/services/svc… ============================================================================== --- branches/cmake-bringup/base/services/svchost/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/services/svchost/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:10:12 2010 @@ -3,3 +3,4 @@ set_module_type(svchost win32cui) add_importlibs(svchost advapi32 msvcrt kernel32 ntdll) +add_livecd_target(svchost reactos/system32) Modified: branches/cmake-bringup/base/setup/setup/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/setup/setup/… ============================================================================== --- branches/cmake-bringup/base/setup/setup/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/setup/setup/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:10:12 2010 @@ -5,3 +5,4 @@ set_module_type(setup win32gui) add_importlibs(setup userenv msvcrt kernel32 ntdll) +add_livecd_target(setup reactos/system32) Modified: branches/cmake-bringup/base/system/autochk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/autoc… ============================================================================== --- branches/cmake-bringup/base/system/autochk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/autochk/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:10:12 2010 @@ -4,4 +4,5 @@ set_module_type(autochk nativecui) target_link_libraries(autochk mingw_common nt) -add_importlibs(autochk kernel32 ntdll) +add_importlibs(autochk kernel32 ntdll) +add_livecd_target(autochk reactos/system32) Modified: branches/cmake-bringup/base/system/lsass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/lsass… ============================================================================== --- branches/cmake-bringup/base/system/lsass/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/lsass/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:10:12 2010 @@ -8,3 +8,4 @@ set_module_type(lsass win32gui) add_importlibs(lsass advapi32 lsasrv msvcrt kernel32 ntdll) +add_livecd_target(lsass reactos/system32) Modified: branches/cmake-bringup/base/system/services/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/servi… ============================================================================== --- branches/cmake-bringup/base/system/services/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/services/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:10:12 2010 @@ -23,4 +23,4 @@ set_module_type(services win32cui) add_importlibs(services user32 advapi32 rpcrt4 msvcrt kernel32 ntdll) - +add_livecd_target(services reactos/system32) Modified: branches/cmake-bringup/base/system/smss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/smss/… ============================================================================== --- branches/cmake-bringup/base/system/smss/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/smss/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:10:12 2010 @@ -30,3 +30,4 @@ set_module_type(smss nativecui) add_importlibs(smss ntdll) +add_livecd_target(smss reactos/system32) Modified: branches/cmake-bringup/base/system/winlogon/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/base/system/winlo… ============================================================================== --- branches/cmake-bringup/base/system/winlogon/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/base/system/winlogon/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:10:12 2010 @@ -17,3 +17,4 @@ set_module_type(winlogon win32gui) add_importlibs(winlogon user32 advapi32 userenv secur32 msvcrt kernel32 ntdll) +add_livecd_target(winlogon reactos/system32)

1 0

[spetreolle] 49223: [CMAKE] Livecd: Add dlls that aren't win32dll modules.
by spetreolle＠svn.reactos.org 22 Oct '10

22 Oct '10

Author: spetreolle Date: Fri Oct 22 14:05:00 2010 New Revision: 49223 URL: http://svn.reactos.org/svn/reactos?rev=49223&view=rev Log: [CMAKE] Livecd: Add dlls that aren't win32dll modules. Modified: branches/cmake-bringup/dll/ntdll/CMakeLists.txt branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt branches/cmake-bringup/dll/win32/dnsapi/CMakeLists.txt branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt branches/cmake-bringup/dll/win32/mlang/CMakeLists.txt branches/cmake-bringup/dll/win32/msacm32/msacm32.drv/CMakeLists.txt branches/cmake-bringup/dll/win32/olecli32/CMakeLists.txt branches/cmake-bringup/dll/win32/olesvr32/CMakeLists.txt branches/cmake-bringup/dll/win32/version/CMakeLists.txt branches/cmake-bringup/dll/win32/winmm/midimap/CMakeLists.txt branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt Modified: branches/cmake-bringup/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/CMakeLi… ============================================================================== --- branches/cmake-bringup/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/ntdll/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:05:00 2010 @@ -45,4 +45,5 @@ add_pch(ntdll ${CMAKE_CURRENT_SOURCE_DIR}/include/ntdll.h ${SOURCE}) add_dependencies(ntdll ntstatus version) -add_minicd_target(ntdll reactos/system32 ntdll.dll) +add_minicd_target(ntdll reactos/system32 ntdll.dll) +add_livecd_target(ntdll reactos/system32) Modified: branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/beepmid… ============================================================================== --- branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/beepmidi/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:05:00 2010 @@ -11,3 +11,4 @@ add_importlibs(beepmidi winmm kernel32 ntdll) add_dependencies(beepmidi beepmidi_def psdk) +add_livecd_target(beepmidi reactos/system32) Modified: branches/cmake-bringup/dll/win32/dnsapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/dnsapi/… ============================================================================== --- branches/cmake-bringup/dll/win32/dnsapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/dnsapi/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:05:00 2010 @@ -32,3 +32,4 @@ add_importlibs(dnsapi user32 ws2_32 iphlpapi msvcrt kernel32 ntdll) add_pch(dnsapi ${CMAKE_CURRENT_SOURCE_DIR}/dnsapi/precomp.h ${SOURCE}) add_dependencies(dnsapi dnsapi_def psdk buildno_header) +add_livecd_target(dnsapi reactos/system32) Modified: branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lsasrv/… ============================================================================== --- branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/lsasrv/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:05:00 2010 @@ -24,3 +24,4 @@ add_importlibs(lsasrv rpcrt4 kernel32 ntdll) add_dependencies(lsasrv lsasrv_def psdk buildno_header) +add_livecd_target(lsasrv reactos/system32) Modified: branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/lz32/CM… ============================================================================== --- branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/lz32/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:05:00 2010 @@ -14,3 +14,4 @@ add_importlibs(lz32 kernel32 ntdll) add_dependencies(lz32 lz32_def psdk buildno_header) +add_livecd_target(lz32 reactos/system32) Modified: branches/cmake-bringup/dll/win32/mlang/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/mlang/C… ============================================================================== --- branches/cmake-bringup/dll/win32/mlang/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/mlang/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:05:00 2010 @@ -24,4 +24,5 @@ kernel32 ntdll) -add_dependencies(mlang mlang_def psdk buildno_header) +add_dependencies(mlang mlang_def psdk buildno_header) +add_livecd_target(mlang reactos/system32) Modified: branches/cmake-bringup/dll/win32/msacm32/msacm32.drv/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/msacm32… ============================================================================== --- branches/cmake-bringup/dll/win32/msacm32/msacm32.drv/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/msacm32/msacm32.drv/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:05:00 2010 @@ -21,3 +21,4 @@ add_importlibs(msacm32.drv msacm32 user32 winmm advapi32 kernel32 ntdll) add_dependencies(msacm32.drv msacm32.drv_def psdk buildno_header) +add_livecd_target(msacm32.drv reactos/system32) Modified: branches/cmake-bringup/dll/win32/olecli32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/olecli3… ============================================================================== --- branches/cmake-bringup/dll/win32/olecli32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/olecli32/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:05:00 2010 @@ -14,3 +14,4 @@ add_importlibs(olecli32 ole32 gdi32 kernel32 ntdll) add_dependencies(olecli32 olecli32_def psdk buildno_header) +add_livecd_target(olecli32 reactos/system32) Modified: branches/cmake-bringup/dll/win32/olesvr32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/olesvr3… ============================================================================== --- branches/cmake-bringup/dll/win32/olesvr32/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/olesvr32/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:05:00 2010 @@ -15,3 +15,4 @@ add_importlibs(olesvr32 kernel32 ntdll) add_dependencies(olesvr32 olesvr32_def psdk buildno_header) +add_livecd_target(olesvr32 reactos/system32) Modified: branches/cmake-bringup/dll/win32/version/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/version… ============================================================================== --- branches/cmake-bringup/dll/win32/version/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/version/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:05:00 2010 @@ -18,3 +18,4 @@ add_importlibs(version lz32 kernel32 ntdll) add_dependencies(version version_def psdk buildno_header) +add_livecd_target(version reactos/system32) Modified: branches/cmake-bringup/dll/win32/winmm/midimap/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winmm/m… ============================================================================== --- branches/cmake-bringup/dll/win32/winmm/midimap/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winmm/midimap/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:05:00 2010 @@ -13,3 +13,4 @@ add_importlibs(midimap kernel32 uuid ntdll advapi32 user32 winmm) add_dependencies(midimap midimap_def psdk) +add_livecd_target(midimap reactos/system32) Modified: branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/winspoo… ============================================================================== --- branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/win32/winspool/CMakeLists.txt [iso-8859-1] Fri Oct 22 14:05:00 2010 @@ -10,8 +10,8 @@ stubs.c winspool.rc) +set_target_properties(winspool PROPERTIES SUFFIX ".drv") set_module_type(winspool win32dll) -set_target_properties(winspool PROPERTIES SUFFIX ".drv") target_link_libraries(winspool ${CMAKE_CURRENT_BINARY_DIR}/winspool.def @@ -19,3 +19,4 @@ add_importlibs(winspool advapi32 shlwapi kernel32 ntdll) add_dependencies(winspool winspool_def) +#add_livecd_target(winspool reactos/system32 winspool.drv)

1 0

[spetreolle] 49222: [CMAKE] Livecd: Add drivers.
by spetreolle＠svn.reactos.org 22 Oct '10

22 Oct '10

Author: spetreolle Date: Fri Oct 22 13:46:11 2010 New Revision: 49222 URL: http://svn.reactos.org/svn/reactos?rev=49222&view=rev Log: [CMAKE] Livecd: Add drivers. Modified: branches/cmake-bringup/drivers/base/beep/CMakeLists.txt branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt branches/cmake-bringup/drivers/base/kdcom/CMakeLists.txt branches/cmake-bringup/drivers/base/nmidebug/CMakeLists.txt branches/cmake-bringup/drivers/base/null/CMakeLists.txt branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/cdfs/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/ext2/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/fastfat/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/fs_rec/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/msfs/CMakeLists.txt branches/cmake-bringup/drivers/filesystems/npfs/CMakeLists.txt branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt branches/cmake-bringup/drivers/network/afd/CMakeLists.txt branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt branches/cmake-bringup/drivers/storage/class/cdrom/CMakeLists.txt branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt branches/cmake-bringup/drivers/storage/class/disk/CMakeLists.txt branches/cmake-bringup/drivers/storage/class/ramdisk/CMakeLists.txt branches/cmake-bringup/drivers/storage/floppy/CMakeLists.txt branches/cmake-bringup/drivers/storage/ide/atapi/CMakeLists.txt branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt branches/cmake-bringup/drivers/usb/nt4compat/usbdriver/CMakeLists.txt branches/cmake-bringup/drivers/video/displays/framebuf/CMakeLists.txt branches/cmake-bringup/drivers/video/displays/vga/CMakeLists.txt branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt branches/cmake-bringup/drivers/video/miniport/vbe/CMakeLists.txt branches/cmake-bringup/drivers/video/miniport/vga/CMakeLists.txt branches/cmake-bringup/drivers/video/miniport/vga_new/CMakeLists.txt branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt Modified: branches/cmake-bringup/drivers/base/beep/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/beep… ============================================================================== --- branches/cmake-bringup/drivers/base/beep/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/base/beep/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -10,3 +10,4 @@ -lhal) add_dependencies(beep psdk bugcodes) +add_livecd_target(beep reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/boot… ============================================================================== --- branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/base/bootvid/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -27,4 +27,5 @@ add_pch(bootvid ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) add_dependencies(bootvid bootvid_def psdk buildno_header bugcodes) -add_minicd_target(bootvid reactos bootvid.dll) +add_minicd_target(bootvid reactos bootvid.dll) +add_livecd_target(bootvid reactos/system32) Modified: branches/cmake-bringup/drivers/base/kdcom/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/kdco… ============================================================================== --- branches/cmake-bringup/drivers/base/kdcom/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/base/kdcom/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -21,4 +21,5 @@ -lhal) add_dependencies(kdcom kdcom_def psdk buildno_header bugcodes) -add_minicd_target(kdcom reactos kdcom.dll) +add_minicd_target(kdcom reactos kdcom.dll) +add_livecd_target(kdcom reactos/system32) Modified: branches/cmake-bringup/drivers/base/nmidebug/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/nmid… ============================================================================== --- branches/cmake-bringup/drivers/base/nmidebug/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/base/nmidebug/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -10,3 +10,4 @@ -lhal) add_dependencies(nmidebug psdk bugcodes) +add_livecd_target(nmidebug reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/base/null/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/base/null… ============================================================================== --- branches/cmake-bringup/drivers/base/null/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/base/null/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -11,3 +11,4 @@ -lhal) add_dependencies(null psdk bugcodes) +add_livecd_target(null reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/acpi/… ============================================================================== --- branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/acpi/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -147,6 +147,7 @@ add_dependencies(acpi psdk bugcodes) add_minicd_target(acpi reactos acpi.sys) +add_livecd_target(acpi reactos/system32/drivers) add_subdirectory(cmbatt) add_subdirectory(compbatt) Modified: branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/isapn… ============================================================================== --- branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/isapnp/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -11,3 +11,4 @@ add_importlibs(isapnp ntoskrnl hal) add_dependencies(isapnp psdk bugcodes buildno_header) add_minicd_target(isapnp reactos isapnp.sys) +add_livecd_target(isapnp reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pci/C… ============================================================================== --- branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/pci/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -9,4 +9,5 @@ add_importlibs(pci ntoskrnl hal) add_dependencies(pci psdk bugcodes buildno_header) -add_minicd_target(pci reactos pci.sys) +add_minicd_target(pci reactos pci.sys) +add_livecd_target(pci reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/bus/pcmci… ============================================================================== --- branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/bus/pcmcia/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -9,4 +9,5 @@ add_importlibs(pcmcia ntoskrnl hal) add_dependencies(pcmcia psdk bugcodes buildno_header) -add_minicd_target(pcmcia reactos pcmcia.sys) +add_minicd_target(pcmcia reactos pcmcia.sys) +add_livecd_target(pcmcia reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/filesystems/cdfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/cdfs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/cdfs/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -29,4 +29,5 @@ add_pch(cdfs ${CMAKE_CURRENT_SOURCE_DIR}/cdfs.h ${SOURCE}) add_dependencies(cdfs psdk bugcodes) -add_minicd_target(cdfs reactos cdfs.sys) +add_minicd_target(cdfs reactos cdfs.sys) +add_livecd_target(cdfs reactos/system32/drivers cdfs.sys) Modified: branches/cmake-bringup/drivers/filesystems/ext2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/ext2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/ext2/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -30,4 +30,5 @@ -lhal) add_dependencies(ext2fs psdk bugcodes) -add_minicd_target(ext2fs reactos ext2.sys) +add_minicd_target(ext2fs reactos ext2.sys) +add_livecd_target(ext2fs reactos/system32/drivers ext2.sys) Modified: branches/cmake-bringup/drivers/filesystems/fastfat/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/fastfat/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/fastfat/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -35,4 +35,5 @@ add_pch(fastfat ${CMAKE_CURRENT_SOURCE_DIR}/vfat.h ${SOURCE}) add_dependencies(fastfat psdk bugcodes) -add_minicd_target(fastfat reactos fastfat.sys) +add_minicd_target(fastfat reactos fastfat.sys) +add_livecd_target(fastfat reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/filesystems/fs_rec/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/fs_rec/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/fs_rec/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -13,3 +13,4 @@ add_importlibs(fs_rec ntoskrnl hal) add_dependencies(fs_rec psdk bugcodes) +add_livecd_target(fs_rec reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/filesystems/msfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/msfs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/msfs/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -14,3 +14,4 @@ add_importlibs(msfs ntoskrnl hal) add_pch(msfs ${CMAKE_CURRENT_SOURCE_DIR}/msfs.h ${SOURCE}) add_dependencies(msfs psdk bugcodes) +add_livecd_target(msfs reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/filesystems/npfs/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesyste… ============================================================================== --- branches/cmake-bringup/drivers/filesystems/npfs/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/filesystems/npfs/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -16,3 +16,4 @@ add_pch(npfs ${CMAKE_CURRENT_SOURCE_DIR}/npfs.h ${SOURCE}) add_dependencies(npfs psdk bugcodes) +add_livecd_target(npfs reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/i80… ============================================================================== --- branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -21,4 +21,5 @@ -lhal) add_dependencies(i8042prt psdk bugcodes) -add_minicd_target(i8042prt reactos i8042prt.sys) +add_minicd_target(i8042prt reactos i8042prt.sys) +add_livecd_target(i8042prt reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/kbd… ============================================================================== --- branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -15,4 +15,5 @@ -lhal) add_dependencies(kbdclass psdk bugcodes) -add_minicd_target(kbdclass reactos kbdclass.sys) +add_minicd_target(kbdclass reactos kbdclass.sys) +add_livecd_target(kbdclass reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/mou… ============================================================================== --- branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -14,3 +14,4 @@ -lhal) add_dependencies(mouclass psdk bugcodes) +add_livecd_target(mouclass reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/network/afd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/a… ============================================================================== --- branches/cmake-bringup/drivers/network/afd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/network/afd/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -28,3 +28,4 @@ add_pch(afd ${CMAKE_CURRENT_SOURCE_DIR}/include/afd.h ${SOURCE}) add_dependencies(afd psdk bugcodes buildno_header) +add_livecd_target(afd reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/network/n… ============================================================================== --- branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/network/ndis/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -44,3 +44,4 @@ add_pch(ndis ${CMAKE_CURRENT_SOURCE_DIR}/include/ndissys.h ${SOURCE}) add_dependencies(ndis ndis_def psdk bugcodes buildno_header) +add_livecd_target(ndis reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/setup/blu… ============================================================================== --- branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/setup/blue/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -12,4 +12,5 @@ -lhal) add_dependencies(blue psdk bugcodes) -add_minicd_target(blue reactos blue.sys) +add_minicd_target(blue reactos blue.sys) +add_livecd_target(blue reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/storage/class/cdrom/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/class/cdrom/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/class/cdrom/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -14,4 +14,5 @@ -lhal) add_dependencies(cdrom psdk bugcodes) -add_minicd_target(cdrom reactos cdrom.sys) +add_minicd_target(cdrom reactos cdrom.sys) +add_livecd_target(cdrom reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -16,4 +16,5 @@ -lhal) add_dependencies(class2 class2_def psdk bugcodes) -add_minicd_target(class2 reactos class2.sys) +add_minicd_target(class2 reactos class2.sys) +add_livecd_target(class2 reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/storage/class/disk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/class/disk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/class/disk/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -14,4 +14,5 @@ -lhal) add_dependencies(disk psdk bugcodes) -add_minicd_target(disk reactos disk.sys) +add_minicd_target(disk reactos disk.sys) +add_livecd_target(disk reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/storage/class/ramdisk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c… ============================================================================== --- branches/cmake-bringup/drivers/storage/class/ramdisk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/class/ramdisk/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -12,4 +12,5 @@ -lhal) add_dependencies(ramdisk psdk bugcodes) -add_minicd_target(ramdisk reactos ramdisk.sys) +add_minicd_target(ramdisk reactos ramdisk.sys) +add_livecd_target(ramdisk reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/storage/floppy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/f… ============================================================================== --- branches/cmake-bringup/drivers/storage/floppy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/floppy/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -17,4 +17,5 @@ -lhal) add_dependencies(floppy psdk bugcodes buildno_header) -add_minicd_target(floppy reactos floppy.sys) +add_minicd_target(floppy reactos floppy.sys) +add_livecd_target(floppy reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/storage/ide/atapi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/i… ============================================================================== --- branches/cmake-bringup/drivers/storage/ide/atapi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/ide/atapi/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -10,4 +10,5 @@ libcntpr) add_dependencies(atapi psdk bugcodes) -add_minicd_target(atapi reactos atapi.sys) +add_minicd_target(atapi reactos atapi.sys) +add_livecd_target(atapi reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/i… ============================================================================== --- branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/ide/uniata/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -18,4 +18,5 @@ add_importlibs(uniata scsiport ntoskrnl hal) -add_minicd_target(uniata reactos uniata.sys) +add_minicd_target(uniata reactos uniata.sys) +add_livecd_target(uniata reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/p… ============================================================================== --- branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -10,4 +10,5 @@ libcntpr) add_dependencies(buslogic psdk bugcodes) -add_minicd_target(buslogic reactos buslogic.sys) +add_minicd_target(buslogic reactos buslogic.sys) +add_livecd_target(buslogic reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/s… ============================================================================== --- branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -11,4 +11,5 @@ -lhal) add_dependencies(scsiport psdk bugcodes) -add_minicd_target(scsiport reactos scsiport.sys) +add_minicd_target(scsiport reactos scsiport.sys) +add_livecd_target(scsiport reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/usb/nt4compat/usbdriver/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/nt4co… ============================================================================== --- branches/cmake-bringup/drivers/usb/nt4compat/usbdriver/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/usb/nt4compat/usbdriver/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -31,3 +31,4 @@ add_importlibs(usbdriver ntoskrnl hal) add_pch(usbdriver ${CMAKE_CURRENT_SOURCE_DIR}/usbdriver.h ${SOURCE}) add_dependencies(usbdriver psdk bugcodes) +add_livecd_target(usbdriver reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/video/displays/framebuf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/dis… ============================================================================== --- branches/cmake-bringup/drivers/video/displays/framebuf/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/displays/framebuf/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -16,3 +16,4 @@ add_importlibs(framebuf win32k) add_dependencies(framebuf framebuf_def psdk bugcodes) +add_livecd_target(framebuf reactos/system32) Modified: branches/cmake-bringup/drivers/video/displays/vga/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/dis… ============================================================================== --- branches/cmake-bringup/drivers/video/displays/vga/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/displays/vga/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -20,3 +20,4 @@ add_importlibs(vgaddi win32k) add_dependencies(vgaddi vgaddi_def psdk bugcodes) +add_livecd_target(vgaddi reactos/system32) Modified: branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/fon… ============================================================================== --- branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -19,3 +19,4 @@ libcntpr) add_dependencies(ftfd psdk) +add_livecd_target(ftfd reactos/system32) Modified: branches/cmake-bringup/drivers/video/miniport/vbe/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/min… ============================================================================== --- branches/cmake-bringup/drivers/video/miniport/vbe/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/miniport/vbe/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -8,3 +8,4 @@ add_importlibs(vbemp videoprt) add_dependencies(vbemp psdk bugcodes) +add_livecd_target(vbemp reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/video/miniport/vga/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/min… ============================================================================== --- branches/cmake-bringup/drivers/video/miniport/vga/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/miniport/vga/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -11,3 +11,4 @@ add_importlibs(vgamp videoprt) add_pch(vgamp ${CMAKE_CURRENT_SOURCE_DIR}/vgamp.h ${SOURCE}) add_dependencies(vgamp psdk bugcodes) +add_livecd_target(vgamp reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/video/miniport/vga_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/min… ============================================================================== --- branches/cmake-bringup/drivers/video/miniport/vga_new/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/miniport/vga_new/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -16,3 +16,4 @@ add_importlibs(vga videoprt) add_pch(vga ${CMAKE_CURRENT_SOURCE_DIR}/vga.h ${SOURCE}) add_dependencies(vga psdk bugcodes) +add_livecd_target(vga reactos/system32/drivers) Modified: branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/vid… ============================================================================== --- branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:46:11 2010 @@ -35,3 +35,4 @@ add_pch(videoprt ${CMAKE_CURRENT_SOURCE_DIR}/videoprt.h ${SOURCE}) add_dependencies(videoprt videoprt_def psdk bugcodes buildno_header) +add_livecd_target(videoprt reactos/system32/drivers)

1 0

[spetreolle] 49221: [CMAKE] Add win32dll modules to livecd for now. For better flexibility, this will be needed in each module file.
by spetreolle＠svn.reactos.org 22 Oct '10

22 Oct '10

Author: spetreolle Date: Fri Oct 22 13:40:02 2010 New Revision: 49221 URL: http://svn.reactos.org/svn/reactos?rev=49221&view=rev Log: [CMAKE] Add win32dll modules to livecd for now. For better flexibility, this will be needed in each module file. Modified: branches/cmake-bringup/gcc.cmake Modified: branches/cmake-bringup/gcc.cmake URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=492… ============================================================================== --- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original) +++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Fri Oct 22 13:40:02 2010 @@ -96,6 +96,8 @@ endif() if(${TYPE} MATCHES win32dll) set_entrypoint(${MODULE} DllMain@12) + # temporary, will have to be done in each dll cmake file instead + add_livecd_target(${MODULE} reactos/system32) endif() if(${TYPE} MATCHES win32ocx) set_entrypoint(${MODULE} DllMain@12)

1 0

[spetreolle] 49220: [CMAKE] Livecd : Add fonts and nls files.
by spetreolle＠svn.reactos.org 22 Oct '10

22 Oct '10

Author: spetreolle Date: Fri Oct 22 13:21:57 2010 New Revision: 49220 URL: http://svn.reactos.org/svn/reactos?rev=49220&view=rev Log: [CMAKE] Livecd : Add fonts and nls files. Added: branches/cmake-bringup/media/fonts/CMakeLists.txt (with props) branches/cmake-bringup/media/nls/CMakeLists.txt (with props) Modified: branches/cmake-bringup/media/CMakeLists.txt Modified: branches/cmake-bringup/media/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/media/CMakeLists.… ============================================================================== --- branches/cmake-bringup/media/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/media/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:21:57 2010 @@ -1,3 +1,2 @@ -add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/nls/l_intl.nls reactos l_intl.nls) -add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/nls/c_437.nls reactos c_437.nls) -add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/nls/c_1252.nls reactos c_1252.nls) +add_subdirectory(fonts) +add_subdirectory(nls) Added: branches/cmake-bringup/media/fonts/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/media/fonts/CMake… ============================================================================== --- branches/cmake-bringup/media/fonts/CMakeLists.txt (added) +++ branches/cmake-bringup/media/fonts/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:21:57 2010 @@ -1,0 +1,4 @@ +file(GLOB NLS_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.ttf") +foreach(item ${NLS_FILES}) + add_livecd("${CMAKE_CURRENT_SOURCE_DIR}/${item}" reactos/fonts ${item}) +endforeach(item) Propchange: branches/cmake-bringup/media/fonts/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Added: branches/cmake-bringup/media/nls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/media/nls/CMakeLi… ============================================================================== --- branches/cmake-bringup/media/nls/CMakeLists.txt (added) +++ branches/cmake-bringup/media/nls/CMakeLists.txt [iso-8859-1] Fri Oct 22 13:21:57 2010 @@ -1,0 +1,8 @@ +add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/l_intl.nls reactos l_intl.nls) +add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/c_437.nls reactos c_437.nls) +add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/c_1252.nls reactos c_1252.nls) + +file(GLOB NLS_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.nls") +foreach(item ${NLS_FILES}) + add_livecd("${CMAKE_CURRENT_SOURCE_DIR}/${item}" reactos/system32 ${item}) +endforeach(item) Propchange: branches/cmake-bringup/media/nls/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs