[ros-diffs] [akhaldi] 60454: [DIRECTX/WINE] * Move Wine DirectX related dlls to the appropriate folder. CORE-7495 #resolve

Author: akhaldi
Date: Sun Sep 29 16:10:32 2013
New Revision: 60454

URL: http://svn.reactos.org/svn/reactos?rev=60454&view=rev
Log:
[DIRECTX/WINE]
* Move Wine DirectX related dlls to the appropriate folder.
CORE-7495 #resolve

Added:
    trunk/reactos/dll/directx/wine/amstream/
      - copied from r60450, trunk/reactos/dll/directx/amstream/
    trunk/reactos/dll/directx/wine/dinput/
      - copied from r60450, trunk/reactos/dll/directx/dinput/
    trunk/reactos/dll/directx/wine/dinput8/
      - copied from r60450, trunk/reactos/dll/directx/dinput8/
    trunk/reactos/dll/directx/wine/dmusic/
      - copied from r60450, trunk/reactos/dll/directx/dmusic/
    trunk/reactos/dll/directx/wine/dplay/
      - copied from r60450, trunk/reactos/dll/directx/dplay/
    trunk/reactos/dll/directx/wine/dplayx/
      - copied from r60450, trunk/reactos/dll/directx/dplayx/
    trunk/reactos/dll/directx/wine/dsound/
      - copied from r60450, trunk/reactos/dll/directx/dsound/
    trunk/reactos/dll/directx/wine/dxdiagn/
      - copied from r60450, trunk/reactos/dll/directx/dxdiagn/
    trunk/reactos/dll/directx/wine/dxgi/
      - copied from r60450, trunk/reactos/dll/directx/dxgi/
    trunk/reactos/dll/directx/wine/msdmo/
      - copied from r60450, trunk/reactos/dll/directx/msdmo/
    trunk/reactos/dll/directx/wine/qedit/
      - copied from r60450, trunk/reactos/dll/directx/qedit/
    trunk/reactos/dll/directx/wine/quartz/
      - copied from r60450, trunk/reactos/dll/directx/quartz/
Removed:
    trunk/reactos/dll/directx/amstream/
    trunk/reactos/dll/directx/dinput/
    trunk/reactos/dll/directx/dinput8/
    trunk/reactos/dll/directx/dmusic/
    trunk/reactos/dll/directx/dplay/
    trunk/reactos/dll/directx/dplayx/
    trunk/reactos/dll/directx/dsound/
    trunk/reactos/dll/directx/dxdiagn/
    trunk/reactos/dll/directx/dxgi/
    trunk/reactos/dll/directx/msdmo/
    trunk/reactos/dll/directx/qedit/
    trunk/reactos/dll/directx/quartz/
Modified:
    trunk/reactos/dll/directx/CMakeLists.txt
    trunk/reactos/dll/directx/wine/CMakeLists.txt
    trunk/reactos/media/doc/README.WINE

Modified: trunk/reactos/dll/directx/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/CMakeLists.txt…
==============================================================================
--- trunk/reactos/dll/directx/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/CMakeLists.txt	[iso-8859-1] Sun Sep 29 16:10:32 2013
@@ -1,25 +1,13 @@
 
-add_subdirectory(amstream)
 add_subdirectory(d3d8thk)
 #add_subdirectory(bdaplgin) #disabled in trunk
 #add_subdirectory(d3d8) #disabled in trunk, see wine subfolder
 #add_subdirectory(d3d9) #disabled in trunk, see wine subfolder
 #add_subdirectory(ddraw) #disabled in trunk, see wine subfolder
 add_subdirectory(devenum)
-add_subdirectory(dinput)
-add_subdirectory(dinput8)
-add_subdirectory(dmusic)
-add_subdirectory(dplay)
-add_subdirectory(dplayx)
-add_subdirectory(dsound)
 #add_subdirectory(dsound_new) #disabled in trunk
