Author: akhaldi Date: Thu Nov 4 21:31:33 2010 New Revision: 49470
URL: http://svn.reactos.org/svn/reactos?rev=49470&view=rev Log: [CMAKE] - Improve the rest of the drivers.
Modified: 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/classpnp/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/pciide/CMakeLists.txt branches/cmake-bringup/drivers/storage/ide/pciidex/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/usb/usbd/CMakeLists.txt branches/cmake-bringup/drivers/video/displays/framebuf/CMakeLists.txt branches/cmake-bringup/drivers/video/displays/framebuf_new/CMakeLists.txt branches/cmake-bringup/drivers/video/displays/vga/CMakeLists.txt branches/cmake-bringup/drivers/video/font/bmfd/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/miniport/vmx_svga/CMakeLists.txt branches/cmake-bringup/drivers/video/miniport/xboxvmp/CMakeLists.txt branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/filters/kmixer/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt branches/cmake-bringup/drivers/wdm/audio/sysaudio/CMakeLists.txt branches/cmake-bringup/drivers/wmi/CMakeLists.txt
Modified: branches/cmake-bringup/drivers/storage/class/cdrom/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/cl... ============================================================================== --- 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] Thu Nov 4 21:31:33 2010 @@ -1,18 +1,14 @@ - -
include_directories(..)
add_library(cdrom SHARED cdrom.c findscsi.c cdrom.rc)
-set_target_properties(cdrom PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(cdrom kernelmodedriver) +add_importlibs(cdrom + class2 + scsiport + ntoskrnl + hal)
-target_link_libraries(cdrom - -lclass2 - -lscsiport - -lntoskrnl - -lhal) - -add_dependencies(cdrom psdk bugcodes) add_minicd_target(cdrom reactos cdrom.sys) -add_livecd_target(cdrom reactos/system32/drivers) +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/cl... ============================================================================== --- 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] Thu Nov 4 21:31:33 2010 @@ -1,17 +1,15 @@ - -
include_directories(..)
spec2def(class2.sys class2.spec)
-add_library(class2 SHARED class2.c class2.rc +add_library(class2 SHARED + class2.c + class2.rc ${CMAKE_CURRENT_BINARY_DIR}/class2.def)
set_module_type(class2 kernelmodedriver) - add_importlibs(class2 scsiport ntoskrnl hal)
-add_dependencies(class2 psdk bugcodes) add_minicd_target(class2 reactos class2.sys) -add_livecd_target(class2 reactos/system32/drivers) +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/cl... ============================================================================== --- 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] Thu Nov 4 21:31:33 2010 @@ -1,18 +1,14 @@ - -
include_directories(..)
add_library(disk SHARED disk.c disk.rc)
-set_target_properties(disk PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(disk kernelmodedriver) +add_importlibs(disk + class2 + scsiport + ntoskrnl + hal)
-target_link_libraries(disk - -lclass2 - -lscsiport - -lntoskrnl - -lhal) - -add_dependencies(disk psdk bugcodes) add_minicd_target(disk reactos disk.sys) -add_livecd_target(disk reactos/system32/drivers) +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/cl... ============================================================================== --- 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] Thu Nov 4 21:31:33 2010 @@ -1,16 +1,12 @@ - -
include_directories(..)
add_library(ramdisk SHARED ramdisk.c ramdisk.rc)
-set_target_properties(ramdisk PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(ramdisk kernelmodedriver) +add_importlibs(ramdisk + ntoskrnl + hal)
-target_link_libraries(ramdisk - -lntoskrnl - -lhal) - -add_dependencies(ramdisk psdk bugcodes) add_minicd_target(ramdisk reactos ramdisk.sys) -add_livecd_target(ramdisk reactos/system32/drivers) +add_livecd_target(ramdisk reactos/system32/drivers)
Modified: branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/cl... ============================================================================== --- branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/classpnp/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -7,8 +7,7 @@ -DCLASS_GLOBAL_USE_DELAYED_RETRY=1 -DCLASS_GLOBAL_BUFFERED_DEBUG_PRINT=0 -DCLASS_GLOBAL_BUFFERED_DEBUG_PRINT_BUFFER_SIZE=512 - -DCLASS_GLOBAL_BUFFERED_DEBUG_PRINT_BUFFERS=512 -) + -DCLASS_GLOBAL_BUFFERED_DEBUG_PRINT_BUFFERS=512)
if(NOT MSVC) add_definitions(-mrtd -fno-builtin -w) @@ -30,8 +29,7 @@ utils.c xferpkt.c class.rc - ${CMAKE_CURRENT_BINARY_DIR}/class.def -) + ${CMAKE_CURRENT_BINARY_DIR}/class.def)
spec2def(classpnp.sys class.spec)
@@ -39,8 +37,7 @@ target_link_libraries(classpnp ${PSEH_LIB} libcntpr)
set_module_type(classpnp kernelmodedriver) - add_importlibs(classpnp hal ntoskrnl)
add_minicd_target(classpnp reactos classpnp.sys) -add_livecd_target(classpnp reactos/system32/drivers) +add_livecd_target(classpnp reactos/system32/drivers)
Modified: branches/cmake-bringup/drivers/storage/floppy/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/fl... ============================================================================== --- branches/cmake-bringup/drivers/storage/floppy/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/floppy/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -1,5 +1,3 @@ - -
add_library(floppy SHARED csqrtns.c @@ -9,13 +7,10 @@ readwrite.c floppy.rc)
-set_target_properties(floppy PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +target_link_libraries(floppy csq)
-target_link_libraries(floppy - csq - -lntoskrnl - -lhal) +set_module_type(floppy kernelmodedriver) +add_importlibs(floppy hal ntoskrnl)
-add_dependencies(floppy psdk bugcodes buildno_header) add_minicd_target(floppy reactos floppy.sys) -add_livecd_target(floppy reactos/system32/drivers) +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/id... ============================================================================== --- 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] Thu Nov 4 21:31:33 2010 @@ -1,14 +1,10 @@ - -
add_library(atapi SHARED atapi.c atapi.rc)
-set_target_properties(atapi PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +target_link_libraries(atapi libcntpr)
-target_link_libraries(atapi - -lscsiport - libcntpr) +set_module_type(atapi kernelmodedriver) +add_importlibs(atapi scsiport)
-add_dependencies(atapi psdk bugcodes) add_minicd_target(atapi reactos atapi.sys) -add_livecd_target(atapi reactos/system32/drivers) +add_livecd_target(atapi reactos/system32/drivers)
Modified: branches/cmake-bringup/drivers/storage/ide/pciide/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/id... ============================================================================== --- branches/cmake-bringup/drivers/storage/ide/pciide/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/ide/pciide/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -1,8 +1,7 @@
add_library(pciide SHARED pciide.c pciide.rc)
-set_target_properties(pciide PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(pciide kernelmodedriver) +add_importlibs(pciide pciidex ntoskrnl)
-add_importlibs(pciide pciidex ntoskrnl) -add_dependencies(pciide psdk bugcodes) -add_cab_target(pciide 2) +add_cab_target(pciide 2)
Modified: branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/id... ============================================================================== --- branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/ide/pciidex/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -10,8 +10,7 @@ pciidex.rc ${CMAKE_CURRENT_BINARY_DIR}/pciidex.def)
-set_target_properties(pciidex PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(pciidex kernelmodedriver) +add_importlibs(pciidex ntoskrnl)
-add_importlibs(pciidex ntoskrnl) -add_dependencies(pciidex psdk bugcodes) add_cab_target(pciidex 2)
Modified: branches/cmake-bringup/drivers/storage/port/buslogic/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/po... ============================================================================== --- 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] Thu Nov 4 21:31:33 2010 @@ -1,14 +1,10 @@ - -
add_library(buslogic SHARED BusLogic958.c BusLogic958.rc)
-set_target_properties(buslogic PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +target_link_libraries(buslogic libcntpr)
-target_link_libraries(buslogic - -lscsiport - libcntpr) +set_module_type(buslogic kernelmodedriver) +add_importlibs(buslogic scsiport)
-add_dependencies(buslogic psdk bugcodes) add_minicd_target(buslogic reactos buslogic.sys) -add_livecd_target(buslogic reactos/system32/drivers) +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/sc... ============================================================================== --- branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/storage/scsiport/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -1,15 +1,10 @@ - -
add_library(scsiport SHARED scsiport.c stubs.c scsiport.rc)
-set_target_properties(scsiport PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols" SUFFIX ".sys") +target_link_libraries(scsiport ${CMAKE_CURRENT_SOURCE_DIR}/scsiport_i386.def)
-target_link_libraries(scsiport - ${CMAKE_CURRENT_SOURCE_DIR}/scsiport_i386.def - -lntoskrnl - -lhal) +set_module_type(scsiport kernelmodedriver) +add_importlibs(scsiport ntoskrnl hal)
-add_dependencies(scsiport psdk bugcodes) add_minicd_target(scsiport reactos scsiport.sys) -add_livecd_target(scsiport reactos/system32/drivers) +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/nt4com... ============================================================================== --- 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] Thu Nov 4 21:31:33 2010 @@ -1,8 +1,9 @@
-add_definitions(-DINCLUDE_EHCI) -add_definitions(-D_MULTI_UHCI) -add_definitions(-D_MULTI_EHCI) -add_definitions(-D_X86) +add_definitions( + -DINCLUDE_EHCI + -D_MULTI_UHCI + -D_MULTI_EHCI + -D_X86)
list(APPEND SOURCE ehci.c @@ -26,9 +27,9 @@
add_library(usbdriver SHARED ${CMAKE_CURRENT_BINARY_DIR}/usbdriver_usbdriver.h.gch ${SOURCE})
-set_target_properties(usbdriver PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(usbdriver kernelmodedriver) +add_importlibs(usbdriver ntoskrnl hal)
-add_importlibs(usbdriver ntoskrnl hal) add_pch(usbdriver ${CMAKE_CURRENT_SOURCE_DIR}/usbdriver.h ${SOURCE}) -add_dependencies(usbdriver psdk bugcodes) -add_cab_target(usbdriver 2) + +add_cab_target(usbdriver 2)
Modified: branches/cmake-bringup/drivers/usb/usbd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/usb/usbd/C... ============================================================================== --- branches/cmake-bringup/drivers/usb/usbd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/usb/usbd/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -1,10 +1,10 @@
spec2def(usbd.sys usbd.spec)
-add_library(usbd SHARED usbd.c usbd.rc +add_library(usbd SHARED + usbd.c + usbd.rc ${CMAKE_CURRENT_BINARY_DIR}/usbd.def)
-set_target_properties(usbd PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" SUFFIX ".sys") - +set_module_type(usbd kernelmodedriver) add_importlibs(usbd ntoskrnl hal) -add_dependencies(usbd psdk bugcodes)
Modified: branches/cmake-bringup/drivers/video/displays/framebuf/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/disp... ============================================================================== --- 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] Thu Nov 4 21:31:33 2010 @@ -10,8 +10,10 @@ framebuf.rc ${CMAKE_CURRENT_BINARY_DIR}/framebuf.def)
-set_target_properties(framebuf PROPERTIES LINK_FLAGS "-Wl,-entry,_DrvEnableDriver@12 -Wl,--image-base,0x00010000 -Wl,--subsystem,native") +set_entrypoint(framebuf DrvEnableDriver@12) +set_subsystem(framebuf native) +set_image_base(framebuf 0x00010000)
add_importlibs(framebuf win32k) add_dependencies(framebuf psdk bugcodes) -add_cab_target(framebuf 1) +add_cab_target(framebuf 1)
Modified: branches/cmake-bringup/drivers/video/displays/framebuf_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/disp... ============================================================================== --- branches/cmake-bringup/drivers/video/displays/framebuf_new/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/displays/framebuf_new/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -13,13 +13,14 @@ add_library(framebuf_new SHARED ${CMAKE_CURRENT_BINARY_DIR}/framebuf_new_driver.h.gch ${SOURCE})
if(ARCH MATCHES i386) - if(MSVC) - else() + if(NOT MSVC) set_target_properties(framebuf_new PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin") endif() endif()
-set_target_properties(framebuf_new PROPERTIES LINK_FLAGS "-Wl,-entry,_DrvEnableDriver@12 -Wl,--image-base,0x00010000 -Wl,--subsystem,native") +set_entrypoint(framebuf_new DrvEnableDriver@12) +set_subsystem(framebuf_new native) +set_image_base(framebuf_new 0x00010000)
target_link_libraries(framebuf_new libcntpr)
Modified: branches/cmake-bringup/drivers/video/displays/vga/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/disp... ============================================================================== --- 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] Thu Nov 4 21:31:33 2010 @@ -15,7 +15,9 @@ vgaddi.rc ${CMAKE_CURRENT_BINARY_DIR}/vgaddi.def)
-set_target_properties(vgaddi PROPERTIES LINK_FLAGS "-Wl,-entry,_DrvEnableDriver@12 -Wl,--subsystem,native -Wl,--image-base,0x00010000") +set_entrypoint(vgaddi DrvEnableDriver@12) +set_subsystem(vgaddi native) +set_image_base(vgaddi 0x00010000)
add_importlibs(vgaddi win32k) add_dependencies(vgaddi psdk bugcodes)
Modified: branches/cmake-bringup/drivers/video/font/bmfd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/font... ============================================================================== --- branches/cmake-bringup/drivers/video/font/bmfd/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/font/bmfd/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -4,7 +4,9 @@ font.c glyph.c)
-set_target_properties(bmfd PROPERTIES LINK_FLAGS "-Wl,-entry,_BmfdEnableDriver@12 -Wl,--subsystem,native -Wl,--image-base,0x00010000") +set_entrypoint(bmfd BmfdEnableDriver@12) +set_subsystem(bmfd native) +set_image_base(bmfd 0x00010000)
target_link_libraries(bmfd libcntpr)
Modified: branches/cmake-bringup/drivers/video/font/ftfd/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/font... ============================================================================== --- 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] Thu Nov 4 21:31:33 2010 @@ -1,5 +1,3 @@ - -
include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/include)
@@ -10,13 +8,14 @@ rosglue.c sprintf.c)
-set_target_properties(ftfd PROPERTIES LINK_FLAGS "-Wl,-entry,_FtfdEnableDriver@12 -Wl,--subsystem,native") +set_entrypoint(ftfd FtfdEnableDriver@12) +set_subsystem(ftfd native)
target_link_libraries(ftfd ${CMAKE_CURRENT_SOURCE_DIR}/freetype.def - -lwin32k freetype libcntpr)
+add_importlibs(ftfd win32k) add_dependencies(ftfd psdk) add_cab_target(ftfd 1)
Modified: branches/cmake-bringup/drivers/video/miniport/vbe/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/mini... ============================================================================== --- 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] Thu Nov 4 21:31:33 2010 @@ -4,8 +4,7 @@ vbemp.c vbemp.rc)
-set_target_properties(vbemp PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native -Wl,--exclude-all-symbols" SUFFIX ".sys") +set_module_type(vbemp kernelmodedriver) +add_importlibs(vbemp videoprt)
-add_importlibs(vbemp videoprt) -add_dependencies(vbemp psdk bugcodes) -add_cab_target(vbemp 2) +add_cab_target(vbemp 2)
Modified: branches/cmake-bringup/drivers/video/miniport/vga/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/mini... ============================================================================== --- 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] Thu Nov 4 21:31:33 2010 @@ -6,9 +6,8 @@
add_library(vgamp SHARED ${CMAKE_CURRENT_BINARY_DIR}/vgamp_vgamp.h.gch ${SOURCE})
-set_target_properties(vgamp PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native -Wl,--exclude-all-symbols" SUFFIX ".sys") +set_module_type(vgamp kernelmodedriver) +add_importlibs(vgamp videoprt)
-add_importlibs(vgamp videoprt) add_pch(vgamp ${CMAKE_CURRENT_SOURCE_DIR}/vgamp.h ${SOURCE}) -add_dependencies(vgamp psdk bugcodes) -add_cab_target(vgamp 2) +add_cab_target(vgamp 2)
Modified: branches/cmake-bringup/drivers/video/miniport/vga_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/mini... ============================================================================== --- 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] Thu Nov 4 21:31:33 2010 @@ -9,11 +9,13 @@
add_library(vga SHARED ${CMAKE_CURRENT_BINARY_DIR}/vga_vga.h.gch ${SOURCE})
-set_target_properties(vga PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin" LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native -Wl,--exclude-all-symbols" SUFFIX ".sys") - target_link_libraries(vga libcntpr)
+set_target_properties(vga PROPERTIES COMPILE_FLAGS "-mrtd -fno-builtin") + +set_module_type(vga kernelmodedriver) add_importlibs(vga videoprt) + add_pch(vga ${CMAKE_CURRENT_SOURCE_DIR}/vga.h ${SOURCE}) -add_dependencies(vga psdk bugcodes) -add_cab_target(vga 2) + +add_cab_target(vga 2)
Modified: branches/cmake-bringup/drivers/video/miniport/vmx_svga/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/mini... ============================================================================== --- branches/cmake-bringup/drivers/video/miniport/vmx_svga/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/miniport/vmx_svga/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -3,8 +3,7 @@
add_library(vmx_svga SHARED ${CMAKE_CURRENT_BINARY_DIR}/vmx_svga_precomp.h.gch ${SOURCE})
-set_target_properties(vmx_svga PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native -Wl,--exclude-all-symbols" SUFFIX ".sys") +set_module_type(vmx_svga kernelmodedriver) +add_importlibs(vmx_svga ntoskrnl videoprt)
-add_importlibs(vmx_svga ntoskrnl videoprt) add_pch(vmx_svga ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_dependencies(vmx_svga psdk bugcodes)
Modified: branches/cmake-bringup/drivers/video/miniport/xboxvmp/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/mini... ============================================================================== --- branches/cmake-bringup/drivers/video/miniport/xboxvmp/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/miniport/xboxvmp/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -1,7 +1,4 @@
add_library(xboxvmp SHARED xboxvmp.c xboxvmp.rc) - -set_target_properties(xboxvmp PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native -Wl,--exclude-all-symbols" SUFFIX ".sys") - +set_module_type(xboxvmp kernelmodedriver) add_importlibs(xboxvmp ntoskrnl videoprt) -add_dependencies(xboxvmp psdk bugcodes)
Modified: branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/video/vide... ============================================================================== --- branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/video/videoprt/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -26,9 +26,7 @@ add_library(videoprt SHARED ${CMAKE_CURRENT_BINARY_DIR}/videoprt_videoprt.h.gch ${SOURCE})
set_module_type(videoprt kernelmodedriver) - add_importlibs(videoprt ntoskrnl hal)
add_pch(videoprt ${CMAKE_CURRENT_SOURCE_DIR}/videoprt.h ${SOURCE}) -add_dependencies(videoprt psdk bugcodes buildno_header) -add_cab_target(videoprt 2) +add_cab_target(videoprt 2)
Modified: branches/cmake-bringup/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio/... ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -10,8 +10,7 @@
set_module_type(audio_test win32cui)
-target_link_libraries(audio_test - libsamplerate) +target_link_libraries(audio_test libsamplerate)
add_importlibs(audio_test setupapi ksuser msvcrt kernel32) add_dependencies(audio_test bugcodes)
Modified: branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio/... ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/backpln/portcls/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -62,4 +62,3 @@ set_module_type(portcls kernelmodedriver)
add_importlibs(portcls ntoskrnl ks drmk hal stdc++ gcc msvcrt) -add_dependencies(portcls psdk bugcodes)
Modified: branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio/... ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/drm/drmk/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -3,10 +3,10 @@
spec2def(drmk.sys drmk.spec)
-add_library(drmk SHARED stubs.cpp drmk.rc +add_library(drmk SHARED + stubs.cpp + drmk.rc ${CMAKE_CURRENT_BINARY_DIR}/drmk.def)
set_module_type(drmk kernelmodedriver) - add_importlibs(drmk ntoskrnl) -add_dependencies(drmk psdk bugcodes)
Modified: branches/cmake-bringup/drivers/wdm/audio/filters/kmixer/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio/... ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/filters/kmixer/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/filters/kmixer/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -6,11 +6,10 @@ filter.c pin.c)
-set_target_properties(kmixer PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(kmixer kernelmodedriver)
target_link_libraries(kmixer libcntpr libsamplerate)
add_importlibs(kmixer ntoskrnl ks hal) -add_dependencies(kmixer psdk bugcodes)
Modified: branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio/... ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -1,8 +1,9 @@
add_definitions(-D_COMDDK_)
-include_directories(${REACTOS_SOURCE_DIR}/lib/drivers/sound/mmixer) -include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/sound) +include_directories( + ${REACTOS_SOURCE_DIR}/lib/drivers/sound/mmixer + ${REACTOS_SOURCE_DIR}/include/reactos/libs/sound)
add_library(wdmaud SHARED control.c @@ -12,7 +13,7 @@ sup.c wdmaud.rc)
-set_target_properties(wdmaud PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(wdmaud kernelmodedriver)
target_link_libraries(wdmaud mmixer @@ -20,4 +21,3 @@ ${PSEH_LIB})
add_importlibs(wdmaud ntoskrnl ks hal) -add_dependencies(wdmaud psdk bugcodes)
Modified: branches/cmake-bringup/drivers/wdm/audio/sysaudio/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wdm/audio/... ============================================================================== --- branches/cmake-bringup/drivers/wdm/audio/sysaudio/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wdm/audio/sysaudio/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -9,9 +9,8 @@ pin.c sysaudio.rc)
-set_target_properties(sysaudio PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") +set_module_type(sysaudio kernelmodedriver)
target_link_libraries(sysaudio libcntpr)
add_importlibs(sysaudio ntoskrnl ks hal) -add_dependencies(sysaudio psdk bugcodes)
Modified: branches/cmake-bringup/drivers/wmi/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/wmi/CMakeL... ============================================================================== --- branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/drivers/wmi/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:31:33 2010 @@ -1,9 +1,10 @@
spec2def(wmilib.sys wmilib.spec)
-add_library(wmilib SHARED wmilib.c wmilib.rc +add_library(wmilib SHARED + wmilib.c + wmilib.rc ${CMAKE_CURRENT_BINARY_DIR}/wmilib.def)
set_module_type(wmilib kernelmodedriver) - add_importlibs(wmilib ntoskrnl)