mirror of
https://github.com/reactos/reactos.git
synced 2024-07-12 15:45:20 +00:00
67dd70e5ef
This brings us back to before guilty commit 0.4.10-dev-55-g7af3969e9fand therefore downgrades dll/directx/wine/ D3D8,D3D9,DDRAW,D3DCOMPILER_43 to WineStaging 3.3 for this rls. Also downgrades related header sdk/include/reactos/wine/wined3d.h and for the first time also media/doc/README.WINE Same versions of these dlls we had in every ros rls since 0.4.10rls. Purpose of this revert is to fix crashes when Ddraw apps switch into fullscreen with VBEMP and inbuilt Mesa. I tested, before: DxDiag crashed when switching to fullscreen (CORE-14955), Diablo II crashed immediately (CORE-15652), Monster-Truck-Madness 2 demo crashed after main menu Afterwards all of these apps do run. DXTN does still work after that, even with VBEMP and inbuilt Mesa. This will be the interim fix, which I will keep for rls at least until someone manages to fix CORE-14955 properly in master with current Wine. analog to 0.4.10-RC-17-gbb4c55d650
43 lines
1 KiB
CMake
43 lines
1 KiB
CMake
|
|
add_definitions(
|
|
-D__WINESRC__
|
|
-DUSE_WIN32_OPENGL)
|
|
|
|
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
|
|
|
|
spec2def(ddraw.dll ddraw.spec ADD_IMPORTLIB)
|
|
|
|
list(APPEND SOURCE
|
|
clipper.c
|
|
ddraw.c
|
|
device.c
|
|
executebuffer.c
|
|
light.c
|
|
main.c
|
|
material.c
|
|
palette.c
|
|
surface.c
|
|
utils.c
|
|
vertexbuffer.c
|
|
viewport.c
|
|
precomp.h
|
|
${CMAKE_CURRENT_BINARY_DIR}/ddraw_stubs.c)
|
|
|
|
if(MSVC)
|
|
# FIXME: http://www.cmake.org/Bug/view.php?id=12998
|
|
#add_target_compile_flags(ddraw "/FIwine/typeof.h")
|
|
set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "/FIwine/typeof.h")
|
|
endif()
|
|
|
|
add_library(ddraw SHARED
|
|
${SOURCE}
|
|
ddraw.rc
|
|
${CMAKE_CURRENT_BINARY_DIR}/ddraw.def)
|
|
|
|
set_module_type(ddraw win32dll)
|
|
target_link_libraries(ddraw wine uuid dxguid ${PSEH_LIB})
|
|
add_importlibs(ddraw advapi32 gdi32 user32 d3dwine msvcrt kernel32 ntdll)
|
|
add_dependencies(ddraw wineheaders)
|
|
add_pch(ddraw precomp.h SOURCE)
|
|
add_cd_file(TARGET ddraw DESTINATION reactos/system32 FOR all)
|