- Revert all changes made to wuapi. This doesnt work properly with gcc

svn path=/branches/cmake-bringup/; revision=50782

diff --git a/dll/win32/wuapi/CMakeLists.txt b/dll/win32/wuapi/CMakeLists.txt
index 33ceb54..7b9a3a3 100644 (file)
--- a/dll/win32/wuapi/CMakeLists.txt
+++ b/dll/win32/wuapi/CMakeLists.txt
@@ -23,7 +23,6 @@ list(APPEND SOURCE
 add_library(wuapi SHARED ${SOURCE})
 
 set_module_type(wuapi win32dll)
 add_library(wuapi SHARED ${SOURCE})
 
 set_module_type(wuapi win32dll)

-target_link_libraries(wuapi uuid wine wuapi_idl_header)
+target_link_libraries(wuapi uuid wine)

 add_importlibs(wuapi ole32 advapi32 msvcrt kernel32 ntdll)
 add_cab_target(wuapi 1)
 add_importlibs(wuapi ole32 advapi32 msvcrt kernel32 ntdll)
 add_cab_target(wuapi 1)

-add_dependencies(wuapi wuapi_idl_header) 
\ No newline at end of file

diff --git a/include/psdk/CMakeLists.txt b/include/psdk/CMakeLists.txt
index 2b405bf..1c839b6 100644 (file)
--- a/include/psdk/CMakeLists.txt
+++ b/include/psdk/CMakeLists.txt
@@ -97,6 +97,7 @@ list(APPEND SOURCE
     wincodec.idl
     winsxs.idl
     wtypes.idl
     wincodec.idl
     winsxs.idl
     wtypes.idl

+    wuapi.idl

     xmldom.idl
     xmldso.idl
     ctfutb.idl
     xmldom.idl
     xmldso.idl
     ctfutb.idl


@@ -109,6 +110,4 @@ endif()
 
 add_idl_headers(psdk ${SOURCE})
 
 
 add_idl_headers(psdk ${SOURCE})
 

-add_iid_library(wuapi_idl_header wuapi.idl)
-

 add_typelib(stdole2 stdole2.idl)
 add_typelib(stdole2 stdole2.idl)