[CMAKE]

[reactos.git] / dll / win32 / oleaut32 / CMakeLists.txt

diff --git a/dll/win32/oleaut32/CMakeLists.txt b/dll/win32/oleaut32/CMakeLists.txt
index 987236f..a856ce3 100644 (file)
--- a/dll/win32/oleaut32/CMakeLists.txt
+++ b/dll/win32/oleaut32/CMakeLists.txt
@@ -1,3 +1,4 @@
+
 list(APPEND SOURCE
     connpt.c
     dispatch.c
@@ -18,38 +19,42 @@ list(APPEND SOURCE
     variant.c
     vartype.c
     oleaut32.rc
-    oleaut32_oaidl.idl
+    ${CMAKE_CURRENT_BINARY_DIR}/oleaut32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/oleaut32.def)
 
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
-add_definitions(-D__WINESRC__)
-#FIXME: this should be quotes enclosed
-add_definitions(-DPROXY_CLSID_IS={0xb196b286,0xbab4,0x101a,{0xb6,0x9c,0x00,0xaa,0x00,0x34,0x1d,0x07}})
-#add_definitions(-DPROXY_CLSID_IS="{0xb196b286,0xbab4,0x101a,{0xb6,0x9c,0x00,0xaa,0x00,0x34,0x1d,0x07}}")
-
-add_definitions(-DCOM_NO_WINDOWS_H)
-add_definitions(-D_OLEAUT32_)
-add_definitions(-DPROXY_DELEGATION)
-add_definitions(-DREGISTER_PROXY_DLL)
-add_definitions(-DENTRY_PREFIX=OLEAUTPS_)
+
+add_definitions(-DPROXY_CLSID_IS="{0xb196b286,0xbab4,0x101a,{0xb6,0x9c,0x00,0xaa,0x00,0x34,0x1d,0x07}}")
+
+add_definitions(
+    -D__WINESRC__
+    -DCOM_NO_WINDOWS_H
+    -D_OLEAUT32_
+    -DPROXY_DELEGATION
+    -DREGISTER_PROXY_DLL
+    -DENTRY_PREFIX=OLEAUTPS_)
+
 if(MSC)
 # seems to work, but is this correct ?
 # <compilerflag compilerset="msc">/FIwine/typeof.h</compilerflag>
 add_definitions(/FIwine/typeof.h)
 endif(MSC)
 
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg)
-include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+include_directories(
+    ${REACTOS_SOURCE_DIR}/include/reactos/libs/libjpeg
+    ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 spec2def(oleaut32.dll oleaut32.spec)
 
+add_rpcproxy_library(oleaut32proxy oleaut32_oaidl.idl oleaut32_ocidl.idl)
+
 add_library(oleaut32 SHARED ${SOURCE})
 
 set_module_type(oleaut32 win32dll)
 
 target_link_libraries(oleaut32
-    oleaut32_proxy
+    oleaut32proxy
     wine
     wineldr
     uuid
@@ -57,7 +62,5 @@ target_link_libraries(oleaut32
 
 add_importlibs(oleaut32 windowscodecs ole32 rpcrt4 user32 gdi32 advapi32 comctl32 urlmon msvcrt kernel32 ntdll)
 
-
-rpcproxy(oleaut32 oleaut32_oaidl.idl oleaut32_ocidl.idl)
-
-add_cab_target(oleaut32 1)
+add_cd_file(TARGET oleaut32 DESTINATION reactos/system32)
+add_importlib_target(oleaut32.spec)