From 08bb8bef3d8821b190307366ed035426b06538c4 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Thu, 4 Nov 2010 21:31:33 +0000 Subject: [PATCH] [CMAKE] - Improve the rest of the drivers. svn path=/branches/cmake-bringup/; revision=49470 --- drivers/storage/class/cdrom/CMakeLists.txt | 18 +++++++----------- drivers/storage/class/class2/CMakeLists.txt | 10 ++++------ drivers/storage/class/disk/CMakeLists.txt | 18 +++++++----------- drivers/storage/class/ramdisk/CMakeLists.txt | 14 +++++--------- drivers/storage/classpnp/CMakeLists.txt | 9 +++------ drivers/storage/floppy/CMakeLists.txt | 13 ++++--------- drivers/storage/ide/atapi/CMakeLists.txt | 12 ++++-------- drivers/storage/ide/pciide/CMakeLists.txt | 7 +++---- drivers/storage/ide/pciidex/CMakeLists.txt | 5 ++--- drivers/storage/port/buslogic/CMakeLists.txt | 12 ++++-------- drivers/storage/scsiport/CMakeLists.txt | 13 ++++--------- drivers/usb/nt4compat/usbdriver/CMakeLists.txt | 17 +++++++++-------- drivers/usb/usbd/CMakeLists.txt | 8 ++++---- drivers/video/displays/framebuf/CMakeLists.txt | 6 ++++-- .../video/displays/framebuf_new/CMakeLists.txt | 7 ++++--- drivers/video/displays/vga/CMakeLists.txt | 4 +++- drivers/video/font/bmfd/CMakeLists.txt | 4 +++- drivers/video/font/ftfd/CMakeLists.txt | 7 +++---- drivers/video/miniport/vbe/CMakeLists.txt | 7 +++---- drivers/video/miniport/vga/CMakeLists.txt | 7 +++---- drivers/video/miniport/vga_new/CMakeLists.txt | 10 ++++++---- drivers/video/miniport/vmx_svga/CMakeLists.txt | 5 ++--- drivers/video/miniport/xboxvmp/CMakeLists.txt | 5 +---- drivers/video/videoprt/CMakeLists.txt | 4 +--- .../audio/backpln/audio_test/CMakeLists.txt | 3 +-- .../wdm/audio/backpln/portcls/CMakeLists.txt | 1 - drivers/wdm/audio/drm/drmk/CMakeLists.txt | 6 +++--- .../wdm/audio/filters/kmixer/CMakeLists.txt | 3 +-- drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt | 8 ++++---- drivers/wdm/audio/sysaudio/CMakeLists.txt | 3 +-- drivers/wmi/CMakeLists.txt | 5 +++-- 31 files changed, 106 insertions(+), 145 deletions(-) diff --git a/drivers/storage/class/cdrom/CMakeLists.txt b/drivers/storage/class/cdrom/CMakeLists.txt index 6e5bf6575cc..884fcfbc204 100644 --- a/drivers/storage/class/cdrom/CMakeLists.txt +++ b/drivers/storage/class/cdrom/CMakeLists.txt @@ -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) \ No newline at end of file +add_livecd_target(cdrom reactos/system32/drivers) diff --git a/drivers/storage/class/class2/CMakeLists.txt b/drivers/storage/class/class2/CMakeLists.txt index 9714427dbf8..d41c52a5c9b 100644 --- a/drivers/storage/class/class2/CMakeLists.txt +++ b/drivers/storage/class/class2/CMakeLists.txt @@ -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) \ No newline at end of file +add_livecd_target(class2 reactos/system32/drivers) diff --git a/drivers/storage/class/disk/CMakeLists.txt b/drivers/storage/class/disk/CMakeLists.txt index 640fd5fb887..e3f89abc46f 100644 --- a/drivers/storage/class/disk/CMakeLists.txt +++ b/drivers/storage/class/disk/CMakeLists.txt @@ -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) \ No newline at end of file +add_livecd_target(disk reactos/system32/drivers) diff --git a/drivers/storage/class/ramdisk/CMakeLists.txt b/drivers/storage/class/ramdisk/CMakeLists.txt index 68f8a968b4c..6f6f1342aa8 100644 --- a/drivers/storage/class/ramdisk/CMakeLists.txt +++ b/drivers/storage/class/ramdisk/CMakeLists.txt @@ -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) \ No newline at end of file +add_livecd_target(ramdisk reactos/system32/drivers) diff --git a/drivers/storage/classpnp/CMakeLists.txt b/drivers/storage/classpnp/CMakeLists.txt index 94b7b40b645..57c6ab2c723 100644 --- a/drivers/storage/classpnp/CMakeLists.txt +++ b/drivers/storage/classpnp/CMakeLists.txt @@ -7,8 +7,7 @@ add_definitions( -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 @@ list(APPEND SOURCE 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 @@ add_library(classpnp SHARED ${SOURCE}) 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) \ No newline at end of file +add_livecd_target(classpnp reactos/system32/drivers) diff --git a/drivers/storage/floppy/CMakeLists.txt b/drivers/storage/floppy/CMakeLists.txt index 585f9fa883f..d1dcd34951c 100644 --- a/drivers/storage/floppy/CMakeLists.txt +++ b/drivers/storage/floppy/CMakeLists.txt @@ -1,6 +1,4 @@ - - add_library(floppy SHARED csqrtns.c floppy.c @@ -9,13 +7,10 @@ add_library(floppy SHARED 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) \ No newline at end of file +add_livecd_target(floppy reactos/system32/drivers) diff --git a/drivers/storage/ide/atapi/CMakeLists.txt b/drivers/storage/ide/atapi/CMakeLists.txt index 8a7f781e317..61b478aaade 100644 --- a/drivers/storage/ide/atapi/CMakeLists.txt +++ b/drivers/storage/ide/atapi/CMakeLists.txt @@ -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) \ No newline at end of file +add_livecd_target(atapi reactos/system32/drivers) diff --git a/drivers/storage/ide/pciide/CMakeLists.txt b/drivers/storage/ide/pciide/CMakeLists.txt index c44458b5754..add5953708a 100644 --- a/drivers/storage/ide/pciide/CMakeLists.txt +++ b/drivers/storage/ide/pciide/CMakeLists.txt @@ -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_dependencies(pciide psdk bugcodes) -add_cab_target(pciide 2) \ No newline at end of file + +add_cab_target(pciide 2) diff --git a/drivers/storage/ide/pciidex/CMakeLists.txt b/drivers/storage/ide/pciidex/CMakeLists.txt index e66eac163df..852e44db688 100644 --- a/drivers/storage/ide/pciidex/CMakeLists.txt +++ b/drivers/storage/ide/pciidex/CMakeLists.txt @@ -10,8 +10,7 @@ add_library(pciidex SHARED 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_dependencies(pciidex psdk bugcodes) + add_cab_target(pciidex 2) diff --git a/drivers/storage/port/buslogic/CMakeLists.txt b/drivers/storage/port/buslogic/CMakeLists.txt index 2693a814ba0..a3199e208e7 100644 --- a/drivers/storage/port/buslogic/CMakeLists.txt +++ b/drivers/storage/port/buslogic/CMakeLists.txt @@ -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) \ No newline at end of file +add_livecd_target(buslogic reactos/system32/drivers) diff --git a/drivers/storage/scsiport/CMakeLists.txt b/drivers/storage/scsiport/CMakeLists.txt index d68bfe3a26c..b6ee1c9df62 100644 --- a/drivers/storage/scsiport/CMakeLists.txt +++ b/drivers/storage/scsiport/CMakeLists.txt @@ -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) \ No newline at end of file +add_livecd_target(scsiport reactos/system32/drivers) diff --git a/drivers/usb/nt4compat/usbdriver/CMakeLists.txt b/drivers/usb/nt4compat/usbdriver/CMakeLists.txt index 0f2644f84e7..aa8511b9cb4 100644 --- a/drivers/usb/nt4compat/usbdriver/CMakeLists.txt +++ b/drivers/usb/nt4compat/usbdriver/CMakeLists.txt @@ -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 @@ list(APPEND SOURCE 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_pch(usbdriver ${CMAKE_CURRENT_SOURCE_DIR}/usbdriver.h ${SOURCE}) -add_dependencies(usbdriver psdk bugcodes) -add_cab_target(usbdriver 2) \ No newline at end of file + +add_cab_target(usbdriver 2) diff --git a/drivers/usb/usbd/CMakeLists.txt b/drivers/usb/usbd/CMakeLists.txt index af7d4c83fd2..a25decd9292 100644 --- a/drivers/usb/usbd/CMakeLists.txt +++ b/drivers/usb/usbd/CMakeLists.txt @@ -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) diff --git a/drivers/video/displays/framebuf/CMakeLists.txt b/drivers/video/displays/framebuf/CMakeLists.txt index cfb22a401cf..29e27c30128 100644 --- a/drivers/video/displays/framebuf/CMakeLists.txt +++ b/drivers/video/displays/framebuf/CMakeLists.txt @@ -10,8 +10,10 @@ add_library(framebuf SHARED 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) \ No newline at end of file +add_cab_target(framebuf 1) diff --git a/drivers/video/displays/framebuf_new/CMakeLists.txt b/drivers/video/displays/framebuf_new/CMakeLists.txt index 253c090ee9c..005b5bf23c8 100644 --- a/drivers/video/displays/framebuf_new/CMakeLists.txt +++ b/drivers/video/displays/framebuf_new/CMakeLists.txt @@ -13,13 +13,14 @@ list(APPEND SOURCE 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) diff --git a/drivers/video/displays/vga/CMakeLists.txt b/drivers/video/displays/vga/CMakeLists.txt index bf6d8b31a7c..6173c5f6213 100644 --- a/drivers/video/displays/vga/CMakeLists.txt +++ b/drivers/video/displays/vga/CMakeLists.txt @@ -15,7 +15,9 @@ add_library(vgaddi SHARED 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) diff --git a/drivers/video/font/bmfd/CMakeLists.txt b/drivers/video/font/bmfd/CMakeLists.txt index d25785e70da..9645669efeb 100644 --- a/drivers/video/font/bmfd/CMakeLists.txt +++ b/drivers/video/font/bmfd/CMakeLists.txt @@ -4,7 +4,9 @@ add_library(bmfd SHARED 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) diff --git a/drivers/video/font/ftfd/CMakeLists.txt b/drivers/video/font/ftfd/CMakeLists.txt index 43fdcdab3ca..1e28a4baec2 100644 --- a/drivers/video/font/ftfd/CMakeLists.txt +++ b/drivers/video/font/ftfd/CMakeLists.txt @@ -1,6 +1,4 @@ - - include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/freetype/include) add_library(ftfd SHARED @@ -10,13 +8,14 @@ add_library(ftfd SHARED 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) \ No newline at end of file diff --git a/drivers/video/miniport/vbe/CMakeLists.txt b/drivers/video/miniport/vbe/CMakeLists.txt index a4606cfe107..b60284e364b 100644 --- a/drivers/video/miniport/vbe/CMakeLists.txt +++ b/drivers/video/miniport/vbe/CMakeLists.txt @@ -4,8 +4,7 @@ add_library(vbemp SHARED 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_dependencies(vbemp psdk bugcodes) -add_cab_target(vbemp 2) \ No newline at end of file + +add_cab_target(vbemp 2) diff --git a/drivers/video/miniport/vga/CMakeLists.txt b/drivers/video/miniport/vga/CMakeLists.txt index 10c1f75efed..b002947d8a0 100644 --- a/drivers/video/miniport/vga/CMakeLists.txt +++ b/drivers/video/miniport/vga/CMakeLists.txt @@ -6,9 +6,8 @@ list(APPEND SOURCE 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_pch(vgamp ${CMAKE_CURRENT_SOURCE_DIR}/vgamp.h ${SOURCE}) -add_dependencies(vgamp psdk bugcodes) -add_cab_target(vgamp 2) \ No newline at end of file +add_cab_target(vgamp 2) diff --git a/drivers/video/miniport/vga_new/CMakeLists.txt b/drivers/video/miniport/vga_new/CMakeLists.txt index 37249a5774c..e57502a7ea3 100644 --- a/drivers/video/miniport/vga_new/CMakeLists.txt +++ b/drivers/video/miniport/vga_new/CMakeLists.txt @@ -9,11 +9,13 @@ list(APPEND SOURCE 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) \ No newline at end of file + +add_cab_target(vga 2) diff --git a/drivers/video/miniport/vmx_svga/CMakeLists.txt b/drivers/video/miniport/vmx_svga/CMakeLists.txt index 7d93a6025dc..056fe513f51 100644 --- a/drivers/video/miniport/vmx_svga/CMakeLists.txt +++ b/drivers/video/miniport/vmx_svga/CMakeLists.txt @@ -3,8 +3,7 @@ list(APPEND SOURCE vmx_svga.c vmx_svga.rc) 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_pch(vmx_svga ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE}) -add_dependencies(vmx_svga psdk bugcodes) diff --git a/drivers/video/miniport/xboxvmp/CMakeLists.txt b/drivers/video/miniport/xboxvmp/CMakeLists.txt index a0127162da3..b42841a53ad 100644 --- a/drivers/video/miniport/xboxvmp/CMakeLists.txt +++ b/drivers/video/miniport/xboxvmp/CMakeLists.txt @@ -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) diff --git a/drivers/video/videoprt/CMakeLists.txt b/drivers/video/videoprt/CMakeLists.txt index 51b7e7c802b..54a52de4642 100644 --- a/drivers/video/videoprt/CMakeLists.txt +++ b/drivers/video/videoprt/CMakeLists.txt @@ -26,9 +26,7 @@ list(APPEND SOURCE 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) \ No newline at end of file +add_cab_target(videoprt 2) diff --git a/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt b/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt index f71c21ab311..ec4b43a546d 100644 --- a/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt +++ b/drivers/wdm/audio/backpln/audio_test/CMakeLists.txt @@ -10,8 +10,7 @@ add_executable(audio_test audio_test.c) 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) diff --git a/drivers/wdm/audio/backpln/portcls/CMakeLists.txt b/drivers/wdm/audio/backpln/portcls/CMakeLists.txt index dbe1a6f9e33..37fd7de50b0 100644 --- a/drivers/wdm/audio/backpln/portcls/CMakeLists.txt +++ b/drivers/wdm/audio/backpln/portcls/CMakeLists.txt @@ -62,4 +62,3 @@ endif(MSVC) set_module_type(portcls kernelmodedriver) add_importlibs(portcls ntoskrnl ks drmk hal stdc++ gcc msvcrt) -add_dependencies(portcls psdk bugcodes) diff --git a/drivers/wdm/audio/drm/drmk/CMakeLists.txt b/drivers/wdm/audio/drm/drmk/CMakeLists.txt index 254e6486a87..66272193fd9 100644 --- a/drivers/wdm/audio/drm/drmk/CMakeLists.txt +++ b/drivers/wdm/audio/drm/drmk/CMakeLists.txt @@ -3,10 +3,10 @@ add_definitions(-DBUILDING_DRMK) 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) diff --git a/drivers/wdm/audio/filters/kmixer/CMakeLists.txt b/drivers/wdm/audio/filters/kmixer/CMakeLists.txt index 923275e8d6a..5460f445d61 100644 --- a/drivers/wdm/audio/filters/kmixer/CMakeLists.txt +++ b/drivers/wdm/audio/filters/kmixer/CMakeLists.txt @@ -6,11 +6,10 @@ add_library(kmixer SHARED 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) diff --git a/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt b/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt index 4c4b2c34ddf..59f04bd7527 100644 --- a/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt +++ b/drivers/wdm/audio/legacy/wdmaud/CMakeLists.txt @@ -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 @@ add_library(wdmaud SHARED 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 @@ target_link_libraries(wdmaud ${PSEH_LIB}) add_importlibs(wdmaud ntoskrnl ks hal) -add_dependencies(wdmaud psdk bugcodes) diff --git a/drivers/wdm/audio/sysaudio/CMakeLists.txt b/drivers/wdm/audio/sysaudio/CMakeLists.txt index 3d1ab997619..162aa29b9a3 100644 --- a/drivers/wdm/audio/sysaudio/CMakeLists.txt +++ b/drivers/wdm/audio/sysaudio/CMakeLists.txt @@ -9,9 +9,8 @@ add_library(sysaudio SHARED 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) diff --git a/drivers/wmi/CMakeLists.txt b/drivers/wmi/CMakeLists.txt index defe2867af1..2cdacfbc074 100644 --- a/drivers/wmi/CMakeLists.txt +++ b/drivers/wmi/CMakeLists.txt @@ -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)