Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 17:34:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Correct the entry point for win32dll, win32ocx and cpl module types.

Browse source 
- Fix acledit.

svn path=/branches/cmake-bringup/; revision=49806
This commit is contained in:
Amine Khaldi 2010-11-26 23:57:03 +00:00
parent efa7393534
commit 4a8860b952
2 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dll/win32/acledit/CMakeLists.txt
View file

@ -13,7 +13,7 @@ set_module_type(acledit win32dll)
set_export_spec(acledit acledit.spec)
add_importlibs(acledit ntdll)
add_importlibs(acledit msvcrt kernel32 ntdll)
add_cab_target(acledit 1)

9
gcc.cmake
View file

@ -135,7 +135,8 @@ macro(set_module_type MODULE TYPE)
target_link_libraries(${MODULE} mingw_common)
endif()
if(${TYPE} MATCHES win32dll)
set_entrypoint(${MODULE} DllMain@12)
set_entrypoint(${MODULE} DllMainCRTStartup@12)
target_link_libraries(${MODULE} mingw_dllmain mingw_common)
if(DEFINED baseaddress_${MODULE})
set_image_base(${MODULE} ${baseaddress_${MODULE}})
else()
@ -143,11 +144,13 @@ macro(set_module_type MODULE TYPE)
endif()
endif()
if(${TYPE} MATCHES win32ocx)
set_entrypoint(${MODULE} DllMain@12)
set_entrypoint(${MODULE} DllMainCRTStartup@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@12)
set_entrypoint(${MODULE} DllMainCRTStartup@12)
target_link_libraries(${MODULE} mingw_dllmain mingw_common)
set_target_properties(${MODULE} PROPERTIES SUFFIX ".cpl")
endif()
if(${TYPE} MATCHES kernelmodedriver)