From 9abab8be5eb96c572a3cf16000112f7cfb3af7ba Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Gardou?= Date: Mon, 1 Nov 2010 00:54:15 +0000 Subject: [PATCH] [CMAKE] - add sermouse and kbdfr to live and boot cd - improve kbdclass, mouclass and i8042prt build files svn path=/branches/cmake-bringup/; revision=49390 --- dll/keyboard/kbdfr/CMakeLists.txt | 4 ++-- drivers/input/i8042prt/CMakeLists.txt | 7 ++----- drivers/input/kbdclass/CMakeLists.txt | 10 ++++------ drivers/input/mouclass/CMakeLists.txt | 10 ++++------ drivers/input/sermouse/CMakeLists.txt | 2 ++ 5 files changed, 14 insertions(+), 19 deletions(-) diff --git a/dll/keyboard/kbdfr/CMakeLists.txt b/dll/keyboard/kbdfr/CMakeLists.txt index 2b844a9e4e6..60f10e0b415 100644 --- a/dll/keyboard/kbdfr/CMakeLists.txt +++ b/dll/keyboard/kbdfr/CMakeLists.txt @@ -7,6 +7,6 @@ add_library(kbdfr SHARED kbdfr.c kbdfr.rc ${CMAKE_CURRENT_BINARY_DIR}/kbdfr.def) set_entrypoint(kbdfr 0) - - add_dependencies(kbdfr psdk buildno_header) + +add_cab_target(kbdfr 1) diff --git a/drivers/input/i8042prt/CMakeLists.txt b/drivers/input/i8042prt/CMakeLists.txt index 3fc39a3c91e..1dba31a15cb 100644 --- a/drivers/input/i8042prt/CMakeLists.txt +++ b/drivers/input/i8042prt/CMakeLists.txt @@ -14,12 +14,9 @@ add_library(i8042prt SHARED setup.c i8042prt.rc) -set_target_properties(i8042prt PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols" SUFFIX ".sys") +set_module_type(i8042prt kernelmodedriver) -target_link_libraries(i8042prt - -lntoskrnl - -lhal) +add_importlibs(i8042prt ntoskrnl hal) -add_dependencies(i8042prt psdk bugcodes) add_minicd_target(i8042prt reactos i8042prt.sys) add_livecd_target(i8042prt reactos/system32/drivers) \ No newline at end of file diff --git a/drivers/input/kbdclass/CMakeLists.txt b/drivers/input/kbdclass/CMakeLists.txt index 7697f67ac70..f400c1c62b7 100644 --- a/drivers/input/kbdclass/CMakeLists.txt +++ b/drivers/input/kbdclass/CMakeLists.txt @@ -7,13 +7,11 @@ add_library(kbdclass SHARED setup.c kbdclass.rc) -set_target_properties(kbdclass PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols" SUFFIX ".sys") +set_module_type(kbdclass kernelmodedriver) -target_link_libraries(kbdclass - pseh - -lntoskrnl - -lhal) +target_link_libraries(kbdclass pseh) + +add_importlibs(kbdclass ntoskrnl hal) -add_dependencies(kbdclass psdk bugcodes) add_minicd_target(kbdclass reactos kbdclass.sys) add_livecd_target(kbdclass reactos/system32/drivers) \ No newline at end of file diff --git a/drivers/input/mouclass/CMakeLists.txt b/drivers/input/mouclass/CMakeLists.txt index 22511e23f89..eb027257a3e 100644 --- a/drivers/input/mouclass/CMakeLists.txt +++ b/drivers/input/mouclass/CMakeLists.txt @@ -6,12 +6,10 @@ add_library(mouclass SHARED mouclass.c mouclass.rc) -set_target_properties(mouclass PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols" SUFFIX ".sys") +set_module_type(mouclass kernelmodedriver) -target_link_libraries(mouclass - pseh - -lntoskrnl - -lhal) +target_link_libraries(mouclass pseh) + +add_importlibs(mouclass ntoskrnl hal) -add_dependencies(mouclass psdk bugcodes) add_cab_target(mouclass 2) \ No newline at end of file diff --git a/drivers/input/sermouse/CMakeLists.txt b/drivers/input/sermouse/CMakeLists.txt index 208d8585246..b1b8f241c2b 100644 --- a/drivers/input/sermouse/CMakeLists.txt +++ b/drivers/input/sermouse/CMakeLists.txt @@ -18,3 +18,5 @@ target_link_libraries(sermouse -lhal) add_dependencies(sermouse psdk bugcodes) + +add_cab_target(sermouse 2) -- 2.17.1