diff options
| -rw-r--r-- | DOCS/compile-windows.md | 3 | ||||
| -rw-r--r-- | wscript_build.py | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/DOCS/compile-windows.md b/DOCS/compile-windows.md index 6fd5ed79b2..48895f5428 100644 --- a/DOCS/compile-windows.md +++ b/DOCS/compile-windows.md @@ -165,9 +165,6 @@ Or, compile and install both libmpv and mpv: ```bash ./waf configure CC=gcc.exe --check-c-compiler=gcc --enable-libmpv-shared --prefix=/mingw64 ./waf install - -# waf installs libmpv dll to the wrong directory, so fix it up -mv -f /mingw64/lib/mpv-1.dll /mingw64/bin/ ``` Linking libmpv with MSVC programs diff --git a/wscript_build.py b/wscript_build.py index ec648807f3..ab50b107a6 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -544,6 +544,7 @@ def build(ctx): "features": features, "export_symbols_def": "libmpv/mpv.def", "install_path": ctx.env.LIBDIR, + "install_path_implib": ctx.env.LIBDIR, } if shared and ctx.dependency_satisfied('android'): @@ -556,6 +557,9 @@ def build(ctx): # for all other configurations we want SONAME to be used libmpv_kwargs["vnum"] = libversion + if shared and ctx.env.DEST_OS == 'win32': + libmpv_kwargs["install_path"] = ctx.env.BINDIR + ctx(**libmpv_kwargs) if build_shared: |