[ros-diffs] [jgardou] 58637: [CMAKE] * Add the wdmdriver module type

Author: jgardou
Date: Tue Apr  2 08:08:36 2013
New Revision: 58637

URL: http://svn.reactos.org/svn/reactos?rev=58637&view=rev
Log:
[CMAKE]
 * Add the wdmdriver module type

Modified:
    trunk/reactos/cmake/CMakeMacros.cmake
    trunk/reactos/cmake/gcc.cmake
    trunk/reactos/cmake/msvc.cmake

Modified: trunk/reactos/cmake/CMakeMacros.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re…
==============================================================================
--- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Tue Apr  2 08:08:36 2013
@@ -299,7 +299,7 @@
 
     # Set subsystem. Also take this as an occasion
     # to error out if someone gave a non existing type
-    if((${TYPE} STREQUAL nativecui) OR (${TYPE} STREQUAL nativedll) OR (${TYPE} STREQUAL
kernelmodedriver))
+    if((${TYPE} STREQUAL nativecui) OR (${TYPE} STREQUAL nativedll) OR (${TYPE} STREQUAL
kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver))
         set(__subsystem native)
     elseif(${TYPE} STREQUAL win32cui)
         set(__subsystem console)
@@ -342,7 +342,7 @@
             OR (${TYPE} STREQUAL cpl))
         set(__entrypoint DllMainCRTStartup)
         set(__entrystack 12)
-    elseif(${TYPE} STREQUAL kernelmodedriver)
+    elseif((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver))
         set(__entrypoint DriverEntry)
         set(__entrystack 8)
     elseif(${TYPE} STREQUAL nativedll)
@@ -369,12 +369,12 @@
         else()
             message(STATUS "${MODULE} has no base address")
         endif()
-    elseif(${TYPE} STREQUAL kernelmodedriver)
+    elseif((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver))
         set_image_base(${MODULE} 0x00010000)
     endif()
 
     # Now do some stuff which is specific to each type
-    if(${TYPE} STREQUAL kernelmodedriver)
+    if((${TYPE} STREQUAL kernelmodedriver) OR (${TYPE} STREQUAL wdmdriver))
         add_dependencies(${MODULE} bugcodes)
         set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys")
     endif()

Modified: trunk/reactos/cmake/gcc.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=58637&…
==============================================================================
--- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Tue Apr  2 08:08:36 2013
@@ -202,8 +202,11 @@
         target_link_libraries(${MODULE} -lstdc++ -lsupc++ -lgcc -lmingwex)
     endif()
 
-    if(${TYPE} STREQUAL "kernelmodedriver")
+    if((${TYPE} STREQUAL "kernelmodedriver") OR (${TYPE} STREQUAL
"wdmdriver"))
         add_target_link_flags(${MODULE}
"-Wl,--exclude-all-symbols,-file-alignment=0x1000,-section-alignment=0x1000")
+        if(${TYPE} STREQUAL "wdmdriver")
+            add_target_link_flags(${MODULE} "-Wl,--wdmdriver")
+        endif()
     endif()
 endfunction()
 

Modified: trunk/reactos/cmake/msvc.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=58637…
==============================================================================
--- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Tue Apr  2 08:08:36 2013
@@ -112,6 +112,8 @@
         add_target_link_flags(${MODULE} "/DLL")
     elseif(${TYPE} STREQUAL "kernelmodedriver")
         add_target_link_flags(${MODULE} "/DRIVER")
+    elseif(${TYPE} STREQUAL "wdmdriver")
+        add_target_link_flags(${MODULE} "/DRIVER:WDM")
     endif()
 endfunction()