[ros-diffs] [akhaldi] 60478: [DPLAY] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Mon Sep 30 18:12:42 2013
New Revision: 60478

URL: http://svn.reactos.org/svn/reactos?rev=60478&view=rev
Log:
[DPLAY]
* Sync with Wine 1.7.1.
CORE-7469

Removed:
    trunk/reactos/dll/directx/wine/dplay/dplay_main.c
Modified:
    trunk/reactos/dll/directx/wine/dplay/CMakeLists.txt
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/directx/wine/dplay/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplay/CMa…
==============================================================================
--- trunk/reactos/dll/directx/wine/dplay/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dplay/CMakeLists.txt	[iso-8859-1] Mon Sep 30 18:12:42
2013
@@ -1,14 +1,11 @@
 
 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)
 
-set_module_type(dplay win32dll UNICODE)
+set_module_type(dplay win32dll)
 add_importlibs(dplay dplayx msvcrt kernel32 ntdll)
-add_dependencies(dplay psdk)
 add_cd_file(TARGET dplay DESTINATION reactos/system32 FOR all)

Removed: trunk/reactos/dll/directx/wine/dplay/dplay_main.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/dplay/dpl…
==============================================================================
--- trunk/reactos/dll/directx/wine/dplay/dplay_main.c	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/dplay/dplay_main.c	(removed)
@@ -1 +0,0 @@
-/* nothing here yet */

Modified: trunk/reactos/media/doc/README.WINE
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/media/doc/README.WINE?rev=…
==============================================================================
--- trunk/reactos/media/doc/README.WINE	[iso-8859-1] (original)
+++ trunk/reactos/media/doc/README.WINE	[iso-8859-1] Mon Sep 30 18:12:42 2013
@@ -37,7 +37,7 @@
 reactos/dll/directx/wine/dinput         # Synced to Wine-1.7.1
 reactos/dll/directx/wine/dinput8        # Synced to Wine-1.5.26
 reactos/dll/directx/wine/dmusic         # Synced to Wine-1.5.26
-reactos/dll/directx/wine/dplay          # Synced to Wine-1.5.26
+reactos/dll/directx/wine/dplay          # Synced to Wine-1.7.1
 reactos/dll/directx/wine/dplayx         # Synced to Wine-1.5.26
 reactos/dll/directx/wine/dsound         # Synced to Wine-1.7.1
 reactos/dll/directx/wine/dxdiagn        # Synced to Wine-0_9_5