[CMAKE]

Bootcd/Livecd : Add dplayx, ntfs and mup.
Add forgotten wined3d importlib, my bad.

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

diff --git a/dll/directx/CMakeLists.txt b/dll/directx/CMakeLists.txt
index 0dc7fd5..bce8e35 100644 (file)
--- a/dll/directx/CMakeLists.txt
+++ b/dll/directx/CMakeLists.txt
@@ -10,7 +10,7 @@ add_subdirectory(dinput)
 add_subdirectory(dinput8)
 add_subdirectory(dmusic)
 add_subdirectory(dplay)
-#add_subdirectory(dplayx)
+add_subdirectory(dplayx)
 add_subdirectory(dsound)
 #add_subdirectory(dsound_new)
 add_subdirectory(dxdiagn)

diff --git a/dll/directx/dplayx/CMakeLists.txt b/dll/directx/dplayx/CMakeLists.txt
new file mode 100644 (file)
index 0000000..6460c03
--- /dev/null
+++ b/dll/directx/dplayx/CMakeLists.txt
@@ -0,0 +1,38 @@
+set_rc_compiler()
+
+spec2def(dplayx.dll dplayx.spec)
+
+list(APPEND SOURCE
+    dpclassfactory.c
+    dplay.c
+    dplaysp.c
+    dplayx_global.c
+    dplayx_main.c
+    dplayx_messages.c
+    dplobby.c
+    lobbysp.c
+    name_server.c
+    regsvr.c
+    version.rc
+    dplayx.def)
+
+include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+add_library(dplayx SHARED ${SOURCE})
+set_module_type(dplayx win32dll)
+
+target_link_libraries(dplayx
+    ${CMAKE_CURRENT_BINARY_DIR}/dplayx.def
+    wine
+    uuid
+    dxguid)
+
+add_importlibs(dplayx
+    advapi32
+    ole32
+    user32
+    winmm
+    msvcrt
+    kernel32
+    ntdll)
+    
\ No newline at end of file

diff --git a/drivers/filesystems/mup/CMakeLists.txt b/drivers/filesystems/mup/CMakeLists.txt
index 4b3b894..337ee49 100644 (file)
--- a/drivers/filesystems/mup/CMakeLists.txt
+++ b/drivers/filesystems/mup/CMakeLists.txt
@@ -6,3 +6,5 @@ add_library(mup SHARED
 
 set_module_type(mup kernelmodedriver)
 add_importlibs(mup ntoskrnl hal)
+
+add_cab_target(mup 2)
\ No newline at end of file

diff --git a/drivers/filesystems/ntfs/CMakeLists.txt b/drivers/filesystems/ntfs/CMakeLists.txt
index 24bc266..f96e6d0 100644 (file)
--- a/drivers/filesystems/ntfs/CMakeLists.txt
+++ b/drivers/filesystems/ntfs/CMakeLists.txt
@@ -23,3 +23,6 @@ set_module_type(ntfs kernelmodedriver)
 add_importlibs(ntfs ntoskrnl hal)
 
 add_pch(ntfs ${CMAKE_CURRENT_SOURCE_DIR}/ntfs.h ${SOURCE})
+
+add_minicd_target(ntfs reactos)
+add_livecd_target(ntfs reactos/system32/drivers)

diff --git a/importlibs/libwined3d.a b/importlibs/libwined3d.a
new file mode 100644 (file)
index 0000000..c8457fa
Binary files /dev/null and b/importlibs/libwined3d.a differ

diff --git a/media/CMakeLists.txt b/media/CMakeLists.txt
index 6894ede..c86b866 100644 (file)
--- a/media/CMakeLists.txt
+++ b/media/CMakeLists.txt
@@ -7,6 +7,7 @@ add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/hosts reactos hosts)
 add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/KDBinit reactos KDBinit)
 add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/services reactos services)
 
-add_livecd(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/hosts reactos/system32/drivers/etc hosts)
-add_livecd(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/KDBinit reactos/system32/drivers/etc KDBinit)
-add_livecd(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/services reactos/system32/drivers/etc services)
\ No newline at end of file
+add_cab(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/hosts 5)
+add_cab(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/KDBinit 5)
+add_cab(${CMAKE_CURRENT_SOURCE_DIR}/drivers/etc/services 5)
+add_cab(${CMAKE_CURRENT_SOURCE_DIR}/sounds/ReactOS_LogOn.wav 8)
\ No newline at end of file