Index: drivers/storage/class/CMakeLists.txt =================================================================== --- drivers/storage/class/CMakeLists.txt (revision 55668) +++ drivers/storage/class/CMakeLists.txt (working copy) @@ -1,6 +1,6 @@ add_subdirectory(cdrom) add_subdirectory(class2) -add_subdirectory(disk) +#add_subdirectory(disk) add_subdirectory(disk_new) add_subdirectory(ramdisk) Index: drivers/storage/class/disk_new/CMakeLists.txt =================================================================== --- drivers/storage/class/disk_new/CMakeLists.txt (revision 55668) +++ drivers/storage/class/disk_new/CMakeLists.txt (working copy) @@ -1,16 +1,15 @@ include_directories(..) -add_library(disk_new SHARED data.c disk.c diskwmi.c enum.c geometry.c part.c pnp.c disk.rc) +add_library(disk SHARED data.c disk.c diskwmi.c enum.c geometry.c part.c pnp.c disk.rc) -target_link_libraries(disk_new libcntpr wdmguid) +target_link_libraries(disk libcntpr wdmguid) if(ARCH MATCHES i386) if(MSVC) - add_target_compile_flags(disk_new "/Gz") + add_target_compile_flags(disk "/Gz") else() - add_target_compile_flags(disk_new "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign") + add_target_compile_flags(disk "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign") endif() endif() -set_module_type(disk_new kernelmodedriver) -add_importlibs(disk_new classpnp ntoskrnl hal) -add_cd_file(TARGET disk_new DESTINATION reactos/system32/drivers NO_CAB FOR all) +set_module_type(disk kernelmodedriver) +add_importlibs(disk classpnp ntoskrnl hal)