[ros-diffs] [jgardou] 53239: [CMAKE] - get back to DllMAinCRTStartup entry point

Author: jgardou
Date: Sun Aug 14 20:34:13 2011
New Revision: 53239

URL: http://svn.reactos.org/svn/reactos?rev=53239&view=rev
Log:
[CMAKE]
- get back to DllMAinCRTStartup entry point

Modified:
    trunk/reactos/cmake/gcc.cmake
    trunk/reactos/dll/win32/advapi32/CMakeLists.txt
    trunk/reactos/dll/win32/shell32/CMakeLists.txt
    trunk/reactos/dll/win32/shlwapi/CMakeLists.txt
    trunk/reactos/subsystems/win32/csrss/win32csr/CMakeLists.txt

Modified: trunk/reactos/cmake/gcc.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=53239&…
==============================================================================
--- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sun Aug 14 20:34:13 2011
@@ -145,17 +145,17 @@
             set_entrypoint(${MODULE} mainCRTStartup)
         endif(IS_UNICODE)
     elseif(${TYPE} MATCHES win32dll)
-        set_entrypoint(${MODULE} DllMain 12)
+        set_entrypoint(${MODULE} DllMainCRTStartup 12)
         if(DEFINED baseaddress_${MODULE})
             set_image_base(${MODULE} ${baseaddress_${MODULE}})
         else()
             message(STATUS "${MODULE} has no base address")
         endif()
     elseif(${TYPE} MATCHES win32ocx)
-        set_entrypoint(${MODULE} DllMain 12)
+        set_entrypoint(${MODULE} DllMainCRTStartup 12)
         set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx")
     elseif(${TYPE} MATCHES cpl)
-        set_entrypoint(${MODULE} DllMain 12)
+        set_entrypoint(${MODULE} DllMainCRTStartup 12)
         set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl")
     elseif(${TYPE} MATCHES kernelmodedriver)
         set_target_properties(${MODULE} PROPERTIES LINK_FLAGS
"-Wl,--exclude-all-symbols -Wl,-file-alignment=0x1000
-Wl,-section-alignment=0x1000" SUFFIX ".sys")

Modified: trunk/reactos/dll/win32/advapi32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/CMakeLi…
==============================================================================
--- trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/advapi32/CMakeLists.txt [iso-8859-1] Sun Aug 14 20:34:13 2011
@@ -63,7 +63,7 @@
     wine
     ${PSEH_LIB})
 
-add_importlibs(advapi32 rpcrt4 kernel32 ntdll msvcrt)
+add_importlibs(advapi32 rpcrt4 msvcrt kernel32 ntdll)
 
 add_pch(advapi32 advapi32.h
     ${CMAKE_CURRENT_BINARY_DIR}/lsa_c.h

Modified: trunk/reactos/dll/win32/shell32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/CMakeLis…
==============================================================================
--- trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shell32/CMakeLists.txt [iso-8859-1] Sun Aug 14 20:34:13 2011
@@ -93,8 +93,8 @@
     devmgr
     winspool
     winmm
+    msvcrt
     kernel32
-    msvcrt
     ntdll)
 
 add_pch(shell32 precomp.h)

Modified: trunk/reactos/dll/win32/shlwapi/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shlwapi/CMakeLis…
==============================================================================
--- trunk/reactos/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/dll/win32/shlwapi/CMakeLists.txt [iso-8859-1] Sun Aug 14 20:34:13 2011
@@ -46,10 +46,10 @@
     winmm
     version
     shell32
+    msvcrt
     kernel32
     userenv
     wininet
-    msvcrt
     ntdll)
 
 add_cd_file(TARGET shlwapi DESTINATION reactos/system32 FOR all)

Modified: trunk/reactos/subsystems/win32/csrss/win32csr/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win…
==============================================================================
--- trunk/reactos/subsystems/win32/csrss/win32csr/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrss/win32csr/CMakeLists.txt [iso-8859-1] Sun Aug 14
20:34:13 2011
@@ -35,7 +35,7 @@
 
 set_module_type(win32csr win32dll)
 
-add_importlibs(win32csr user32 gdi32 advapi32 psapi kernel32 ntdll msvcrt)
+add_importlibs(win32csr user32 gdi32 advapi32 psapi msvcrt kernel32 ntdll)
 
 add_pch(win32csr w32csr.h)