[CMAKE]

Use msvc friendly macro.
Add network drivers to livecd.

svn path=/branches/cmake-bringup/; revision=49263

diff --git a/drivers/network/afd/CMakeLists.txt b/drivers/network/afd/CMakeLists.txt
index 8963ecb..2a56dfc 100644 (file)
--- a/drivers/network/afd/CMakeLists.txt
+++ b/drivers/network/afd/CMakeLists.txt
@@ -19,7 +19,7 @@ list(APPEND SOURCE
 
 add_library(afd SHARED ${CMAKE_CURRENT_BINARY_DIR}/afd_afd.h.gch ${SOURCE})
 
-set_target_properties(afd PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys")
+set_module_type(afd kernelmodedriver)
 
 target_link_libraries(afd
     pseh
@@ -28,4 +28,5 @@ target_link_libraries(afd
 
 add_pch(afd ${CMAKE_CURRENT_SOURCE_DIR}/include/afd.h ${SOURCE})
 add_dependencies(afd psdk bugcodes buildno_header)
+
 add_livecd_target(afd reactos/system32/drivers)
\ No newline at end of file

diff --git a/drivers/network/dd/ne2000/CMakeLists.txt b/drivers/network/dd/ne2000/CMakeLists.txt
index 9447ae8..21349ed 100644 (file)
--- a/drivers/network/dd/ne2000/CMakeLists.txt
+++ b/drivers/network/dd/ne2000/CMakeLists.txt
@@ -8,7 +8,7 @@ list(APPEND SOURCE
 
 add_library(ne2000 SHARED ${SOURCE})
 
-set_target_properties(ne2000 PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys")
+set_module_type(ne2000 kernelmodedriver)
 
 target_link_libraries(ne2000
     -lndis
@@ -16,3 +16,5 @@ target_link_libraries(ne2000
     -lhal)
 
 add_dependencies(ne2000 psdk bugcodes buildno_header)
+
+add_livecd_target(ne2000 reactos/system32/drivers)
\ No newline at end of file

diff --git a/drivers/network/dd/pcnet/CMakeLists.txt b/drivers/network/dd/pcnet/CMakeLists.txt
index 264030f..599d100 100644 (file)
--- a/drivers/network/dd/pcnet/CMakeLists.txt
+++ b/drivers/network/dd/pcnet/CMakeLists.txt
@@ -11,7 +11,7 @@ list(APPEND SOURCE
 
 add_library(pcnet SHARED ${SOURCE})
 
-set_target_properties(pcnet PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys")
+set_module_type(pcnet kernelmodedriver)
 
 target_link_libraries(pcnet
     -lndis
@@ -19,3 +19,5 @@ target_link_libraries(pcnet
     -lhal)
 
 add_dependencies(pcnet psdk bugcodes buildno_header)
+
+add_livecd_target(pcnet reactos/system32/drivers)
\ No newline at end of file

diff --git a/drivers/network/tcpip/CMakeLists.txt b/drivers/network/tcpip/CMakeLists.txt
index a769a3c..f2dee67 100644 (file)
--- a/drivers/network/tcpip/CMakeLists.txt
+++ b/drivers/network/tcpip/CMakeLists.txt
@@ -25,7 +25,7 @@ list(APPEND SOURCE
 
 add_library(tcpip SHARED ${CMAKE_CURRENT_BINARY_DIR}/tcpip_precomp.h.gch ${SOURCE})
 
-set_target_properties(tcpip PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys")
+set_module_type(tcpip kernelmodedriver)
 
 target_link_libraries(tcpip
     ${CMAKE_CURRENT_BINARY_DIR}/tcpip.def
@@ -39,3 +39,5 @@ target_link_libraries(tcpip
 
 add_pch(tcpip ${CMAKE_CURRENT_SOURCE_DIR}/include/precomp.h ${SOURCE})
 add_dependencies(tcpip tcpip_def psdk bugcodes buildno_header)
+
+add_livecd_target(tcpip reactos/system32/drivers)
\ No newline at end of file

diff --git a/drivers/network/tdi/CMakeLists.txt b/drivers/network/tdi/CMakeLists.txt
index d504959..4cbf0d7 100644 (file)
--- a/drivers/network/tdi/CMakeLists.txt
+++ b/drivers/network/tdi/CMakeLists.txt
@@ -19,7 +19,7 @@ list(APPEND SOURCE
 
 add_library(tdi SHARED ${SOURCE})
 
-set_target_properties(tdi PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys")
+set_module_type(tdi kernelmodedriver)
 
 target_link_libraries(tdi
     ${CMAKE_CURRENT_BINARY_DIR}/tdi.def
@@ -27,3 +27,5 @@ target_link_libraries(tdi
     -lhal)
 
 add_dependencies(tdi tdi_def psdk bugcodes buildno_header)
+
+add_livecd_target(tdi reactos/system32/drivers)
\ No newline at end of file