crt: Share identical def files between lib64 and libarm32
These were missed before due to the differing line endings.
Signed-off-by: Martin Storsjö <martin@martin.st>
diff --git a/mingw-w64-crt/Makefile.am b/mingw-w64-crt/Makefile.am
index b246e49..9fb87e9 100644
--- a/mingw-w64-crt/Makefile.am
+++ b/mingw-w64-crt/Makefile.am
@@ -1231,7 +1231,7 @@
libarm32/libxinput.a: libarm32/xinput1_4.def
$(DTDEFARM32) $<
-libarm32/libd3dcompiler.a: libarm32/d3dcompiler_47.def
+libarm32/libd3dcompiler.a: lib-common/d3dcompiler_47.def
$(DTDEFARM32) $<
endif
diff --git a/mingw-w64-crt/Makefile.in b/mingw-w64-crt/Makefile.in
index 1e98847..ef1a04e 100644
--- a/mingw-w64-crt/Makefile.in
+++ b/mingw-w64-crt/Makefile.in
@@ -49233,7 +49233,7 @@
@LIBARM32_TRUE@libarm32/libxinput.a: libarm32/xinput1_4.def
@LIBARM32_TRUE@ $(DTDEFARM32) $<
-@LIBARM32_TRUE@libarm32/libd3dcompiler.a: libarm32/d3dcompiler_47.def
+@LIBARM32_TRUE@libarm32/libd3dcompiler.a: lib-common/d3dcompiler_47.def
@LIBARM32_TRUE@ $(DTDEFARM32) $<
# End ARM 32-bit runtime
diff --git a/mingw-w64-crt/lib64/d3dcompiler_47.def b/mingw-w64-crt/lib-common/d3dcompiler_47.def
similarity index 100%
rename from mingw-w64-crt/lib64/d3dcompiler_47.def
rename to mingw-w64-crt/lib-common/d3dcompiler_47.def
diff --git a/mingw-w64-crt/libarm32/d3dcompiler_47.def b/mingw-w64-crt/libarm32/d3dcompiler_47.def
deleted file mode 100644
index 608d8dc..0000000
--- a/mingw-w64-crt/libarm32/d3dcompiler_47.def
+++ /dev/null
@@ -1,36 +0,0 @@
-;
-; Definition file of D3DCOMPILER_47.dll
-; Automatic generated by gendef
-; written by Kai Tietz 2008-2014
-;
-LIBRARY "D3DCOMPILER_47.dll"
-EXPORTS
-D3DAssemble
-DebugSetMute
-D3DCompile
-D3DCompile2
-D3DCompileFromFile
-D3DCompressShaders
-D3DCreateBlob
-D3DCreateFunctionLinkingGraph
-D3DCreateLinker
-D3DDecompressShaders
-D3DDisassemble
-D3DDisassemble10Effect
-D3DDisassemble11Trace
-D3DDisassembleRegion
-D3DGetBlobPart
-D3DGetDebugInfo
-D3DGetInputAndOutputSignatureBlob
-D3DGetInputSignatureBlob
-D3DGetOutputSignatureBlob
-D3DGetTraceInstructionOffsets
-D3DLoadModule
-D3DPreprocess
-D3DReadFileToBlob
-D3DReflect
-D3DReflectLibrary
-D3DReturnFailure1
-D3DSetBlobPart
-D3DStripShader
-D3DWriteBlobToFile
