Link ole32 to iidlib. Fixes compilation on MSVC

svn path=/branches/cmake-bringup/; revision=50562
This commit is contained in:
Timo Kreuzer
2011-01-29 17:58:43 +00:00
parent 04e691ee90
commit 4d2d6956d3
+32 -27
View File
@@ -1,4 +1,29 @@
spec2def(ole32.dll ole32.spec)
generate_idl_iids(dcom.idl)
add_idl_headers(ole32idl dcom.idl irot.idl)
remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
add_definitions(
-D__WINESRC__
-D_OLE32_
-DENTRY_PREFIX=OLE32_
-DPROXY_CLSID=CLSID_PSFactoryBuffer
-DREGISTER_PROXY_DLL
-DCOM_NO_WINDOWS_H)
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${REACTOS_SOURCE_DIR}/include/reactos/wine)
add_rpcproxy_library(ole32proxy
dcom.idl
ole32_unknwn.idl
ole32_objidl.idl
ole32_oleidl.idl)
list(APPEND SOURCE
antimoniker.c
bindctx.c
@@ -37,33 +62,9 @@ list(APPEND SOURCE
stubmanager.c
usrmarshal.c
ole32res.rc
${CMAKE_CURRENT_BINARY_DIR}/dcom_i.c
${CMAKE_CURRENT_BINARY_DIR}/ole32.def)
remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
add_definitions(
-D__WINESRC__
-D_OLE32_
-DENTRY_PREFIX=OLE32_
-DPROXY_CLSID=CLSID_PSFactoryBuffer
-DREGISTER_PROXY_DLL
-DCOM_NO_WINDOWS_H)
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
${REACTOS_SOURCE_DIR}/include/reactos/wine)
add_idl_headers(ole32idl dcom.idl irot.idl)
add_rpcproxy_library(ole32proxy
dcom.idl
ole32_unknwn.idl
ole32_objidl.idl
ole32_oleidl.idl)
spec2def(ole32.dll ole32.spec)
add_library(ole32 SHARED ${SOURCE})
set_module_type(ole32 win32dll)
@@ -74,9 +75,13 @@ target_link_libraries(ole32
irotrpc
uuid
${PSEH_LIB})
if(MSVC)
target_link_libraries(ole32 iidlib)
endif()
add_importlibs(ole32 advapi32 user32 gdi32 rpcrt4 msvcrt kernel32 ntdll)
add_dependencies(ole32 ole32idl)
add_cab_target(ole32 1)
add_importlib_target(ole32.spec)