[PATCH 0/4] MR10967: Prefer builtin for d3d helper libraries.
From: Elizabeth Figura <zfigura@codeweavers.com> --- dlls/d3dcompiler_33/Makefile.in | 2 -- dlls/d3dcompiler_34/Makefile.in | 2 -- dlls/d3dcompiler_35/Makefile.in | 2 -- dlls/d3dcompiler_36/Makefile.in | 2 -- dlls/d3dcompiler_37/Makefile.in | 2 -- dlls/d3dcompiler_38/Makefile.in | 2 -- dlls/d3dcompiler_39/Makefile.in | 2 -- dlls/d3dcompiler_40/Makefile.in | 2 -- dlls/d3dcompiler_41/Makefile.in | 2 -- dlls/d3dcompiler_42/Makefile.in | 2 -- dlls/d3dcompiler_43/Makefile.in | 2 -- dlls/d3dcompiler_46/Makefile.in | 2 -- dlls/d3dcompiler_47/Makefile.in | 2 -- 13 files changed, 26 deletions(-) diff --git a/dlls/d3dcompiler_33/Makefile.in b/dlls/d3dcompiler_33/Makefile.in index 5753a0a3015..da851b304b6 100644 --- a/dlls/d3dcompiler_33/Makefile.in +++ b/dlls/d3dcompiler_33/Makefile.in @@ -4,8 +4,6 @@ EXTRADEFS = -DD3D_COMPILER_VERSION=33 PARENTSRC = ../d3dcompiler_43 EXTRAINCL = $(VKD3D_PE_CFLAGS) -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DCompiler" VER_PRODUCTVERSION = 9,18,904,15 diff --git a/dlls/d3dcompiler_34/Makefile.in b/dlls/d3dcompiler_34/Makefile.in index 7b153d5fbbd..ced563f9e5c 100644 --- a/dlls/d3dcompiler_34/Makefile.in +++ b/dlls/d3dcompiler_34/Makefile.in @@ -4,8 +4,6 @@ EXTRADEFS = -DD3D_COMPILER_VERSION=34 PARENTSRC = ../d3dcompiler_43 EXTRAINCL = $(VKD3D_PE_CFLAGS) -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DCompiler" VER_PRODUCTVERSION = 9,19,949,46 diff --git a/dlls/d3dcompiler_35/Makefile.in b/dlls/d3dcompiler_35/Makefile.in index aeff9d45c80..4ee53daa6f1 100644 --- a/dlls/d3dcompiler_35/Makefile.in +++ b/dlls/d3dcompiler_35/Makefile.in @@ -4,8 +4,6 @@ EXTRADEFS = -DD3D_COMPILER_VERSION=35 PARENTSRC = ../d3dcompiler_43 EXTRAINCL = $(VKD3D_PE_CFLAGS) -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DCompiler" VER_PRODUCTVERSION = 9,19,949,1104 diff --git a/dlls/d3dcompiler_36/Makefile.in b/dlls/d3dcompiler_36/Makefile.in index 9ec957705ab..714357b40a6 100644 --- a/dlls/d3dcompiler_36/Makefile.in +++ b/dlls/d3dcompiler_36/Makefile.in @@ -4,8 +4,6 @@ EXTRADEFS = -DD3D_COMPILER_VERSION=36 PARENTSRC = ../d3dcompiler_43 EXTRAINCL = $(VKD3D_PE_CFLAGS) -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DCompiler" VER_PRODUCTVERSION = 9,19,949,2111 diff --git a/dlls/d3dcompiler_37/Makefile.in b/dlls/d3dcompiler_37/Makefile.in index 60f2597d13c..3052b3a0221 100644 --- a/dlls/d3dcompiler_37/Makefile.in +++ b/dlls/d3dcompiler_37/Makefile.in @@ -4,8 +4,6 @@ EXTRADEFS = -DD3D_COMPILER_VERSION=37 PARENTSRC = ../d3dcompiler_43 EXTRAINCL = $(VKD3D_PE_CFLAGS) -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DCompiler" VER_PRODUCTVERSION = 9,22,949,2248 diff --git a/dlls/d3dcompiler_38/Makefile.in b/dlls/d3dcompiler_38/Makefile.in index 11e680c02e0..219bd46e489 100644 --- a/dlls/d3dcompiler_38/Makefile.in +++ b/dlls/d3dcompiler_38/Makefile.in @@ -4,8 +4,6 @@ EXTRADEFS = -DD3D_COMPILER_VERSION=38 PARENTSRC = ../d3dcompiler_43 EXTRAINCL = $(VKD3D_PE_CFLAGS) -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DCompiler" VER_PRODUCTVERSION = 9,23,949,2378 diff --git a/dlls/d3dcompiler_39/Makefile.in b/dlls/d3dcompiler_39/Makefile.in index b085a8ee682..803dd6fe0a5 100644 --- a/dlls/d3dcompiler_39/Makefile.in +++ b/dlls/d3dcompiler_39/Makefile.in @@ -5,8 +5,6 @@ EXTRADEFS = -DD3D_COMPILER_VERSION=39 PARENTSRC = ../d3dcompiler_43 EXTRAINCL = $(VKD3D_PE_CFLAGS) -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DCompiler" VER_PRODUCTVERSION = 9,24,949,2307 diff --git a/dlls/d3dcompiler_40/Makefile.in b/dlls/d3dcompiler_40/Makefile.in index 8c7702f3e11..30955de9de0 100644 --- a/dlls/d3dcompiler_40/Makefile.in +++ b/dlls/d3dcompiler_40/Makefile.in @@ -4,8 +4,6 @@ EXTRADEFS = -DD3D_COMPILER_VERSION=40 PARENTSRC = ../d3dcompiler_43 EXTRAINCL = $(VKD3D_PE_CFLAGS) -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DCompiler" VER_PRODUCTVERSION = 9,24,950,2656 diff --git a/dlls/d3dcompiler_41/Makefile.in b/dlls/d3dcompiler_41/Makefile.in index cf80961b82f..018cebb6998 100644 --- a/dlls/d3dcompiler_41/Makefile.in +++ b/dlls/d3dcompiler_41/Makefile.in @@ -4,8 +4,6 @@ EXTRADEFS = -DD3D_COMPILER_VERSION=41 PARENTSRC = ../d3dcompiler_43 EXTRAINCL = $(VKD3D_PE_CFLAGS) -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DCompiler" VER_PRODUCTVERSION = 9,26,952,2844 diff --git a/dlls/d3dcompiler_42/Makefile.in b/dlls/d3dcompiler_42/Makefile.in index a6c7ef5e493..57488b1250d 100644 --- a/dlls/d3dcompiler_42/Makefile.in +++ b/dlls/d3dcompiler_42/Makefile.in @@ -5,8 +5,6 @@ EXTRADEFS = -DD3D_COMPILER_VERSION=42 PARENTSRC = ../d3dcompiler_43 EXTRAINCL = $(VKD3D_PE_CFLAGS) -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DCompiler" VER_PRODUCTVERSION = 9,27,952,3022 diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in index 2b9e53fd3ce..9b33433fa26 100644 --- a/dlls/d3dcompiler_43/Makefile.in +++ b/dlls/d3dcompiler_43/Makefile.in @@ -4,8 +4,6 @@ EXTRADEFS = -DD3D_COMPILER_VERSION=43 IMPORTS = wined3d EXTRAINCL = $(VKD3D_PE_CFLAGS) -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DCompiler" VER_PRODUCTVERSION = 9,29,952,3111 diff --git a/dlls/d3dcompiler_46/Makefile.in b/dlls/d3dcompiler_46/Makefile.in index 0c6a71ae014..0955c2ec881 100644 --- a/dlls/d3dcompiler_46/Makefile.in +++ b/dlls/d3dcompiler_46/Makefile.in @@ -5,8 +5,6 @@ EXTRADEFS = -DD3D_COMPILER_VERSION=46 PARENTSRC = ../d3dcompiler_43 EXTRAINCL = $(VKD3D_PE_CFLAGS) -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DCompiler" VER_PRODUCTVERSION = 9,30,9200,20789 diff --git a/dlls/d3dcompiler_47/Makefile.in b/dlls/d3dcompiler_47/Makefile.in index f247b5bea48..4891ec909ff 100644 --- a/dlls/d3dcompiler_47/Makefile.in +++ b/dlls/d3dcompiler_47/Makefile.in @@ -5,8 +5,6 @@ EXTRADEFS = -DD3D_COMPILER_VERSION=47 PARENTSRC = ../d3dcompiler_43 EXTRAINCL = $(VKD3D_PE_CFLAGS) -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DCompiler" VER_PRODUCTVERSION = 6,3,9600,16984 -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10967
From: Elizabeth Figura <zfigura@codeweavers.com> --- dlls/d3dx9_24/Makefile.in | 2 -- dlls/d3dx9_25/Makefile.in | 2 -- dlls/d3dx9_26/Makefile.in | 2 -- dlls/d3dx9_27/Makefile.in | 2 -- dlls/d3dx9_28/Makefile.in | 2 -- dlls/d3dx9_29/Makefile.in | 2 -- dlls/d3dx9_30/Makefile.in | 2 -- dlls/d3dx9_31/Makefile.in | 2 -- dlls/d3dx9_32/Makefile.in | 2 -- dlls/d3dx9_33/Makefile.in | 2 -- dlls/d3dx9_34/Makefile.in | 2 -- dlls/d3dx9_35/Makefile.in | 2 -- dlls/d3dx9_36/Makefile.in | 2 -- dlls/d3dx9_37/Makefile.in | 2 -- dlls/d3dx9_38/Makefile.in | 2 -- dlls/d3dx9_39/Makefile.in | 2 -- dlls/d3dx9_40/Makefile.in | 2 -- dlls/d3dx9_41/Makefile.in | 2 -- dlls/d3dx9_42/Makefile.in | 2 -- dlls/d3dx9_43/Makefile.in | 2 -- 20 files changed, 40 deletions(-) diff --git a/dlls/d3dx9_24/Makefile.in b/dlls/d3dx9_24/Makefile.in index bbeea11efd5..a334ba1d505 100644 --- a/dlls/d3dx9_24/Makefile.in +++ b/dlls/d3dx9_24/Makefile.in @@ -4,8 +4,6 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX9" VER_PRODUCTVERSION = 9,5,132,0 diff --git a/dlls/d3dx9_25/Makefile.in b/dlls/d3dx9_25/Makefile.in index 8dbf33bb11e..b7c0f9e9bb2 100644 --- a/dlls/d3dx9_25/Makefile.in +++ b/dlls/d3dx9_25/Makefile.in @@ -4,8 +4,6 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX9" VER_PRODUCTVERSION = 9,6,168,0 diff --git a/dlls/d3dx9_26/Makefile.in b/dlls/d3dx9_26/Makefile.in index b53e3662072..c8a9bc79379 100644 --- a/dlls/d3dx9_26/Makefile.in +++ b/dlls/d3dx9_26/Makefile.in @@ -4,8 +4,6 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX9" VER_PRODUCTVERSION = 9,7,239,0 diff --git a/dlls/d3dx9_27/Makefile.in b/dlls/d3dx9_27/Makefile.in index 49215e3e945..38d744726cf 100644 --- a/dlls/d3dx9_27/Makefile.in +++ b/dlls/d3dx9_27/Makefile.in @@ -4,8 +4,6 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX9" VER_PRODUCTVERSION = 9,8,299,0 diff --git a/dlls/d3dx9_28/Makefile.in b/dlls/d3dx9_28/Makefile.in index 97a90407957..8ce266b7918 100644 --- a/dlls/d3dx9_28/Makefile.in +++ b/dlls/d3dx9_28/Makefile.in @@ -4,8 +4,6 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX9" VER_PRODUCTVERSION = 9,10,455,0 diff --git a/dlls/d3dx9_29/Makefile.in b/dlls/d3dx9_29/Makefile.in index cecbb8e72ee..331613f8ba9 100644 --- a/dlls/d3dx9_29/Makefile.in +++ b/dlls/d3dx9_29/Makefile.in @@ -4,8 +4,6 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX9" VER_PRODUCTVERSION = 9,11,519,0 diff --git a/dlls/d3dx9_30/Makefile.in b/dlls/d3dx9_30/Makefile.in index 3d5c4ea2c24..7f079ebb693 100644 --- a/dlls/d3dx9_30/Makefile.in +++ b/dlls/d3dx9_30/Makefile.in @@ -4,8 +4,6 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX9" VER_PRODUCTVERSION = 9,12,589,0 diff --git a/dlls/d3dx9_31/Makefile.in b/dlls/d3dx9_31/Makefile.in index 510ae3d559c..7a829b7fd8d 100644 --- a/dlls/d3dx9_31/Makefile.in +++ b/dlls/d3dx9_31/Makefile.in @@ -4,8 +4,6 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX9" VER_PRODUCTVERSION = 9,15,779,0 diff --git a/dlls/d3dx9_32/Makefile.in b/dlls/d3dx9_32/Makefile.in index 0cf465904b8..5546e9b860b 100644 --- a/dlls/d3dx9_32/Makefile.in +++ b/dlls/d3dx9_32/Makefile.in @@ -4,8 +4,6 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX9" VER_PRODUCTVERSION = 9,16,843,0 diff --git a/dlls/d3dx9_33/Makefile.in b/dlls/d3dx9_33/Makefile.in index 72e0b85610d..96bdefddd5b 100644 --- a/dlls/d3dx9_33/Makefile.in +++ b/dlls/d3dx9_33/Makefile.in @@ -4,8 +4,6 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX9" VER_PRODUCTVERSION = 9,18,904,15 diff --git a/dlls/d3dx9_34/Makefile.in b/dlls/d3dx9_34/Makefile.in index 99f3bd79950..7d8c9de8ff5 100644 --- a/dlls/d3dx9_34/Makefile.in +++ b/dlls/d3dx9_34/Makefile.in @@ -4,8 +4,6 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX9" VER_PRODUCTVERSION = 9,19,949,46 diff --git a/dlls/d3dx9_35/Makefile.in b/dlls/d3dx9_35/Makefile.in index b298c82b2d7..613bd1e4938 100644 --- a/dlls/d3dx9_35/Makefile.in +++ b/dlls/d3dx9_35/Makefile.in @@ -5,8 +5,6 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX9" VER_PRODUCTVERSION = 9,19,949,1104 diff --git a/dlls/d3dx9_36/Makefile.in b/dlls/d3dx9_36/Makefile.in index 29719008e68..c6a2a39ff1c 100644 --- a/dlls/d3dx9_36/Makefile.in +++ b/dlls/d3dx9_36/Makefile.in @@ -4,8 +4,6 @@ IMPORTLIB = d3dx9 IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d DELAYIMPORTS = windowscodecs -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX9" VER_PRODUCTVERSION = 9,19,949,2111 diff --git a/dlls/d3dx9_37/Makefile.in b/dlls/d3dx9_37/Makefile.in index 4e087bb193c..fe405d175d2 100644 --- a/dlls/d3dx9_37/Makefile.in +++ b/dlls/d3dx9_37/Makefile.in @@ -4,8 +4,6 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX9" VER_PRODUCTVERSION = 9,22,949,2248 diff --git a/dlls/d3dx9_38/Makefile.in b/dlls/d3dx9_38/Makefile.in index 78b80d6cb88..04ed15a8d27 100644 --- a/dlls/d3dx9_38/Makefile.in +++ b/dlls/d3dx9_38/Makefile.in @@ -4,8 +4,6 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX9" VER_PRODUCTVERSION = 9,23,949,2378 diff --git a/dlls/d3dx9_39/Makefile.in b/dlls/d3dx9_39/Makefile.in index bfb6fd503d3..b1593de0f46 100644 --- a/dlls/d3dx9_39/Makefile.in +++ b/dlls/d3dx9_39/Makefile.in @@ -4,8 +4,6 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX9" VER_PRODUCTVERSION = 9,24,949,2307 diff --git a/dlls/d3dx9_40/Makefile.in b/dlls/d3dx9_40/Makefile.in index b886ebf4040..010e34e312a 100644 --- a/dlls/d3dx9_40/Makefile.in +++ b/dlls/d3dx9_40/Makefile.in @@ -4,8 +4,6 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX9" VER_PRODUCTVERSION = 9,24,950,2656 diff --git a/dlls/d3dx9_41/Makefile.in b/dlls/d3dx9_41/Makefile.in index 12347095ce0..5b72c7d2546 100644 --- a/dlls/d3dx9_41/Makefile.in +++ b/dlls/d3dx9_41/Makefile.in @@ -4,8 +4,6 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 wined3d PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX9" VER_PRODUCTVERSION = 9,26,952,2844 diff --git a/dlls/d3dx9_42/Makefile.in b/dlls/d3dx9_42/Makefile.in index d0284b1e50d..8f865315e61 100644 --- a/dlls/d3dx9_42/Makefile.in +++ b/dlls/d3dx9_42/Makefile.in @@ -5,8 +5,6 @@ IMPORTS = d3d9 d3dcompiler_42 dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX9" VER_PRODUCTVERSION = 9,27,952,3001 diff --git a/dlls/d3dx9_43/Makefile.in b/dlls/d3dx9_43/Makefile.in index 98190b175dc..b9984e5f4fc 100644 --- a/dlls/d3dx9_43/Makefile.in +++ b/dlls/d3dx9_43/Makefile.in @@ -5,8 +5,6 @@ IMPORTS = d3d9 d3dcompiler_43 dxguid d3dxof ole32 gdi32 user32 PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX9" VER_PRODUCTVERSION = 9,29,952,3111 -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10967
From: Elizabeth Figura <zfigura@codeweavers.com> --- dlls/d3dx10_33/Makefile.in | 2 -- dlls/d3dx10_34/Makefile.in | 2 -- dlls/d3dx10_35/Makefile.in | 2 -- dlls/d3dx10_36/Makefile.in | 2 -- dlls/d3dx10_37/Makefile.in | 2 -- dlls/d3dx10_38/Makefile.in | 2 -- dlls/d3dx10_39/Makefile.in | 2 -- dlls/d3dx10_40/Makefile.in | 2 -- dlls/d3dx10_41/Makefile.in | 2 -- dlls/d3dx10_42/Makefile.in | 2 -- dlls/d3dx10_43/Makefile.in | 2 -- 11 files changed, 22 deletions(-) diff --git a/dlls/d3dx10_33/Makefile.in b/dlls/d3dx10_33/Makefile.in index fded1194421..f02dce6f7b2 100644 --- a/dlls/d3dx10_33/Makefile.in +++ b/dlls/d3dx10_33/Makefile.in @@ -1,8 +1,6 @@ MODULE = d3dx10_33.dll IMPORTLIB = d3dx10_33 -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX10" VER_PRODUCTVERSION = 9,18,904,21 diff --git a/dlls/d3dx10_34/Makefile.in b/dlls/d3dx10_34/Makefile.in index 44715164539..455d640856d 100644 --- a/dlls/d3dx10_34/Makefile.in +++ b/dlls/d3dx10_34/Makefile.in @@ -1,8 +1,6 @@ MODULE = d3dx10_34.dll IMPORTLIB = d3dx10_34 -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX10" VER_PRODUCTVERSION = 9,19,949,46 diff --git a/dlls/d3dx10_35/Makefile.in b/dlls/d3dx10_35/Makefile.in index 83cff7b6a84..10227d7f686 100644 --- a/dlls/d3dx10_35/Makefile.in +++ b/dlls/d3dx10_35/Makefile.in @@ -1,8 +1,6 @@ MODULE = d3dx10_35.dll IMPORTLIB = d3dx10_35 -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX10" VER_PRODUCTVERSION = 9,19,949,1104 diff --git a/dlls/d3dx10_36/Makefile.in b/dlls/d3dx10_36/Makefile.in index f77a1793f47..964932dd813 100644 --- a/dlls/d3dx10_36/Makefile.in +++ b/dlls/d3dx10_36/Makefile.in @@ -1,8 +1,6 @@ MODULE = d3dx10_36.dll IMPORTLIB = d3dx10_36 -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX10" VER_PRODUCTVERSION = 9,19,949,2009 diff --git a/dlls/d3dx10_37/Makefile.in b/dlls/d3dx10_37/Makefile.in index bb5a47dcd95..1c7a4c8e1c0 100644 --- a/dlls/d3dx10_37/Makefile.in +++ b/dlls/d3dx10_37/Makefile.in @@ -1,8 +1,6 @@ MODULE = d3dx10_37.dll IMPORTLIB = d3dx10_37 -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX10" VER_PRODUCTVERSION = 9,19,949,2187 diff --git a/dlls/d3dx10_38/Makefile.in b/dlls/d3dx10_38/Makefile.in index 43fb7a087a1..3cf97808fdc 100644 --- a/dlls/d3dx10_38/Makefile.in +++ b/dlls/d3dx10_38/Makefile.in @@ -1,8 +1,6 @@ MODULE = d3dx10_38.dll IMPORTLIB = d3dx10_38 -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX10" VER_PRODUCTVERSION = 9,23,949,2378 diff --git a/dlls/d3dx10_39/Makefile.in b/dlls/d3dx10_39/Makefile.in index f795bc0e384..2f83f5e2134 100644 --- a/dlls/d3dx10_39/Makefile.in +++ b/dlls/d3dx10_39/Makefile.in @@ -1,8 +1,6 @@ MODULE = d3dx10_39.dll IMPORTLIB = d3dx10_39 -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX10" VER_PRODUCTVERSION = 9,24,949,2307 diff --git a/dlls/d3dx10_40/Makefile.in b/dlls/d3dx10_40/Makefile.in index f287a86b9a2..4d4c7b1b5dc 100644 --- a/dlls/d3dx10_40/Makefile.in +++ b/dlls/d3dx10_40/Makefile.in @@ -1,8 +1,6 @@ MODULE = d3dx10_40.dll IMPORTLIB = d3dx10_40 -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX10" VER_PRODUCTVERSION = 9,24,950,2656 diff --git a/dlls/d3dx10_41/Makefile.in b/dlls/d3dx10_41/Makefile.in index 6f3f2650883..4d91f34ede1 100644 --- a/dlls/d3dx10_41/Makefile.in +++ b/dlls/d3dx10_41/Makefile.in @@ -1,8 +1,6 @@ MODULE = d3dx10_41.dll IMPORTLIB = d3dx10_41 -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX10" VER_PRODUCTVERSION = 9,26,952,2844 diff --git a/dlls/d3dx10_42/Makefile.in b/dlls/d3dx10_42/Makefile.in index 57116d63b30..22aa2a3ebd1 100644 --- a/dlls/d3dx10_42/Makefile.in +++ b/dlls/d3dx10_42/Makefile.in @@ -1,8 +1,6 @@ MODULE = d3dx10_42.dll IMPORTLIB = d3dx10_42 -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX10" VER_PRODUCTVERSION = 9,29,952,3001 diff --git a/dlls/d3dx10_43/Makefile.in b/dlls/d3dx10_43/Makefile.in index 6e593686d55..751087490c0 100644 --- a/dlls/d3dx10_43/Makefile.in +++ b/dlls/d3dx10_43/Makefile.in @@ -4,8 +4,6 @@ IMPORTS = d3d10_1 d3dcompiler dxguid uuid gdi32 ole32 user32 PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX10" VER_PRODUCTVERSION = 9,29,952,3111 -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10967
From: Elizabeth Figura <zfigura@codeweavers.com> --- dlls/d3dx11_42/Makefile.in | 2 -- dlls/d3dx11_43/Makefile.in | 2 -- 2 files changed, 4 deletions(-) diff --git a/dlls/d3dx11_42/Makefile.in b/dlls/d3dx11_42/Makefile.in index 965782dd57c..a2e5edde7d2 100644 --- a/dlls/d3dx11_42/Makefile.in +++ b/dlls/d3dx11_42/Makefile.in @@ -3,8 +3,6 @@ MODULE = d3dx11_42.dll IMPORTLIB = d3dx11_42 IMPORTS = d3dcompiler d3dx11 -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX11" VER_PRODUCTVERSION = 9,29,952,3111 diff --git a/dlls/d3dx11_43/Makefile.in b/dlls/d3dx11_43/Makefile.in index 2c600281fe0..e49a8c11c8d 100644 --- a/dlls/d3dx11_43/Makefile.in +++ b/dlls/d3dx11_43/Makefile.in @@ -5,8 +5,6 @@ IMPORTS = d3dcompiler gdi32 ole32 user32 PARENTSRC = ../d3dx9_36 DELAYIMPORTS = windowscodecs -EXTRADLLFLAGS = -Wb,--prefer-native - VER_FILEDESCRIPTION_STR = "Wine D3DX11" VER_PRODUCTVERSION = 9,29,952,3111 -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/10967
This merge request was approved by Matteo Bruni. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10967
Let the bugs come! \o/ -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10967#note_140987
I for one am excited to see more HLSL shaders. Bring it on, I'm ready ;-) -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10967#note_140989
We'll see how ready we are, but yes, we have to rip the bandaid at some point :D -- https://gitlab.winehq.org/wine/wine/-/merge_requests/10967#note_140990
participants (3)
-
Elizabeth Figura -
Elizabeth Figura (＠zfigura)
-
Matteo Bruni (＠Mystral)