d3dx9_42: Share the source with d3dx9_36.

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com> Signed-off-by: Matteo Bruni <mbruni@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

d3dx9_42: Share the source with d3dx9_36.
1b9f5c34 · Alistair Leslie-Hughes · Alexandre Julliard · ab2ef2dd · 1b9f5c34 · 1b9f5c34
Commit 1b9f5c34 authored Jun 22, 2016 by Alistair Leslie-Hughes Committed by Alexandre Julliard Jul 03, 2016
Showing with 21 additions and 4 deletions

Makefile.in dlls/d3dx9_42/Makefile.in +20 -2

d3dx9_42.spec dlls/d3dx9_42/d3dx9_42.spec +0 -0

d3dx9_42_main.c dlls/d3dx9_42/d3dx9_42_main.c +1 -1

make_specfiles tools/make_specfiles +0 -1

No files found.
--- a/dlls/d3dx9_42/Makefile.in
+++ b/dlls/d3dx9_42/Makefile.in
 MODULE    = d3dx9_42.dll
-IMPORTS   = d3d9
+IMPORTS   = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
+PARENTSRC = ../d3dx9_36

 C_SRCS = \
-	d3dx9_42_main.c
+	animation.c \
+	core.c \
+	d3dx9_42_main.c \
+	effect.c \
+	font.c \
+	line.c \
+	math.c \
+	mesh.c \
+	preshader.c \
+	render.c \
+	shader.c \
+	skin.c \
+	sprite.c \
+	surface.c \
+	texture.c \
+	util.c \
+	volume.c \
+	xfile.c

 RC_SRCS = version.rc
--- a/dlls/d3dx9_42/d3dx9_42.spec
+++ b/dlls/d3dx9_42/d3dx9_42.spec
--- a/dlls/d3dx9_42/d3dx9_42_main.c
+++ b/dlls/d3dx9_42/d3dx9_42_main.c
@@ -23,7 +23,7 @@

 #include "config.h"
 #include "wine/port.h"
-
+#include "initguid.h"
 #include <stdarg.h>

 #include "windef.h"

--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -75,7 +75,6 @@ my @dll_groups =
 [
  "d3dx9_36",
  "d3dx9_43",
-  "d3dx9_42",
 ],
 [
  "d3dx10_43",