[ros-diffs] [jgardou] 49390: [CMAKE] - add sermouse and kbdfr to live and boot cd - improve kbdclass, mouclass and i8042prt build files

jgardou at svn.reactos.org jgardou at svn.reactos.org
Mon Nov 1 00:54:16 UTC 2010


Author: jgardou
Date: Mon Nov  1 00:54:15 2010
New Revision: 49390

URL: http://svn.reactos.org/svn/reactos?rev=49390&view=rev
Log:
[CMAKE]
  - add sermouse and kbdfr to live and boot cd
  - improve kbdclass, mouclass and i8042prt build files

Modified:
    branches/cmake-bringup/dll/keyboard/kbdfr/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/input/sermouse/CMakeLists.txt

Modified: branches/cmake-bringup/dll/keyboard/kbdfr/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/keyboard/kbdfr/CMakeLists.txt?rev=49390&r1=49389&r2=49390&view=diff
==============================================================================
--- branches/cmake-bringup/dll/keyboard/kbdfr/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/keyboard/kbdfr/CMakeLists.txt [iso-8859-1] Mon Nov  1 00:54:15 2010
@@ -7,6 +7,6 @@
 
 set_entrypoint(kbdfr 0)
 
+add_dependencies(kbdfr psdk buildno_header)
 
-
-add_dependencies(kbdfr psdk buildno_header)
+add_cab_target(kbdfr 1)

Modified: branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt?rev=49390&r1=49389&r2=49390&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/input/i8042prt/CMakeLists.txt [iso-8859-1] Mon Nov  1 00:54:15 2010
@@ -14,12 +14,9 @@
     setup.c
     i8042prt.rc)
 
-set_target_properties(i8042prt PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry at 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)

Modified: branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt?rev=49390&r1=49389&r2=49390&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/input/kbdclass/CMakeLists.txt [iso-8859-1] Mon Nov  1 00:54:15 2010
@@ -7,13 +7,11 @@
     setup.c
     kbdclass.rc)
 
-set_target_properties(kbdclass PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry at 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_dependencies(kbdclass psdk bugcodes)
+add_importlibs(kbdclass ntoskrnl hal)
+
 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/mouclass/CMakeLists.txt?rev=49390&r1=49389&r2=49390&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/input/mouclass/CMakeLists.txt [iso-8859-1] Mon Nov  1 00:54:15 2010
@@ -6,12 +6,10 @@
     mouclass.c
     mouclass.rc)
 
-set_target_properties(mouclass PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry at 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_dependencies(mouclass psdk bugcodes)
+add_importlibs(mouclass ntoskrnl hal)
+
 add_cab_target(mouclass 2)

Modified: branches/cmake-bringup/drivers/input/sermouse/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/input/sermouse/CMakeLists.txt?rev=49390&r1=49389&r2=49390&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/input/sermouse/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/input/sermouse/CMakeLists.txt [iso-8859-1] Mon Nov  1 00:54:15 2010
@@ -18,3 +18,5 @@
     -lhal)
 
 add_dependencies(sermouse psdk bugcodes)
+
+add_cab_target(sermouse 2)




More information about the Ros-diffs mailing list