From d929fc29f774c25cfc77314ad0d6ee5a05013646 Mon Sep 17 00:00:00 2001
From: Sylvain Petreolle <spetreolle@yahoo.fr>
Date: Fri, 5 Nov 2010 23:14:29 +0000
Subject: [PATCH] [CMAKE] Bootcd/Livecd : Add dplayx, ntfs and mup. Add
 forgotten wined3d importlib, my bad.

svn path=/branches/cmake-bringup/; revision=49502
---
 dll/directx/CMakeLists.txt              |   2 +-
 dll/directx/dplayx/CMakeLists.txt       |  38 ++++++++++++++++++++++++
 drivers/filesystems/mup/CMakeLists.txt  |   2 ++
 drivers/filesystems/ntfs/CMakeLists.txt |   3 ++
 importlibs/libwined3d.a                 | Bin 0 -> 4832 bytes
 media/CMakeLists.txt                    |   7 +++--
 6 files changed, 48 insertions(+), 4 deletions(-)
 create mode 100644 dll/directx/dplayx/CMakeLists.txt
 create mode 100644 importlibs/libwined3d.a

diff --git a/dll/directx/CMakeLists.txt b/dll/directx/CMakeLists.txt
index 0dc7fd56c21..bce8e35ec26 100644
--- 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
index 00000000000..6460c03e659
--- /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 4b3b894a5e4..337ee4991a7 100644
--- 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 24bc266ff32..f96e6d09076 100644
--- 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
index 0000000000000000000000000000000000000000..c8457faf1322b910fd461a7a3ebf5a60e16d01bf
GIT binary patch
literal 4832
zcmeI0&u`N(6vtoMj*e;*JD_Po95M-RsHE+db}*qz+i_<=2+2#Al!m2U=`uF$v;%*@
z{v3|`%NXxH=ZD)QZCV7=fG5Rq>~C!M`QvA&o4eNNsQ0GwQXjWkz13`OZPyz+x^8fl
zn(BI^Sr1+~tN;LB+IN7`TY&Nhc~xFvF<z_d@>(katd)c~>3kM$qh$))^Mvh=oFo52
zoVx>u6T4vx&+X7NWi8<jtiA(6^c>5c^IeEq?4SA0g*Y2{Cr8I^16y<ZLy=h<b}rwV
z_D)#$4u`wXKc%t1H*zfB+4J1t&>6*@O_d}o+pTbvsdZqx{ZD@NB$~FY`KlR)X_~rj
z8aR<`hm`~E0Ztjfh6eD6b4ywk9prO9JJG>7tlE}uWlOlG4aQBib9y>M23MqWsljJk
zp%x*55{^qXZcpmA!*bFsXX~1wZUr+dDY~%!T!L0b7@^vAJtwI6aSQNC>srTQK~S#x
ziJC1=v`sSAM};hn;-6xcM)3{(-l9h7xCQ=Wzbs+Z6b<`?X1=JASCSUCPMQL|#&p5e
zS|K`nbI{qW)e>}?=-D+MWa+NytcSjOj2WVnRt_1>TpFERIgu#3i1rByKawu3oXTk4
z%AC@=Ewg`CIhTjs9*0ttqcI22^?PT7V_CxVz#Z_--j#flf61q@sqsOMIYB&&Lw4y-
zYYqUnp2!OD1@jATB6IFK!H&gi;M72C$b~R7LN_r?M-jTrW4}VqXnQ5<)S01@WxQTs
z{riALy6L|!LPrsmJiLXSb(DS~j^twzx`i4qT^FqZYHt@cU(<CaR<mtj+72{95#IEh
z+voIjeI1t(LqS{@>dr68p#F#?fQNWVKhv|CQ+-Wc7Lzd@)E$l^I0R&}r>GZvOWC!8
z^`*r0F`oH%(ikNF^gbE&E_r^+&j8d;8sS4M&pgshKkzJcxS|-(eAn~x9iJEvwEuhu
zY(#vo<NW32yD-5wokIx^;^MyY{e*r1TFiIk8Z0e<hv@|0;qg0-?x=2&4~K~DT28ii
z<kyj|)9G5W{SBAytl0fAh-Y;Bld-$2^gAtf57Tvt*nOF<izbj_S6;R?NPh7IUsLy*
z?@japS<LsoEa0>Nmv|SMKRxG%<gZ0?BPZ?3w|_|c6%sIu_J8H1GEXFj6xs=hzdn*D
MNuTkT$6}}VpQv=!@c;k-

literal 0
HcmV?d00001

diff --git a/media/CMakeLists.txt b/media/CMakeLists.txt
index 6894ede1c45..c86b866b70f 100644
--- 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