Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-07-11 23:25:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WINED3D]

Browse source 
- 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
This commit is contained in:
Jérôme Gardou 2014-10-13 16:04:40 +00:00
parent 43b5d75525
commit 5d13c65d57
5 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/directx/wine/d3d8/CMakeLists.txt
View file

@ -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)

2
reactos/dll/directx/wine/d3d9/CMakeLists.txt
View file

@ -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)

2
reactos/dll/directx/wine/ddraw/CMakeLists.txt
View file

@ -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)

2
reactos/dll/directx/wine/dxgi/CMakeLists.txt
View file

@ -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)

18
reactos/dll/directx/wine/wined3d/CMakeLists.txt
View file

@ -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)