d3dcompiler: Move shader assembler implementation from d3dx9_36.

.gitignore

@@ -44,9 +44,9 @@ dlls/actxprxy/actxprxy_urlhist_p.c
 dlls/advapi32/svcctl.h
 dlls/advapi32/svcctl_c.c
 dlls/atl/atliface.h
-dlls/d3dx9_36/asmshader.tab.c
-dlls/d3dx9_36/asmshader.tab.h
-dlls/d3dx9_36/asmshader.yy.c
+dlls/d3dcompiler_43/asmshader.tab.c
+dlls/d3dcompiler_43/asmshader.tab.h
+dlls/d3dcompiler_43/asmshader.yy.c
 dlls/dispex/disp_ex.h
 dlls/dispex/disp_ex_p.c
 dlls/dxdiagn/fil_data.h

dlls/d3dcompiler_43/Makefile.in

@@ -5,12 +5,19 @@ VPATH     = @srcdir@
 MODULE    = d3dcompiler_43.dll
 IMPORTLIB = d3dcompiler
 IMPORTS   = dxguid uuid
+EXTRALIBS = $(LIBWPP)
 
 C_SRCS = \
+	asmparser.c \
+	asmutils.c \
 	blob.c \
+	bytecodewriter.c \
 	compiler.c \
 	d3dcompiler_43_main.c
 
+LEX_SRCS = asmshader.l
+BISON_SRCS = asmshader.y
+
 RC_SRCS = version.rc
 
 @MAKE_DLL_RULES@

dlls/d3dx9_36/asmparser.c → dlls/d3dcompiler_43/asmparser.c

@@ -24,7 +24,7 @@
 #include "wine/port.h"
 #include "wine/debug.h"
 
-#include "d3dx9_36_private.h"
+#include "d3dcompiler_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(asmshader);
 WINE_DECLARE_DEBUG_CHANNEL(parsed_shader);

dlls/d3dx9_36/asmshader.l → dlls/d3dcompiler_43/asmshader.l

@@ -24,7 +24,7 @@
 #include "wine/port.h"
 #include "wine/debug.h"
 
-#include "d3dx9_36_private.h"
+#include "d3dcompiler_private.h"
 #include "asmshader.tab.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(asmshader);

dlls/d3dx9_36/asmshader.y → dlls/d3dcompiler_43/asmshader.y

@@ -24,7 +24,7 @@
 #include "wine/port.h"
 #include "wine/debug.h"
 
-#include "d3dx9_36_private.h"
+#include "d3dcompiler_private.h"
 
 #include <stdio.h>
 

dlls/d3dx9_36/asmutils.c → dlls/d3dcompiler_43/asmutils.c

@@ -23,7 +23,8 @@
 #include "config.h"
 #include "wine/debug.h"
 
-#include "d3dx9_36_private.h"
+#include "d3d9types.h"
+#include "d3dcompiler_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(asmshader);
 

dlls/d3dx9_36/bytecodewriter.c → dlls/d3dcompiler_43/bytecodewriter.c

@@ -24,7 +24,8 @@
 #include "wine/port.h"
 #include "wine/debug.h"
 
-#include "d3dx9_36_private.h"
+#include "d3d9types.h"
+#include "d3dcompiler_private.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(asmshader);
 

dlls/d3dx9_36/Makefile.in

@@ -4,13 +4,9 @@ SRCDIR    = @srcdir@
 VPATH     = @srcdir@
 MODULE    = d3dx9_36.dll
 IMPORTLIB = d3dx9
-IMPORTS   = d3d9 ole32 gdi32 user32
-EXTRALIBS = $(LIBWPP)
+IMPORTS   = d3d9 d3dcompiler ole32 gdi32 user32
 
 C_SRCS = \
-	asmparser.c \
-	asmutils.c \
-	bytecodewriter.c \
 	core.c \
 	d3dx9_36_main.c \
 	effect.c \
@@ -25,9 +21,6 @@ C_SRCS = \
 	util.c \
 	volume.c
 
-LEX_SRCS = asmshader.l
-BISON_SRCS = asmshader.y
-
 RC_SRCS = version.rc
 
 @MAKE_DLL_RULES@