-add_subdirectory(dxdiagn)
-add_subdirectory(dxgi)
 #add_subdirectory(ksproxy) Not needed at the moment
 add_subdirectory(ksuser)
-add_subdirectory(msdmo)
 #add_subdirectory(msdvbnp) #disabled in trunk
 #add_subdirectory(msvidctl) #disabled in trunk
-add_subdirectory(qedit)
-add_subdirectory(quartz)
 add_subdirectory(wine)

Modified: trunk/reactos/dll/directx/wine/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/CMakeList…
==============================================================================
--- trunk/reactos/dll/directx/wine/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/reactos/dll/directx/wine/CMakeLists.txt	[iso-8859-1] Sun Sep 29 16:10:32 2013
@@ -1,4 +1,5 @@
 
+add_subdirectory(amstream)
 add_subdirectory(d3d8)
 add_subdirectory(d3d9)
 add_subdirectory(d3dcompiler_43)
@@ -24,4 +25,15 @@
 add_subdirectory(d3dx9_43)
 add_subdirectory(d3dxof)
 add_subdirectory(ddraw)
+add_subdirectory(dinput)
+add_subdirectory(dinput8)
+add_subdirectory(dmusic)
+add_subdirectory(dplay)
+add_subdirectory(dplayx)
+add_subdirectory(dsound)
+add_subdirectory(dxdiagn)
+add_subdirectory(dxgi)
+add_subdirectory(msdmo)
+add_subdirectory(qedit)
+add_subdirectory(quartz)
 add_subdirectory(wined3d)

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] Sun Sep 29 16:10:32 2013
@@ -27,24 +27,24 @@
 
 The following libraries are shared with Wine.
 
-reactos/dll/directx/amstream            # Synced to Wine-1.3.37
-reactos/dll/directx/dinput              # Synced to Wine-1.7.1
-reactos/dll/directx/dinput8             # Synced to Wine-1.5.26
-reactos/dll/directx/dmusic              # Synced to Wine-1.5.26
-reactos/dll/directx/dplay               # Synced to Wine-1.5.26
-reactos/dll/directx/dplayx              # Synced to Wine-1.5.26
-reactos/dll/directx/dsound              # Synced to Wine-1.5.26
-reactos/dll/directx/dxdiagn             # Synced to Wine-0_9_5
-reactos/dll/directx/dxgi                # Synced to Wine-1.7.1
-reactos/dll/directx/msdmo               # Autosync
-reactos/dll/directx/qedit               # Autosync
-reactos/dll/directx/quartz              # Synced to Wine-1.5.26
+reactos/dll/directx/wine/amstream       # Synced to Wine-1.3.37
 reactos/dll/directx/wine/d3d8           # Synced to Wine-1.7.1
 reactos/dll/directx/wine/d3d9           # Synced to Wine-1.7.1
 reactos/dll/directx/wine/d3dcompiler_43 # Synced to Wine-1.7.1
 reactos/dll/directx/wine/d3dx9_24 => 43 # Synced to Wine-1.7.1
 reactos/dll/directx/wine/d3dxof         # Synced to Wine-1.7.1
 reactos/dll/directx/wine/ddraw          # Synced to Wine-1.7.1
+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/dplayx         # Synced to Wine-1.5.26
+reactos/dll/directx/wine/dsound         # Synced to Wine-1.5.26
+reactos/dll/directx/wine/dxdiagn        # Synced to Wine-0_9_5
+reactos/dll/directx/wine/dxgi           # Synced to Wine-1.7.1
+reactos/dll/directx/wine/msdmo          # Autosync
+reactos/dll/directx/wine/qedit          # Autosync
+reactos/dll/directx/wine/quartz         # Synced to Wine-1.5.26
 reactos/dll/directx/wine/wined3d        # Synced to Wine-1.7.1
 
 reactos/dll/win32/activeds        # Synced to Wine-1.1.43?