vlc/vlc-3.0 | branch: master | Martin Storsjö <[email protected]> | Wed Feb 28 09:30:19 2018 +0200| [f3a9d05fd6123c5c4e4423deea1d027b12eb8aa1] | committer: Martin Storsjö
win32: Don't pass the built dll to dlltool when creating the import library The def file generated by the linker is enough input to dlltool; this doesn't change the output import library at all. This fixes building with llvm-dlltool, which doesn't support providing object files/dlls, it only supports reading from a def file (which these commands already did anyway). (cherry picked from commit 86d68171643e9c36ef16d4d0e22dcd947a96ad9d) > http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=f3a9d05fd6123c5c4e4423deea1d027b12eb8aa1 --- extras/package/win32/package.mak | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extras/package/win32/package.mak b/extras/package/win32/package.mak index 1a4ff8fb4a..c307da804c 100644 --- a/extras/package/win32/package.mak +++ b/extras/package/win32/package.mak @@ -32,9 +32,9 @@ package-win-sdk: package-win-install cp -r $(prefix)/lib/pkgconfig "$(win32_destdir)/sdk/lib" cp -rv $(prefix)/lib/libvlc.dll.a "$(win32_destdir)/sdk/lib/libvlc.lib" cp -rv $(prefix)/lib/libvlccore.dll.a "$(win32_destdir)/sdk/lib/libvlccore.lib" - $(DLLTOOL) -D libvlc.dll -l "$(win32_destdir)/sdk/lib/libvlc.lib" -d "$(top_builddir)/lib/.libs/libvlc.dll.def" "$(prefix)/bin/libvlc.dll" + $(DLLTOOL) -D libvlc.dll -l "$(win32_destdir)/sdk/lib/libvlc.lib" -d "$(top_builddir)/lib/.libs/libvlc.dll.def" echo "INPUT(libvlc.lib)" > "$(win32_destdir)/sdk/lib/vlc.lib" - $(DLLTOOL) -D libvlccore.dll -l "$(win32_destdir)/sdk/lib/libvlccore.lib" -d "$(top_builddir)/src/.libs/libvlccore.dll.def" "$(prefix)/bin/libvlccore.dll" + $(DLLTOOL) -D libvlccore.dll -l "$(win32_destdir)/sdk/lib/libvlccore.lib" -d "$(top_builddir)/src/.libs/libvlccore.dll.def" echo "INPUT(libvlccore.lib)" > "$(win32_destdir)/sdk/lib/vlccore.lib" package-win-common: package-win-install package-win-sdk _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
