mirror of
https://github.com/reactos/reactos.git
synced 2024-07-12 07:35:10 +00:00
81cffd7658
Avoid regressions CORE-14955 "Ddraw fullscreen crashes" and CORE-15652 This brings us back to before guilty commit 0.4.10-dev-55-g7af3969e9fand therefore downgrades dll/directx/wine/ D3D8,D3D9,DDRAW,D3DCOMPILER_43,WINED3D to WineStaging 3.3. 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. Amine Khaldi agreed to perform this revert also for master now. 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. squashed commit of 0.4.13-RC-2-g67dd70e5efand 0.4.13-RC-3-g9f1e2cd172
43 lines
1.1 KiB
CMake
43 lines
1.1 KiB
CMake
|
|
add_definitions(
|
|
-D__WINESRC__
|
|
-DDIRECT3D_VERSION=0x0900)
|
|
|
|
include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/wine)
|
|
spec2def(d3dcompiler_43.dll d3dcompiler_43.spec ADD_IMPORTLIB)
|
|
|
|
list(APPEND SOURCE
|
|
asmparser.c
|
|
asmshader.tab.c
|
|
asmshader.yy.c
|
|
blob.c
|
|
bytecodewriter.c
|
|
compiler.c
|
|
hlsl.tab.c
|
|
hlsl.yy.c
|
|
main.c
|
|
reflection.c
|
|
utils.c
|
|
precomp.h
|
|
${CMAKE_CURRENT_BINARY_DIR}/d3dcompiler_43_stubs.c)
|
|
|
|
add_library(d3dcompiler_43 MODULE
|
|
${SOURCE}
|
|
version.rc
|
|
${CMAKE_CURRENT_BINARY_DIR}/d3dcompiler_43.def)
|
|
|
|
# some files have been generated with relative file paths...
|
|
set_source_files_properties(
|
|
asmshader.tab.c
|
|
asmshader.yy.c
|
|
hlsl.tab.c
|
|
hlsl.yy.c
|
|
PROPERTIES COMPILE_FLAGS "-UREACTOS_SOURCE_DIR -DREACTOS_SOURCE_DIR=\"\\\".\\\"\"")
|
|
|
|
set_module_type(d3dcompiler_43 win32dll)
|
|
target_link_libraries(d3dcompiler_43 dx10guid uuid wine wpp)
|
|
add_importlibs(d3dcompiler_43 msvcrt kernel32 ntdll)
|
|
add_dependencies(d3dcompiler_43 d3d_idl_headers)
|
|
#add_pch(d3dcompiler_43 precomp.h SOURCE)
|
|
add_cd_file(TARGET d3dcompiler_43 DESTINATION reactos/system32 FOR all)
|