[ros-diffs] [akhaldi] 49806: - Correct the entry point for win32dll, win32ocx and cpl module types. - Fix acledit.

akhaldi at svn.reactos.org akhaldi at svn.reactos.org
Fri Nov 26 23:57:03 UTC 2010


Author: akhaldi
Date: Fri Nov 26 23:57:03 2010
New Revision: 49806

URL: http://svn.reactos.org/svn/reactos?rev=49806&view=rev
Log:
- Correct the entry point for win32dll, win32ocx and cpl module types.
- Fix acledit.

Modified:
    branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt
    branches/cmake-bringup/gcc.cmake

Modified: branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt?rev=49806&r1=49805&r2=49806&view=diff
==============================================================================
--- branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/acledit/CMakeLists.txt [iso-8859-1] Fri Nov 26 23:57:03 2010
@@ -13,7 +13,7 @@
 
 set_export_spec(acledit acledit.spec)
 
-add_importlibs(acledit ntdll)
+add_importlibs(acledit msvcrt kernel32 ntdll)
 
 add_cab_target(acledit 1)
 

Modified: branches/cmake-bringup/gcc.cmake
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/gcc.cmake?rev=49806&r1=49805&r2=49806&view=diff
==============================================================================
--- branches/cmake-bringup/gcc.cmake [iso-8859-1] (original)
+++ branches/cmake-bringup/gcc.cmake [iso-8859-1] Fri Nov 26 23:57:03 2010
@@ -135,7 +135,8 @@
 		target_link_libraries(${MODULE} mingw_common)
     endif()
     if(${TYPE} MATCHES win32dll)
-        set_entrypoint(${MODULE} DllMain at 12)
+        set_entrypoint(${MODULE} DllMainCRTStartup at 12)
+        target_link_libraries(${MODULE} mingw_dllmain mingw_common)
 		if(DEFINED baseaddress_${MODULE})
 			set_image_base(${MODULE} ${baseaddress_${MODULE}})
 		else()
@@ -143,11 +144,13 @@
 		endif()
     endif()
     if(${TYPE} MATCHES win32ocx)
-        set_entrypoint(${MODULE} DllMain at 12)
+        set_entrypoint(${MODULE} DllMainCRTStartup at 12)
+        target_link_libraries(${MODULE} mingw_dllmain mingw_common)
         set_target_properties(${MODULE} PROPERTIES SUFFIX ".ocx")
     endif()
     if(${TYPE} MATCHES cpl)
-        set_entrypoint(${MODULE} DllMain at 12)
+        set_entrypoint(${MODULE} DllMainCRTStartup at 12)
+        target_link_libraries(${MODULE} mingw_dllmain mingw_common)
         set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl")
     endif()
 	if(${TYPE} MATCHES kernelmodedriver)




More information about the Ros-diffs mailing list