[ros-diffs] [spetreolle] 49502: [CMAKE] Bootcd/Livecd : Add dplayx, ntfs and mup. Add forgotten wined3d importlib, my bad.

spetreolle at svn.reactos.org spetreolle at svn.reactos.org
Fri Nov 5 23:14:30 UTC 2010


Author: spetreolle
Date: Fri Nov  5 23:14:29 2010
New Revision: 49502

URL: http://svn.reactos.org/svn/reactos?rev=49502&view=rev
Log:
[CMAKE]
Bootcd/Livecd : Add dplayx, ntfs and mup.
Add forgotten wined3d importlib, my bad.

Added:
    branches/cmake-bringup/dll/directx/dplayx/CMakeLists.txt   (with props)
    branches/cmake-bringup/importlibs/libwined3d.a   (with props)
Modified:
    branches/cmake-bringup/dll/directx/CMakeLists.txt
    branches/cmake-bringup/drivers/filesystems/mup/CMakeLists.txt
    branches/cmake-bringup/drivers/filesystems/ntfs/CMakeLists.txt
    branches/cmake-bringup/media/CMakeLists.txt

Modified: branches/cmake-bringup/dll/directx/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/CMakeLists.txt?rev=49502&r1=49501&r2=49502&view=diff
==============================================================================
--- branches/cmake-bringup/dll/directx/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/CMakeLists.txt [iso-8859-1] Fri Nov  5 23:14:29 2010
@@ -10,7 +10,7 @@
 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)

Added: branches/cmake-bringup/dll/directx/dplayx/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/dplayx/CMakeLists.txt?rev=49502&view=auto
==============================================================================
--- branches/cmake-bringup/dll/directx/dplayx/CMakeLists.txt (added)
+++ branches/cmake-bringup/dll/directx/dplayx/CMakeLists.txt [iso-8859-1] Fri Nov  5 23:14:29 2010
@@ -1,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)
+    

Propchange: branches/cmake-bringup/dll/directx/dplayx/CMakeLists.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: branches/cmake-bringup/drivers/filesystems/mup/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesystems/mup/CMakeLists.txt?rev=49502&r1=49501&r2=49502&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/filesystems/mup/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/filesystems/mup/CMakeLists.txt [iso-8859-1] Fri Nov  5 23:14:29 2010
@@ -6,3 +6,5 @@
 
 set_module_type(mup kernelmodedriver)
 add_importlibs(mup ntoskrnl hal)
+
+add_cab_target(mup 2)

Modified: branches/cmake-bringup/drivers/filesystems/ntfs/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/filesystems/ntfs/CMakeLists.txt?rev=49502&r1=49501&r2=49502&view=diff
==============================================================================
--- branches/cmake-bringup/drivers/filesystems/ntfs/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/drivers/filesystems/ntfs/CMakeLists.txt [iso-8859-1] Fri Nov  5 23:14:29 2010
@@ -23,3 +23,6 @@
 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)

Added: branches/cmake-bringup/importlibs/libwined3d.a
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/importlibs/libwined3d.a?rev=49502&view=auto
==============================================================================
Binary file - no diff available.

Propchange: branches/cmake-bringup/importlibs/libwined3d.a
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: branches/cmake-bringup/media/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/media/CMakeLists.txt?rev=49502&r1=49501&r2=49502&view=diff
==============================================================================
--- branches/cmake-bringup/media/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/media/CMakeLists.txt [iso-8859-1] Fri Nov  5 23:14:29 2010
@@ -7,6 +7,7 @@
 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)
+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)




More information about the Ros-diffs mailing list