[CMAKE]
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Thu, 2 Dec 2010 19:13:47 +0000 (19:13 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Thu, 2 Dec 2010 19:13:47 +0000 (19:13 +0000)
- Add importlib for dplayx, ksuser, wined3d
- link dplay to dplayx

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

dll/directx/dplay/CMakeLists.txt
dll/directx/dplayx/CMakeLists.txt
dll/directx/ksuser/CMakeLists.txt
dll/directx/wine/wined3d/CMakeLists.txt

index 9d62624..bbe9499 100644 (file)
@@ -5,7 +5,10 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
 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 @@ add_importlibs(dplay
     ole32
     winmm
     dinput
+    dplayx
     ntdll)
 
 add_dependencies(dplay psdk buildno_header)
 
-add_cab_target(dplay 1)
\ No newline at end of file
+add_cab_target(dplay 1)
+add_importlib_target(dplay.spec libdplayx)
index b551fcd..0e29112 100644 (file)
@@ -14,7 +14,7 @@ list(APPEND SOURCE
     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 @@ add_library(dplayx SHARED ${SOURCE})
 set_module_type(dplayx win32dll)
 
 target_link_libraries(dplayx
-    ${CMAKE_CURRENT_BINARY_DIR}/dplayx.def
     wine
     uuid
     dxguid)
@@ -36,4 +35,5 @@ add_importlibs(dplayx
     kernel32
     ntdll)
 
-add_cab_target(dplayx 1)
\ No newline at end of file
+add_cab_target(dplayx 1)
+add_importlib_target(dplayx.spec)
index 2645e31..b892fac 100644 (file)
@@ -8,3 +8,4 @@ set_module_type(ksuser win32dll)
 add_importlibs(ksuser advapi32 msvcrt kernel32 ntdll)
 add_dependencies(ksuser psdk bugcodes)
 add_cab_target(ksuser 1)
+add_importlib_target(ksuser.spec)
index 023ec89..64bb85d 100644 (file)
@@ -68,4 +68,4 @@ add_importlibs(wined3d
 
 add_dependencies(wined3d wineheaders)
 add_cab_target(wined3d 1)
-add_importlib_target(wined3d.spec)
\ No newline at end of file
+add_importlib_target(wined3d.spec)