diff --git a/dlls/d3dx11_42/Makefile.in b/dlls/d3dx11_42/Makefile.in index 3b6ab393b8..3ed7fd3e55 100644 --- a/dlls/d3dx11_42/Makefile.in +++ b/dlls/d3dx11_42/Makefile.in @@ -1,5 +1,9 @@ MODULE = d3dx11_42.dll +IMPORTS = d3dcompiler +PARENTSRC = ../d3dx11_43 -C_SRCS = d3dx11_42.c +C_SRCS = \ + async.c \ + d3dx11_42.c RC_SRCS = version.rc diff --git a/dlls/d3dx11_42/d3dx11_42.c b/dlls/d3dx11_42/d3dx11_42.c index ac56fbeb41..823ebf4727 100644 --- a/dlls/d3dx11_42/d3dx11_42.c +++ b/dlls/d3dx11_42/d3dx11_42.c @@ -26,7 +26,7 @@ #include "winbase.h" #include "winuser.h" #include "objbase.h" -#include "d3d11.h" +#include "d3dx11.h" BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) { diff --git a/dlls/d3dx11_42/d3dx11_42.spec b/dlls/d3dx11_42/d3dx11_42.spec index b917263640..a2a32ff87e 100644 --- a/dlls/d3dx11_42/d3dx11_42.spec +++ b/dlls/d3dx11_42/d3dx11_42.spec @@ -1,7 +1,7 @@ @ stdcall D3DX11CheckVersion(long long) @ stub D3DX11CompileFromFileA @ stub D3DX11CompileFromFileW -@ stdcall D3DX11CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) d3dx11_43.D3DX11CompileFromMemory +@ stdcall D3DX11CompileFromMemory(str long str ptr ptr str str long long ptr ptr ptr ptr) @ stub D3DX11CompileFromResourceA @ stub D3DX11CompileFromResourceW @ stub D3DX11ComputeNormalMap diff --git a/tools/make_specfiles b/tools/make_specfiles index feb65b4e12..448d813c32 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -107,10 +107,6 @@ my @dll_groups = "d3dx10_34", "d3dx10_33", ], - [ - "d3dx11_43", - "d3dx11_42", - ], [ "d3dcompiler_43", "d3dcompiler_47",