[PATCH] d3dcompiler.h: Define D3DCOMPILER_DLL to d3dcompiler_47.dll.

[Jacek Caban]

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com>
---
This is consistent with importlib.

  include/d3dcompiler.h | 8 ++++----
  1 file changed, 4 insertions(+), 4 deletions(-)

[Matteo Bruni]

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>

[PATCH] include: Define D3D_COMPILER_VERSION.

[Matteo Bruni]

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
---
 include/d3dcompiler.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h
index 148e958cfda..c5fd9973554 100644
--- a/include/d3dcompiler.h
+++ b/include/d3dcompiler.h
@@ -19,6 +19,8 @@
 #ifndef __D3DCOMPILER_H__
 #define __D3DCOMPILER_H__
 
+#define D3D_COMPILER_VERSION 47
+
 #include "d3d11shader.h"
 
 #ifdef __cplusplus
-- 
2.19.2

[PATCH] include: Define D3D_COMPILER_VERSION.

[Alexandre Julliard]

Matteo Bruni <mbruni(a)codeweavers.com> writes:
> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com>
> ---
>  include/d3dcompiler.h | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/include/d3dcompiler.h b/include/d3dcompiler.h
> index 148e958cfda..c5fd9973554 100644
> --- a/include/d3dcompiler.h
> +++ b/include/d3dcompiler.h
> @@ -19,6 +19,8 @@
>  #ifndef __D3DCOMPILER_H__
>  #define __D3DCOMPILER_H__
>
> +#define D3D_COMPILER_VERSION 47

This is causing warnings:

gcc -m32 -c -o asmparser.o ../d3dcompiler_43/asmparser.c -I. -I../d3dcompiler_43 -I../../include -D__WINESRC__ \
  -DD3D_COMPILER_VERSION=33 -D_REENTRANT -fPIC -Wall -pipe -fno-strict-aliasing \
  -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers -Wshift-overflow=2 \
  -Wstrict-prototypes -Wtype-limits -Wunused-but-set-parameter -Wvla -Wwrite-strings -Wpointer-arith \
  -Wlogical-op -gdwarf-2 -gstrict-dwarf -fno-omit-frame-pointer -Werror -g -O2 -fno-diagnostics-show-caret
In file included from ../d3dcompiler_43/d3dcompiler_private.h:34:0,
                 from ../d3dcompiler_43/asmparser.c:27:
../../include/d3dcompiler.h:22:0: error: "D3D_COMPILER_VERSION" redefined [-Werror]
<command-line>:0:0: note: this is the location of the previous definition
cc1: all warnings being treated as errors
make[1]: *** [Makefile:184: asmparser.o] Error 1

-- 
Alexandre Julliard
julliard(a)winehq.org