[ros-diffs] [tkreuzer] 49900: [CMAKE] - Add importlib for dplayx, ksuser, wined3d - link dplay to dplayx

Author: tkreuzer
Date: Thu Dec  2 19:13:47 2010
New Revision: 49900

URL: http://svn.reactos.org/svn/reactos?rev=49900&view=rev
Log:
[CMAKE]
- Add importlib for dplayx, ksuser, wined3d
- link dplay to dplayx

Modified:
    branches/cmake-bringup/dll/directx/dplay/CMakeLists.txt
    branches/cmake-bringup/dll/directx/dplayx/CMakeLists.txt
    branches/cmake-bringup/dll/directx/ksuser/CMakeLists.txt
    branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt

Modified: branches/cmake-bringup/dll/directx/dplay/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dplay…
==============================================================================
--- branches/cmake-bringup/dll/directx/dplay/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/dplay/CMakeLists.txt [iso-8859-1] Thu Dec  2
19:13:47 2010
@@ -5,7 +5,10 @@
 
 spec2def(dplay.dll dplay.spec)
 
-add_library(dplay SHARED dplay_main.c version.rc ${CMAKE_CURRENT_BINARY_DIR}/dplay.def)
+add_library(dplay SHARED
+    dplay_main.c
+    version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/dplay.def)
 
 set_entrypoint(dplay 0)
 
@@ -19,8 +22,10 @@
     ole32
     winmm
     dinput
+    dplayx
     ntdll)
 
 add_dependencies(dplay psdk buildno_header)
 
-add_cab_target(dplay 1)
+add_cab_target(dplay 1)
+add_importlib_target(dplay.spec libdplayx)

Modified: branches/cmake-bringup/dll/directx/dplayx/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dplay…
==============================================================================
--- branches/cmake-bringup/dll/directx/dplayx/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/dplayx/CMakeLists.txt [iso-8859-1] Thu Dec  2
19:13:47 2010
@@ -14,7 +14,7 @@
     name_server.c
     regsvr.c
     version.rc
-    dplayx.def)
+    ${CMAKE_CURRENT_BINARY_DIR}/dplayx.def)
 
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
@@ -22,7 +22,6 @@
 set_module_type(dplayx win32dll)
 
 target_link_libraries(dplayx
-    ${CMAKE_CURRENT_BINARY_DIR}/dplayx.def
     wine
     uuid
     dxguid)
@@ -36,4 +35,5 @@
     kernel32
     ntdll)
 
-add_cab_target(dplayx 1)
+add_cab_target(dplayx 1)
+add_importlib_target(dplayx.spec)

Modified: branches/cmake-bringup/dll/directx/ksuser/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/ksuse…
==============================================================================
--- branches/cmake-bringup/dll/directx/ksuser/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/ksuser/CMakeLists.txt [iso-8859-1] Thu Dec  2
19:13:47 2010
@@ -8,3 +8,4 @@
 add_importlibs(ksuser advapi32 msvcrt kernel32 ntdll)
 add_dependencies(ksuser psdk bugcodes)
 add_cab_target(ksuser 1)
+add_importlib_target(ksuser.spec)

Modified: branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/directx/wine/wined3d/CMakeLists.txt [iso-8859-1] Thu Dec  2
19:13:47 2010
@@ -68,4 +68,4 @@
 
 add_dependencies(wined3d wineheaders)
 add_cab_target(wined3d 1)
-add_importlib_target(wined3d.spec)
+add_importlib_target(wined3d.spec)