[WINED3D]

 - Rename wined3d.dll as d3dwine.dll, so that the VBox additions don't erase it.
Dedicated to Daniel: Now you can safely use the opti-hacked vbox 3d additions.

svn path=/trunk/; revision=64724

diff --git a/reactos/dll/directx/wine/d3d8/CMakeLists.txt b/reactos/dll/directx/wine/d3d8/CMakeLists.txt
index cb111ae..5e3f473 100644 (file)
--- a/reactos/dll/directx/wine/d3d8/CMakeLists.txt
+++ b/reactos/dll/directx/wine/d3d8/CMakeLists.txt
@@ -28,6 +28,6 @@ add_library(d3d8 SHARED
 
 set_module_type(d3d8 win32dll UNICODE HOTPATCHABLE)
 target_link_libraries(d3d8 uuid wine)
-add_importlibs(d3d8 wined3d msvcrt kernel32 ntdll)
+add_importlibs(d3d8 d3dwine msvcrt kernel32 ntdll)
 add_pch(d3d8 d3d8_private.h SOURCE)
 add_cd_file(TARGET d3d8 DESTINATION reactos/system32 FOR all)

diff --git a/reactos/dll/directx/wine/d3d9/CMakeLists.txt b/reactos/dll/directx/wine/d3d9/CMakeLists.txt
index 330dc93..4cc1ad1 100644 (file)
--- a/reactos/dll/directx/wine/d3d9/CMakeLists.txt
+++ b/reactos/dll/directx/wine/d3d9/CMakeLists.txt
@@ -31,6 +31,6 @@ add_library(d3d9 SHARED
 
 set_module_type(d3d9 win32dll UNICODE HOTPATCHABLE)
 target_link_libraries(d3d9 wine)
-add_importlibs(d3d9 wined3d msvcrt kernel32 ntdll)
+add_importlibs(d3d9 d3dwine msvcrt kernel32 ntdll)
 add_pch(d3d9 d3d9_private.h SOURCE)
 add_cd_file(TARGET d3d9 DESTINATION reactos/system32 FOR all)

diff --git a/reactos/dll/directx/wine/ddraw/CMakeLists.txt b/reactos/dll/directx/wine/ddraw/CMakeLists.txt
index aa34f17..7de597c 100644 (file)
--- a/reactos/dll/directx/wine/ddraw/CMakeLists.txt
+++ b/reactos/dll/directx/wine/ddraw/CMakeLists.txt
@@ -36,7 +36,7 @@ add_library(ddraw SHARED
 
 set_module_type(ddraw win32dll HOTPATCHABLE)
 target_link_libraries(ddraw wine uuid dxguid ${PSEH_LIB})
-add_importlibs(ddraw advapi32 gdi32 user32 wined3d msvcrt kernel32 ntdll)
+add_importlibs(ddraw advapi32 gdi32 user32 d3dwine msvcrt kernel32 ntdll)
 add_dependencies(ddraw wineheaders)
 add_pch(ddraw ddraw_private.h SOURCE)
 add_cd_file(TARGET ddraw DESTINATION reactos/system32 FOR all)

diff --git a/reactos/dll/directx/wine/dxgi/CMakeLists.txt b/reactos/dll/directx/wine/dxgi/CMakeLists.txt
index 3d79522..53dc609 100644 (file)
--- a/reactos/dll/directx/wine/dxgi/CMakeLists.txt
+++ b/reactos/dll/directx/wine/dxgi/CMakeLists.txt
@@ -23,7 +23,7 @@ add_library(dxgi SHARED
 
 set_module_type(dxgi win32dll)
 target_link_libraries(dxgi uuid dxgi_uuids wine)
-add_importlibs(dxgi wined3d user32 msvcrt kernel32 ntdll)
+add_importlibs(dxgi d3dwine user32 msvcrt kernel32 ntdll)
 add_dependencies(dxgi wineheaders)
 add_pch(dxgi dxgi_private.h SOURCE)
 add_cd_file(TARGET dxgi DESTINATION reactos/system32 FOR all)

diff --git a/reactos/dll/directx/wine/wined3d/CMakeLists.txt b/reactos/dll/directx/wine/wined3d/CMakeLists.txt
index ade664a..46157e3 100644 (file)
--- a/reactos/dll/directx/wine/wined3d/CMakeLists.txt
+++ b/reactos/dll/directx/wine/wined3d/CMakeLists.txt
@@ -6,7 +6,9 @@ add_definitions(
 
 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
 
-spec2def(wined3d.dll wined3d.spec ADD_IMPORTLIB)
+# We name this d3dwine.dll, because the Virtualbox additions ship with a custom wined3d.dll
+# and it breaks everything if it is installed.
+spec2def(d3dwine.dll wined3d.spec ADD_IMPORTLIB)
 
 list(APPEND SOURCE
     arb_program_shader.c
@@ -39,18 +41,18 @@ list(APPEND SOURCE
     wined3d_main.c
     wined3d_private.h)
 
-add_library(wined3d SHARED
+add_library(d3dwine SHARED
     ${SOURCE}
     version.rc
     ${CMAKE_CURRENT_BINARY_DIR}/wined3d.def)
 
-set_module_type(wined3d win32dll)
-target_link_libraries(wined3d wine)
+set_module_type(d3dwine win32dll)
+target_link_libraries(d3dwine wine)
 
 if(CMAKE_C_COMPILER_ID STREQUAL "Clang")
-    target_link_libraries(wined3d mingwex)
+    target_link_libraries(d3dwine mingwex)
 endif()
 
-add_importlibs(wined3d user32 opengl32 gdi32 advapi32 msvcrt kernel32 ntdll)
-add_pch(wined3d wined3d_private.h SOURCE)
-add_cd_file(TARGET wined3d DESTINATION reactos/system32 FOR all)
+add_importlibs(d3dwine user32 opengl32 gdi32 advapi32 msvcrt kernel32 ntdll)
+add_pch(d3dwine wined3d_private.h SOURCE)
+add_cd_file(TARGET d3dwine DESTINATION reactos/system32 FOR all)