[ros-diffs] [tkreuzer] 49805: [CMAKE] - implicitly link to msvcsup - set proper entrypoints - add linkerflags /DLL and /DRIVER

tkreuzer at svn.reactos.org tkreuzer at svn.reactos.org
Fri Nov 26 23:48:08 UTC 2010


Author: tkreuzer
Date: Fri Nov 26 23:48:07 2010
New Revision: 49805

URL: http://svn.reactos.org/svn/reactos?rev=49805&view=rev
Log:
[CMAKE]
- implicitly link to msvcsup
- set proper entrypoints
- add linkerflags /DLL and /DRIVER

Modified:
    branches/cmake-bringup/msc.cmake

Modified: branches/cmake-bringup/msc.cmake
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/msc.cmake?rev=49805&r1=49804&r2=49805&view=diff
==============================================================================
--- branches/cmake-bringup/msc.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/msc.cmake [iso-8859-1] Fri Nov 26 23:48:07 2010
@@ -71,7 +71,7 @@
         else()
             target_link_libraries(${MODULE} mingw_main)
         endif()
-		target_link_libraries(${MODULE} mingw_common)
+		target_link_libraries(${MODULE} mingw_common msvcsup)
     endif ()
     if (${TYPE} MATCHES win32cui)
         set_subsystem(${MODULE} console)
@@ -81,7 +81,7 @@
         else()
             target_link_libraries(${MODULE} mingw_main)
         endif()
-		target_link_libraries(${MODULE} mingw_common)
+		target_link_libraries(${MODULE} mingw_common msvcsup)
     endif ()
     if(${TYPE} MATCHES win32dll)
         # Need this only because mingw library is broken
@@ -91,22 +91,27 @@
 		else()
 			message(STATUS "${MODULE} has no base address")
 		endif()
-		target_link_libraries(${MODULE} mingw_common mingw_dllmain)
+		target_link_libraries(${MODULE} mingw_common mingw_dllmain msvcsup)
         add_linkerflag(${MODULE} "/DLL")
     endif()
     if(${TYPE} MATCHES win32ocx)
-        set_entrypoint(${MODULE} DllMain at 12)
+        set_entrypoint(${MODULE} DllMainCRTStartup at 12)
         set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx")
+        target_link_libraries(${MODULE} mingw_common mingw_dllmain msvcsup)
+        add_linkerflag(${MODULE} "/DLL")
     endif()
     if(${TYPE} MATCHES cpl)
-        set_entrypoint(${MODULE} DllMain at 12)
+        set_entrypoint(${MODULE} DllMainCRTStartup at 12)
         set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl")
+        target_link_libraries(${MODULE} mingw_common mingw_dllmain msvcsup)
+        add_linkerflag(${MODULE} "/DLL")
     endif()
 	if(${TYPE} MATCHES kernelmodedriver)
 	    set_target_properties(${MODULE} PROPERTIES SUFFIX ".sys")
 	    set_entrypoint(${MODULE} DriverEntry at 8)
 		set_subsystem(${MODULE} native)
         set_image_base(${MODULE} 0x00010000)
+        add_linkerflag(${MODULE} "/DRIVER")
 		add_dependencies(${MODULE} bugcodes)
 	endif()
 




More information about the Ros-diffs mailing list